Vokhmin Alexey V
2681a1c676
#575 : added logic for BuildList notification
2012-09-16 22:18:41 +04:00
Vladimir Sharshov
5a699ad379
Merge pull request #640 from warpc/638-add-access-permissions-for-users-to-repository
...
[refs #638 ] Repository supervisor
2012-09-12 13:52:42 -07:00
Vokhmin Alexey V
1c9a9e803e
#638 : some refactoring
2012-09-13 00:47:39 +04:00
Vokhmin Alexey V
1a75a5a394
#638 : updated Relation model, repositories and platforms controllers according to comments
2012-09-12 23:32:51 +04:00
Vokhmin Alexey V
8d35786183
#641 : added is_package checkbox to #new page, updated model
2012-09-12 19:06:34 +04:00
Vokhmin Alexey V
b468b09529
#638 : some refactoring for adding new user
2012-09-12 17:07:34 +04:00
Vokhmin Alexey V
aadfb39682
#638 : added access to add/remove member to repository for owner and local_admin
2012-09-12 16:17:51 +04:00
Vokhmin Alexey V
1f32e72508
#638 : added access to remove_project for members of repository
2012-09-12 00:43:08 +04:00
Vokhmin Alexey V
96466b808b
#638 : fixed ability model
2012-09-12 00:40:16 +04:00
Vokhmin Alexey V
b4c2c368e4
#638 : added permissions to add new project for members of repository
2012-09-12 00:27:28 +04:00
Vokhmin Alexey V
1e40b9fb06
#638 : some refactoring
2012-09-12 00:08:25 +04:00
Vokhmin Alexey V
3858bfa6b7
#638 : added members to repository model, updated views
2012-09-11 19:30:14 +04:00
Vokhmin Alexey V
bff32c27c4
#637 : removed comments
2012-09-11 12:36:33 +04:00
Vokhmin Alexey V
1768df5010
#637 : removed unnecessary lines
2012-09-10 15:19:13 +04:00
Vokhmin Alexey V
5f941844f2
#637 : added migration, updated approve_notification
2012-09-10 15:08:53 +04:00
Vladimir Sharshov
8c06b0c18d
[refs #631 ] Fix right for publication build list using publish button
2012-09-07 22:45:03 +04:00
Pavel Chipiga
7570f1cab7
Set publish_without_qa to false for all platform repos when released. Fix mgration. Refs #631
2012-09-07 18:41:42 +03:00
Pavel Chipiga
768e40ee2a
Merge branch 'master' into 631-publish-to-the-repository-without-qa
...
Conflicts:
app/models/ability.rb
2012-09-07 16:38:21 +03:00
Vladimir Sharshov
29f5ef5f2e
Refactoring tests
2012-09-07 13:41:49 +04:00
Vladimir Sharshov
4828aa24f8
Merge branch 'master' into 349-anonymous_access
...
Conflicts:
spec/controllers/platforms/maintainers_controller_spec.rb
spec/factories/build_lists.rb
2012-09-07 00:36:06 +04:00
Vladimir Sharshov
71e28cf3f3
Merge branch 'master' into 349-anonymous_access
2012-09-07 00:31:28 +04:00
Pasha
9247a1c850
Merge pull request #613 from warpc/263-refactoring
...
[#263 ] Исправление и рефакторинг тестов
2012-09-06 13:23:23 -07:00
Vladimir Sharshov
2c1df5cd14
Merge branch 'master' into 263-refactoring
...
Conflicts:
config/deploy.rb
db/schema.rb
2012-09-06 21:14:14 +04:00
Vladimir Sharshov
54c6ba55be
[refs #349 ] Disable global menu Projects and Platforms; Allowed full search; Protect user and maintainer emails; Refactoring right rules
2012-09-06 21:09:10 +04:00
Vokhmin Alexey V
c1d87a36da
#631 : fixed misprint in model and controller
2012-09-06 19:43:07 +04:00
Vokhmin Alexey V
f0f11cb9dc
#631 : added #edit #update actions to platforms/repositories_controller, wrote migration, updated models
2012-09-06 17:43:50 +04:00
Vladimir Sharshov
698e55e3e8
[refs #263 ] Test refactoring
2012-09-06 14:53:03 +04:00
Pavel Chipiga
a2d87c9228
Fix autocomplete_maintainers for local admins. Refs #620
2012-09-06 13:31:31 +03:00
konstantin.grabar
b9a622acec
[refs #374 ] Add unixtime search and output. Fix rate limit configuration and 404 status
2012-09-05 17:47:25 +04:00
konstantin.grabar
ff8f9da14f
[refs #374 ] Refactor api build list create method
2012-09-04 16:44:28 +04:00
George Vinogradov
3e69d7d0f4
[issue #349 ] Guest user can show open platforms.
2012-09-01 02:00:39 +04:00
Vladimir Sharshov
ff20c0b199
Merge pull request #622 from warpc/620-maintainer_db
...
[refs #620 ] Maintainer DB
2012-08-31 11:50:02 -07:00
George Vinogradov
decd4bf293
[issue #620 ] Removed scope from BuildList::Package && small refactoring.
2012-08-31 21:47:52 +04:00
George Vinogradov
16e101cc05
[issue #620 ] Fixed BuildList#actualize_packages
2012-08-31 01:20:30 +04:00
George Vinogradov
68b86ba09a
[issue #620 ] Fixed migration && BuildList#actualize_packages.
2012-08-30 22:32:28 +04:00
Alexander Machehin
d775fa0d08
[refs #616 ] ugly md preview
2012-08-29 21:24:06 +06:00
konstantin.grabar
03986b7c21
[refs #374 ] Remove index actions from projects and reps. Add projects#get_id. Update tests. Fix build list show template
2012-08-28 20:57:12 +04:00
George Vinogradov
88d0e358ce
[issue #620 ] Set maintainer for new and forked project
2012-08-28 19:00:04 +04:00
George Vinogradov
6c4b13f0da
[issue #620 ] Removed project_maintainer & assignee
2012-08-28 18:25:57 +04:00
George Vinogradov
f688985814
[issue #620 ] Changed maintainer assignment.
...
* Added `project:maintainer:set_to_owner` task to set projects maintainer
to its owner
* Removed callbacks and methods to find maintainer 'on-the-fly'
2012-08-28 01:12:53 +04:00
George Vinogradov
7572562cad
[issue #620 ] Changed packages actualization.
2012-08-25 00:27:10 +04:00
George Vinogradov
d24a149d9a
[issue #620 ] Added search of maintainer by package
2012-08-24 20:06:59 +04:00
George Vinogradov
2fbb72e537
[issue #620 ] Changes in Maintainer db:
...
* Added maintainer selection on project page (see TODO in sources);
* Added `actual` field to BuildList::Package;
* Added rake task to set BuildList::Package.actual field.
Run it after migration (see TODO in sources);
* Packages after publising of BuildList becomes actual;
* Added MaintainerPresenter to avoid long method chains.
2012-08-24 19:21:24 +04:00
Pavel Shved
a4b03b53ce
Refactor maintainer-db spec and model
2012-08-22 00:02:33 +04:00
Pavel Shved
388a0028da
Add Maintainer Database and list view for it
...
This commit adds list of maintainers of a platform to page
/platforms/:id/maintainers. This list is intended to serve as a
counterpart for http://maint.mandriva.com/listpkgs.php .
The commit adds a "view" on a build_list_packages table: it selects only
the latest builds for each package, and summarizes the information about
such packages in "maintainers" table.
This is a testing mode only, so the link to maintainers table is not
shown.
2012-08-21 23:57:39 +04:00
Alexander Machehin
a70f9b9ecb
[refs #616 ] allow create issue for public projects
2012-08-20 23:54:55 +06:00
Vladimir Sharshov
656892afe3
Merge pull request #612 from warpc/590-build_list_page_change
...
[refs #590 ] Add auto updatable log block in build list page. Added forecast assembly time in monitoring page.
2012-08-17 15:30:48 -07:00
George Vinogradov
84328742e4
[issue #590 ] Log returns through Rails with `tail -n`
2012-08-17 12:23:49 +04:00
Pavel Chipiga
0ff8f92b62
Upgrade gems. Fix and refactor some specs. Fix deprecation warnings. Add capistrano task to dump remote db. Refs #263
2012-08-15 16:52:32 +03:00
Alexander Machehin
f2565c4877
[refs #90 ] remove Baden-Baden
2012-08-15 19:50:26 +06:00
Vladimir Sharshov
cada20ed63
Merge branch 'master' into 590-build_list_page_change
2012-08-14 15:46:16 +04:00
Alexander Machehin
b2ff7326d1
Merge branch 'master' into 90-pull
...
Conflicts:
config/locales/en.yml
config/locales/ru.yml
2012-08-13 15:01:43 +06:00
George Vinogradov
efa08933fd
[issue #590 ] Added average build time to :build_started BuildLists
2012-08-12 02:08:28 +04:00
Alexander Machehin
ab939253df
[refs #90 ] optimization?
2012-08-10 23:06:34 +06:00
Alexander Machehin
11e5f4dd99
[refs #90 ] try use grit to clone
2012-08-10 22:42:34 +06:00
Alexander Machehin
c1c9f9680e
[refs #90 ] remove code duplication
2012-08-10 22:40:09 +06:00
Vladimir Sharshov
5759a53fae
Temporarily transfer path for the git repository via NFS
2012-08-10 18:50:30 +04:00
Alexander Machehin
1d5470b7d6
[refs #90 ] small fixes
2012-08-09 23:56:55 +06:00
Vladimir Sharshov
d8da0d8c60
Inform the kernel about project git address(part 3): add protocol
2012-08-09 20:46:09 +04:00
Vladimir Sharshov
f4b3c53362
Inform the kernel about project git address
2012-08-09 17:56:45 +04:00
konstantin.grabar
0c9f3540f9
[refs #374 ] Merge master into 374-rest_api_for_builds
2012-08-08 18:21:56 +04:00
Alexander Machehin
4c02d4be19
[refs #90 ] fixed error
2012-08-08 16:33:48 +06:00
Alexander Machehin
0ddb960b8b
[refs #90 ] remove commits from pull refs
2012-08-08 00:23:17 +06:00
Alexander Machehin
edf882f2a1
[refs #90 ] remove unneeded method
2012-08-08 00:17:10 +06:00
Alexander Machehin
5cb1f4e7e9
[refs #90 ] small delegate refactoring
2012-08-08 00:08:02 +06:00
Alexander Machehin
a7f926bbdf
[refs #90 ] forgot dependent destroy
2012-08-08 00:07:26 +06:00
Alexander Machehin
6225410720
[refs #90 ] enable check for uniq pull requests
2012-08-08 00:06:49 +06:00
Alexander Machehin
37a0b4efe8
[refs #90 ] fixed error with / in branch name
2012-08-07 23:40:40 +06:00
Alexander Machehin
b50d9f87d2
[refs #90 ] clean ability
2012-08-07 23:07:18 +06:00
Alexander Machehin
2a6b08c269
[refs #90 ] fixed error with wrong treeish
2012-08-07 22:24:47 +06:00
Alexander Machehin
35642102dd
[refs #90 ] fixed show merge button
2012-08-07 19:25:08 +06:00
Alexander Machehin
a316105e9c
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-08-07 18:21:04 +06:00
Vladimir Sharshov
30efe134ef
[refs #604 ] Remove old and empty mass builds
2012-08-07 01:07:54 +04:00
Vladimir Sharshov
f35d4cd873
Merge branch 'master' into #604-Remove_old_buildlist_created_more_than_3_month_ago
...
Conflicts:
app/models/project.rb
db/schema.rb
2012-08-07 00:53:43 +04:00
Vladimir Sharshov
69fb368911
merger stash
2012-08-07 00:48:29 +04:00
Vladimir Sharshov
38aa39743a
[refs #590 ] Fix mass build(part 2)
2012-08-07 00:22:16 +04:00
Vladimir Sharshov
ea16c47105
[refs #590 ] Fix mass build
2012-08-07 00:04:52 +04:00
Alexander Machehin
be6179b2ad
[refs #90 ] clean comment
2012-08-07 00:24:31 +06:00
Alexander Machehin
02214dda09
[refs #90 ] fixed merge with master
2012-08-07 00:17:04 +06:00
Alexander Machehin
c268930a45
[refs #90 ] small refactoring
2012-08-07 00:13:07 +06:00
Alexander Machehin
fb66b74019
[refs #90 ] fixed pull abilities
2012-08-07 00:12:15 +06:00
Alexander Machehin
09a5180c22
[refs #90 ] remove Baden-Baden
2012-08-06 23:53:55 +06:00
George Vinogradov
710fef1f0b
Merge pull request #602 from warpc/601-add_status_check_for_product_bl_remove
...
[refs #601 ] Add status check for destroy action in product build list
2012-08-06 08:40:43 -07:00
Vladimir Sharshov
08c58a84df
[refs #604 ] Remove old build list after 3 month
2012-08-06 19:35:11 +04:00
konstantin.grabar
43d8e2020c
[refs #374 ] Remove states check logic from ability.rb. Small api reject answer fix
2012-08-06 16:21:19 +04:00
Vladimir Sharshov
c7a3addfb8
[refs #601 ] Add statuscheck for destroy action in product build list
2012-08-06 16:06:42 +04:00
Vladimir Sharshov
0e3e5c0ce1
Merge pull request #600 from warpc/590-build_list_page_change
...
[refs #590 ] build list page change:
* Fix migration;
* Repository rights checking moved to controller;
* Repository fetches through project and platform.
2012-08-06 04:18:26 -07:00
konstantin.grabar
36da0cf808
[refs #374 ] Continue tests fix
2012-08-06 14:43:04 +04:00
George Vinogradov
36de270fad
[issue #590 ] Moved repository check to controller.
2012-08-06 14:21:33 +04:00
Alexander Machehin
6a04f4ad7a
Merge again branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-08-06 11:19:06 +06:00
George Vinogradov
a1b7bcac32
[issue #565 ] Merge branch 'master' into 565-feedback_form
...
Conflicts:
app/assets/stylesheets/design/custom.scss
2012-08-03 23:36:14 +04:00
George Vinogradov
6eff6bffa5
[issue #590 ] Merge branch 'master' into 590-build_list_page_change
...
Conflicts:
db/schema.rb
2012-08-03 18:37:44 +04:00
Alexander Machehin
b299a51610
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-08-01 13:06:41 +06:00
konstantin.grabar
f7f848e878
[refs #441 ] Merge master into 441-key_pairs
2012-07-31 17:16:07 +04:00
konstantin.grabar
6c4a574f49
[refs #441 ] self.key_id and stub result fix
2012-07-31 17:05:25 +04:00
konstantin.grabar
931d4a7db0
[refs #441 ] Key Pairs fixes and refactoring
2012-07-31 16:50:53 +04:00
Vladimir Sharshov
43309d86e6
Merge branch 'master' into 441-key_pairs, fix schema, add migration
...
Conflicts:
db/schema.rb
2012-07-31 02:02:15 +04:00
Vladimir Sharshov
73a369ba49
[refs #441 ] Refactring: part 2. Fix integration with kernel, change view for keys list
2012-07-31 01:24:31 +04:00
George Vinogradov
ef25bb502a
[issue #565 ] refactoring, proposed by @alexander-machehin
2012-07-31 00:42:32 +04:00
George Vinogradov
d7e9cefd0b
[issue #590 ] Added validation on repository.
2012-07-30 23:26:51 +04:00
Vladimir Sharshov
89d67f9ea6
[refs #441 ] Refactring, fix errors
2012-07-30 23:08:14 +04:00
konstantin.grabar
724b36a4b4
Merge master into 570-mass_builds_status_counters_bug
2012-07-30 18:53:18 +04:00
konstantin.grabar
dd13b38da3
[refs #570 ] Add status variable
2012-07-30 18:49:40 +04:00
George Vinogradov
cc66e2ee4a
[issue #590 ] Save repository to save to in BuildList.
2012-07-27 20:01:26 +04:00
konstantin.grabar
33e6cdc285
[refs #570 ] Remove mass build counters logs and transactions
2012-07-27 19:17:07 +04:00
Alexander Machehin
25bdbb01d6
[refs #90 ] project fullname
2012-07-27 18:52:31 +06:00
Alexander Machehin
944c6fc0e2
Merge branch 'master' into 90-pull
...
Conflicts:
app/assets/stylesheets/design/custom.scss
app/controllers/projects/git/commits_controller.rb
app/helpers/git_helper.rb
app/models/project.rb
app/views/projects/git/commits/_commit_diff.html.haml
db/schema.rb
lib/ext/core/string.rb
2012-07-27 18:37:25 +06:00
konstantin.grabar
548fb99ebe
[refs #570 ] Try to do counters change into transaction with locking
2012-07-27 16:28:08 +04:00
Pavel Chipiga
fb60dac748
Merge branch 'master' into 263-refactoring
...
Conflicts:
db/schema.rb
2012-07-27 00:19:36 +03:00
Pavel Chipiga
35e673d44e
Minor gems update. Fix string length, refactor git helper and module, add branches_and_tags method, refactor build_list filter, cleanup and refactor templates. Take back test. Filter incorrect symbols during git encoding fix. Fix git http level bug. Refs #263
2012-07-27 00:15:57 +03:00
konstantin.grabar
f9b217379d
[refs #570 ] Add mass build counters logs
2012-07-26 15:45:23 +04:00
konstantin.grabar
91dddd5dac
Merge branch 'master' into 570-mass_builds_status_counters_bug
2012-07-26 15:06:09 +04:00
Vladimir Sharshov
606609dea6
Merge pull request #580 from warpc/576-flash_notifies
...
[refs #576 ] Add flash notifies
2012-07-25 12:18:44 -07:00
Pavel Chipiga
03509e714c
Merge branch 'master' into 263-refactoring
2012-07-25 21:42:48 +03:00
konstantin.grabar
c0036a1bb5
[refs #576 ] Fix should_show? method and template offsets
2012-07-25 16:41:12 +04:00
Alexander Machehin
a0a4c8b100
[refs #581 ] dont destroy child projects
2012-07-24 22:02:02 +06:00
konstantin.grabar
3d19a4f23e
[refs #576 ] Optimize tests, views and model
2012-07-24 13:19:22 +04:00
konstantin.grabar
15a86c2ecd
[refs #576 ] Add flash notifies
2012-07-23 18:25:37 +04:00
George Vinogradov
ee15ca26ca
[issue #565 ] Refactoring. Fixed html mail template.
2012-07-20 23:59:32 +04:00
George Vinogradov
6d046764ef
[issue #565 ] Merge branch 'master' into 565-feedback_form
...
Conflicts:
app/assets/stylesheets/design/custom.scss
2012-07-20 20:15:55 +04:00
George Vinogradov
d6c65a1626
[issue #565 ] Added feedback form.
...
* Added web pages to send request
* Added mailer to send feedback message.
2012-07-20 20:06:31 +04:00
Alexander Machehin
d130409640
Merge branch 'master' into 90-pull
...
Conflicts:
app/assets/stylesheets/design/custom.scss
2012-07-20 15:33:11 +06:00
konstantin.grabar
7061696100
[refs #570 ] Replace :all to :everything for builds filter
2012-07-18 17:49:21 +04:00
konstantin.grabar
6430678c00
[refs #570 ] Add :all option for build lists visibility
2012-07-18 16:00:40 +04:00
konstantin.grabar
778b76e5ff
[refs #570 ] Fix mass builds counters update. Fix mass build and failed_build_list links
2012-07-18 14:31:49 +04:00
konstantin.grabar
3a183e0dc3
[refs #441 ] Remove unused files. Add mass assigment specs
2012-07-17 13:31:32 +04:00
Pavel Chipiga
611b22baa5
Update gems, fix conflicts. Raise 404 error instead of redirect. Refactor git controllers. Refactor git methods, move to modules. Cleanup git helpers, refactor and remove unused variables from views, refactor git templates. Refactor project load. Refactor git routes and links, refactor constraints. Fix branches with slashes and dots. Apply github linguist and libmagic for binary file detection. Other refactor and code cleanup. Fix specs and deprecations. Refs #263
2012-07-17 11:02:56 +03:00
konstantin.grabar
70b2d62e52
[refs #441 ] Some small fixes of locales and code
2012-07-16 13:58:33 +04:00
konstantin.grabar
3cf3546c2e
[refs #441 ] Add secret to filter. Add repository key exist check
2012-07-13 18:16:56 +04:00
konstantin.grabar
b4059c67fc
[refs #441 ] Add key pairs for platform
2012-07-13 15:18:12 +04:00
Alexander Machehin
26617b7739
[refs #90 ] add close/reopen button
2012-07-12 20:15:28 +06:00
Pasha
d9755f295c
Merge pull request #567 from warpc/523-block_import
...
[refs #523 ] Fix periodically error ActiveRecord::RecordNotFound in Resque service
2012-07-11 13:48:10 -07:00
Vladimir Sharshov
5b93ef9134
[refs #523 ] limit callback only for create action(update)
2012-07-12 00:40:55 +04:00
Vladimir Sharshov
84f4d7d423
[refs #523 ] limit callback only for create action
2012-07-12 00:24:31 +04:00
Vladimir Sharshov
b22a2ce3ba
[refs #523 ] Fix periodically error ActiveRecord::RecordNotFound in Resque service
2012-07-12 00:01:41 +04:00
Alexander Machehin
65f94e763e
[refs #90 ] add the commit merge message
2012-07-10 23:13:23 +06:00
Alexander Machehin
3290adb0b1
[refs #90 ] fixed merge ability
2012-07-10 22:58:39 +06:00
Alexander Machehin
10b828c644
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
vendor/assets/javascripts/vendor.js
2012-07-10 18:35:49 +06:00
Vladimir Sharshov
c45e599eb0
Merge pull request #560 from warpc/442-mass_build
...
[refs #442 ] Add tests for mass builds and attr_accessible. Fix ability.
2012-07-10 02:49:23 -07:00
konstantin.grabar
1de9277e4a
[refs #442 ] Add main? method for platforms
2012-07-10 11:06:08 +04:00
George Vinogradov
f997e50905
[issue #561 ] Some cosmethic changes.
...
* Reordered columns in BuildLists table
* Reordered rows in BuildLists filter
* Removed created_at filter (Commented. See TODOs)
2012-07-10 01:49:19 +04:00
George Vinogradov
7b3c74e97d
[issue #561 ] Changed BuildList pages
...
* Removed mass_build, cancel and updated_at fields from list
* Added link to commit in list (instead of version)
* Added platform field in list
* Added filter by main platforms
* Added cancel button and mass_build field to BuildList#show
2012-07-10 01:09:27 +04:00
Alexander Machehin
07e02d9a17
[refs #90 ] modified Update commits button
2012-07-10 00:41:39 +06:00
konstantin.grabar
620d78fd1b
[refs #442 ] MassBuilds create refactor and specs fix
2012-07-09 20:48:31 +04:00
konstantin.grabar
adc917ca3b
[refs #442 ] MassBuild data initialize refactor
2012-07-09 20:13:02 +04:00
Vladimir Sharshov
d7ee0fe938
Merge pull request #559 from warpc/428-advisory
...
[refs #428 ] Advisory: new look
2012-07-09 08:44:13 -07:00
Alexander Machehin
dd221cc880
[refs #90 ] autocomplete
2012-07-06 23:30:01 +06:00
konstantin.grabar
1f2a3b82d3
[refs #442 ] Add tests for mass builds and attr_accessible. Fix ability
2012-07-06 20:49:21 +04:00
George Vinogradov
3c8b77027e
[issue #428 ] Allowed any update_types when build for released platform.
2012-07-06 03:05:47 +04:00
George Vinogradov
a2d35d2538
[issue #527 ] Use User#fullname instead of string.
2012-07-04 19:53:18 +04:00
George Vinogradov
a909a92ae8
[issue #428 ] Merge branch 'master' into 428-advisory
...
Conflicts:
db/schema.rb
2012-07-04 18:10:03 +04:00
konstantin.grabar
4eac2a232f
[refs #442 ] Ability rights refactor. status_by_human refactor
2012-07-04 15:22:26 +04:00
Alexander Machehin
d6df9953f2
[refs #90 ] fixed pull path
2012-07-04 16:35:35 +06:00
George Vinogradov
e00e88340b
[issue #428 ] Merge branch 'master' into 428-advisory
...
Conflicts:
app/assets/stylesheets/design/custom.scss
db/schema.rb
2012-07-04 03:31:51 +04:00
George Vinogradov
094f25c049
[issue #428 ] Changed attaching advisory to BuildList.
...
Removed Chosen. Added text field with incremental search.
2012-07-04 02:52:13 +04:00
Alexander Machehin
89abd20c95
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-07-03 21:22:10 +06:00
konstantin.grabar
6afe8c0375
[refs #442 ] Merge master into 442-mass_build
2012-07-03 18:41:02 +04:00
konstantin.grabar
0827cf5100
[refs #442 ] Add other mass builds action to mass_builds controller. Rename cancel_mass_builds action
2012-07-03 18:34:07 +04:00
Alexander Machehin
ea8775f1f7
[refs #547 ] remove mistake condition
2012-07-03 16:42:58 +06:00
konstantin.grabar
c7232c53e9
[refs #442 ] Fix some locales. Fix batch_size
2012-07-03 12:44:51 +04:00
konstantin.grabar
8f9a6ee2d2
[refs #442 ] Change cancel btn. Move some actions to mass_builds controller. Add more ability rights
2012-07-02 18:50:47 +04:00
konstantin.grabar
004f603e02
[refs #442 ] Add new actions rights. Cancel build list btn rights fix
2012-06-29 23:10:18 +04:00
konstantin.grabar
8cfe262045
[refs #442 ] Fix status filter
2012-06-29 22:31:40 +04:00
konstantin.grabar
160bdca0c8
[refs #442 ] Add cancel_all to background. Add ownership and fix status links
2012-06-29 22:08:33 +04:00
konstantin.grabar
9c07879dc2
[refs #442 ] Add forgotten cancel
2012-06-29 20:01:32 +04:00
konstantin.grabar
561ebb8728
[refs #442 ] Add stop_build field
2012-06-29 19:17:25 +04:00
konstantin.grabar
6507ad280f
[refs #442 ] Merge master into 442-mass_build
2012-06-29 16:40:54 +04:00
Alexander Machehin
59c0300542
[refs #442 ] small refactoring
2012-06-29 17:42:05 +06:00
Alexander Machehin
adb3b1ccab
[refs #442 ] fixed bug with priority
2012-06-29 17:38:06 +06:00
Alexander Machehin
67c55bcb56
[refs #442 ] fixed infinite loop
2012-06-29 17:01:40 +06:00
Vladimir Sharshov
7561abca08
[refs #462 ] refactoring: remove notified_at
2012-06-28 21:40:32 +04:00
konstantin.grabar
ce163f89a9
[refs #442 ] Add rep_name field. Add cancel builds ability
2012-06-28 19:23:33 +04:00
Alexander Machehin
ef945278e8
[refs #90 ] refactoring check methods
2012-06-28 19:47:29 +06:00
Vladimir Sharshov
174c4dab0b
Merge pull request #540 from warpc/442-mass_build
...
[refs #442 ] Support mass build statistic
2012-06-28 05:02:44 -07:00
Alexander Machehin
ae4c8a6a5e
[refs #90 ] fixed lost data after merge
2012-06-28 16:44:55 +06:00
Vladimir Sharshov
126f58ac85
Fix publication for old version of build client
2012-06-27 18:57:30 +04:00
Alexander Machehin
ce0ff70561
[refs #90 ] fixed errors
2012-06-27 16:47:08 +06:00
Alexander Machehin
1ffb1b3940
Merge branch 'master' into 90-pull
...
Conflicts:
Gemfile
app/assets/stylesheets/design/custom.scss
app/models/project.rb
db/schema.rb
2012-06-27 16:20:38 +06:00
konstantin.grabar
fc00f713b5
[refs #442 ] Add counters update checking. Add build_error counter
2012-06-27 13:48:54 +04:00
Vladimir Sharshov
96d284d5ee
Merge pull request #533 from warpc/531-fix_users_role
...
[refs #531 ] Changed the rules for granting user rights in the project
2012-06-26 05:44:16 -07:00
Alexander Machehin
4f1e51a8af
[refs #90 ] fix reset commit after automerge
2012-06-26 15:43:32 +06:00
Alexander Machehin
6aa9cfaa50
[refs #90 ] view pull status
2012-06-25 22:04:43 +06:00
Alexander Machehin
9625e1bb4f
[refs #531 ] small refactoring
2012-06-25 20:31:41 +06:00
konstantin.grabar
651dd57044
Merge branch 'master' into 442-mass_build
2012-06-25 18:29:16 +04:00
konstantin.grabar
baec8a1016
[refs #525 ] Fix clear action rights
2012-06-25 18:26:01 +04:00
Vladimir Sharshov
b01d3cecba
Merge pull request #539 from warpc/525-repository_erase
...
[refs #525 ] Rename erase to clear. Fix flash. Replace repository to platform in locales
2012-06-22 12:19:51 -07:00
konstantin.grabar
f3bd3bbd7f
[refs #442 ] Add mass build counters ant their update. Add failed builds report generate
2012-06-22 19:10:44 +04:00
Alexander Machehin
9a2dcda3d1
[refs #537 ] fixed build list publish transaction
2012-06-22 16:38:09 +06:00
Alexander Machehin
d5a6b47be3
[refs #531 ] user best role tests
2012-06-21 20:19:44 +06:00
Alexander Machehin
d2f4135065
[refs #531 ] refactoring
2012-06-21 15:49:39 +06:00
konstantin.grabar
5e3241a1f5
[refs #525 ] Rename erase to clear. Fix flash. Replace repository to platform in locales
2012-06-21 11:15:26 +04:00
Alexander Machehin
93ec9a135d
[refs #531 ] some refactoring and model tests
2012-06-21 00:10:27 +06:00
konstantin.grabar
3ebd36f6fe
[refs #525 ] Erase corrections and refactor
2012-06-20 22:02:42 +04:00
Alexander Machehin
4d91ea1d6e
[refs #531 ] fixed user roles
2012-06-20 23:59:47 +06:00
George Vinogradov
e4f62ea592
[issue #428 ] Added filter by advisory_id to Advisories
2012-06-20 21:51:08 +04:00
Vladimir Sharshov
ecf4666a31
Merge pull request #535 from warpc/525-repository_erase
...
[refs #525 ] Add erase repository functional
2012-06-20 09:48:19 -07:00
konstantin.grabar
ad7d3795e6
Replace after_create on after_commit for build_list
2012-06-20 19:08:21 +04:00
George Vinogradov
3d38adcb94
[issue #428 ] Added Atom feed to advisories.
2012-06-20 18:44:32 +04:00
konstantin.grabar
270dbf2e9b
[refs #525 ] Add erase repository functional
2012-06-20 17:21:32 +04:00
Pavel Chipiga
e794ce6330
Remove loner parameter to avoid queue ignore. Fix git hook process - do not require 7th param. Remove write_hook from queue. Refs #510
2012-06-20 02:20:25 +03:00
konstantin.grabar
cb4e9b14b1
[refs #505 ] Fix events logic and can_cancel method
2012-06-19 21:24:11 +04:00
konstantin.grabar
264273c6c0
[refs #505 ] Remove comment. Add lost method into build_list model
2012-06-19 19:45:38 +04:00
konstantin.grabar
8e88c32147
[refs #505 ] Fix tests after merge. Remove ResqueAsyncMethods include
2012-06-19 14:23:03 +04:00
konstantin.grabar
dc8a11fa68
[refs #505 ] Merge master into 505-state_machine_migrate
2012-06-19 13:43:38 +04:00
George Vinogradov
735afaea15
[issue #428 ] Merge branch 'master' into 428-advisory
...
Conflicts:
db/schema.rb
2012-06-19 02:57:39 +04:00
George Vinogradov
ecd4498484
[issue #428 ] Changes in advisories.
...
* Added Many2Many relation between advisories and projects.
* Added autocompletion to build list's advisory
* Bootstrap's JS moved to vendor/
2012-06-19 02:49:17 +04:00
konstantin.grabar
8ce6c26cc4
[refs #505 ] Fix state machine tests
2012-06-18 20:19:09 +04:00
Pavel Chipiga
cb8345a207
Rename and separate queues. Refs #510
2012-06-18 17:16:53 +03:00
Pavel Chipiga
bcf4222282
Remove old style queue. Refs #510
2012-06-18 15:00:57 +03:00
Pavel Chipiga
f19e82b3fc
Add comments for async method calls. Refs #510
2012-06-17 01:51:02 +03:00
Pavel Chipiga
b47b4ec075
Update rails and gems. Redo resque jobs enqueue and perform through plugins. Redo emails async sending. Redo hook process. Refactor and code cleanup. Refs #510
2012-06-16 21:27:46 +03:00
konstantin.grabar
ac7a3980cd
[refs #505 ] Pending some tests. Return set_version_and_tag. Fix post_build action
2012-06-15 20:05:55 +04:00
konstantin.grabar
6db2fd3d10
[refs #505 ] Tried to fix strip error.
2012-06-15 17:05:55 +04:00
konstantin.grabar
5acc13e9a6
[ref #505 ] Refactor set_version_and_tag. Rename success and error events
2012-06-14 17:36:40 +04:00
konstantin.grabar
76b261638f
Merge master into 505-state_machine_migrate
2012-06-14 10:34:55 +04:00
konstantin.grabar
17815ddab2
[refs #505 ] Change start event name and move some logic to set_version_and_tag method
2012-06-13 22:33:23 +04:00
Alexander Machehin
682f33a9bf
[refs #90 ] view merged status
2012-06-13 23:52:11 +06:00
konstantin.grabar
9b3da14f83
[refs #505 ] Add more events and replace hand made status change
2012-06-13 21:27:35 +04:00
Pavel Chipiga
d45e95b0e9
Merge branch 'master' into 207-platform_clone
...
Conflicts:
app/views/layouts/menu/_top.html.haml
2012-06-09 19:08:55 +03:00
Pavel Chipiga
ec21c042dd
Fix and refactor active menu. Refs #207
2012-06-09 19:04:06 +03:00
konstantin.grabar
f37e0e54a3
[refs #510 ] Replace dj with resque
2012-06-09 16:52:29 +04:00
Alexander Machehin
9af3d22153
[refs #90 ] auto close after manual merge
2012-06-09 15:09:38 +06:00
Pavel Chipiga
c038b255a8
Allow dot at platform name. Refs #207
2012-06-08 21:20:02 +03:00
Pavel Chipiga
a2c14313ed
Fix platform clone. Refs #207
2012-06-08 20:37:16 +03:00
Alexander Machehin
0b9c0fdd07
[refs #90 ] fixed rendering file rename
2012-06-08 01:19:18 +06:00
Alexander Machehin
8fadbf2d41
[refs #90 ] rewrite diff
2012-06-07 23:23:28 +06:00
konstantin.grabar
122b50564d
[refs #505 ] Small refactor for place_build event
2012-06-05 16:19:54 +04:00
Alexander Machehin
91bf65d65d
[refs #90 ] comments for pull requests (slow version)
2012-06-05 18:08:52 +06:00
konstantin.grabar
bd721aa3af
[refs #505 ] Remove unsused events
2012-06-05 14:30:38 +04:00
George Vinogradov
e7c0eab736
[issue #428 ] Merge branch 'master' into 428-advisory
...
Conflicts:
app/assets/stylesheets/design/custom.scss
2012-06-04 23:59:00 +04:00
George Vinogradov
abe2b8a30d
[issue #428 ] Work with existing advisories.
...
* Added advisories page to platform
* Added attacing of existing advisories to BuildList.
2012-06-04 23:49:20 +04:00
Alexander Machehin
4b8def5bd0
[refs #90 ] add pulls to tracker
2012-06-04 23:00:19 +06:00
Vladimir Sharshov
bf1496d1bf
Merge pull request #514 from warpc/510-resque_migrate
...
[refs #510 ] migrate to resque for heavy task
2012-06-04 07:28:20 -07:00
konstantin.grabar
a711773d47
[refs #505 ] Remove unused events
2012-06-01 19:02:51 +04:00
konstantin.grabar
8197877352
[refs #505 ] Small has_published check changes
2012-06-01 18:53:14 +04:00
konstantin.grabar
d084cd2329
[refs #505 ] Remove duplicate constant
2012-06-01 18:42:46 +04:00
konstantin.grabar
2eff4d1160
[refs #505 ] Remove unnessacary set_default_status method
2012-06-01 15:06:59 +04:00
konstantin.grabar
f188a83eca
[refs #505 ] Add place_build event
2012-06-01 14:58:17 +04:00
Alexander Machehin
60aba754ae
[refs #90 ] pull title/body update
2012-05-31 22:57:52 +06:00
konstantin.grabar
a7d70c3474
[refs #505 ] Fix state machine workflow
2012-05-31 18:35:37 +04:00
konstantin.grabar
526bdbe60f
[refs #510 ] Resque sinatra app secure
2012-05-31 17:36:41 +04:00
konstantin.grabar
38b55d769f
[refs #510 ] Add resque async workers
2012-05-31 11:02:25 +04:00
Alexander Machehin
f44b9631ad
[refs #90 ] add pull requests authorizations
2012-05-31 00:08:07 +06:00
konstantin.grabar
05e117ac52
[refs #505 ] state machine refactor
2012-05-30 16:42:30 +04:00
konstantin.grabar
3d3e109483
[refs #505 ] Add check ability methods and update some events
2012-05-29 21:28:11 +04:00
Alexander Machehin
26baf999f4
[refs #90 ] diff stats
2012-05-29 23:09:43 +06:00
konstantin.grabar
c3b5951465
[refs #442 ] Fix utc date for mass build name
2012-05-29 19:55:37 +04:00
konstantin.grabar
8eaec85aff
[refs #442 ] Fix auto_publish validate and default set
2012-05-29 17:44:30 +04:00
Alexander Machehin
11c67fb07d
Revert "[refs #90 ] issue status -> state" & changed state -> status
...
This reverts commit 7470ee76e4783a0fbbd98607406d7b770a2980d1.
Conflicts:
app/controllers/projects/issues_controller.rb
db/migrate/20120412173938_create_pull_requests.rb
db/schema.rb
2012-05-29 16:50:25 +06:00
Alexander Machehin
6623da9d71
[refs #90 ] fixed state_machine
2012-05-29 14:59:24 +06:00
konstantin.grabar
44de11d009
[refs #505 ] Add events, states and other base state machine logic
2012-05-28 21:47:53 +04:00
Vladimir Sharshov
3ed195bb86
Merge pull request #502 from warpc/442-mass_build
...
[refs #442 ] Mass build refactor and fixes
2012-05-28 02:00:30 -07:00
konstantin.grabar
df82cf69ca
[refs #442 ] Refactor mass_build
2012-05-25 21:31:57 +04:00
konstantin.grabar
a79d946b6b
[refs #442 ] Mass build refactor and fixes
2012-05-25 19:56:26 +04:00
Alexander Machehin
4f1d23a2a4
[refs #90 ] branch, merge validation
2012-05-24 23:10:49 +06:00
Vladimir Sharshov
0d3e06b5d9
Merge pull request #499 from warpc/478-project_build_failed
...
[refs #478 ] Add js handler to disable frozen platforms and their reps
2012-05-24 03:39:55 -07:00
konstantin.grabar
3d2bcdd019
[refs #478 ] Add js handler to disable frozen platforms and their reps
2012-05-24 14:21:57 +04:00
konstantin.grabar
43e95b565e
[refs #442 ] Change build_all button to mass_builds
2012-05-23 20:27:06 +04:00
Alexander Machehin
e211fa2fc3
[refs #90 ] fixed errors, add validations & tests
2012-05-23 22:09:11 +06:00
konstantin.grabar
dd9c653a90
[refs #442 ] Merge master into 442-mass_build
2012-05-23 18:51:29 +04:00
konstantin.grabar
e835eae50e
[refs #442 ] Remove commented code
2012-05-23 18:36:42 +04:00
konstantin.grabar
c74de8b84d
[refs #442 ] Add new page for mass rebuild, new fields and new functional
2012-05-23 18:08:11 +04:00
Vladimir Sharshov
70a89dccd0
[refs #430 ] Delete containers after deleting build list
2012-05-23 14:52:23 +04:00
Vladimir Sharshov
ec711eff48
[refs #442 ] Fix: always set true for auto_publish params
2012-05-22 23:41:34 +04:00
Alexander Machehin
0c89ca6575
[refs #90 ] broken tests
2012-05-23 00:23:00 +06:00
konstantin.grabar
7c45263799
[refs #442 ] Add mass build select to monitoring. Remove build lists from build_all action
2012-05-22 17:40:27 +04:00
Vladimir Sharshov
57ef020441
[refs #442 ] Fix problem for build list with save_to plaftorm is freeze; fix ignoring auto_publish option.
2012-05-22 01:10:00 +04:00
konstantin.grabar
9aefce6b68
[refs #442 ] Merge master into 442-mass_build
2012-05-21 18:33:12 +04:00
konstantin.grabar
b85cb31b88
[refs #442 ] Remove def is_rpm. Change auto_publish default value. Change MassBuild set_name. Fix schema
2012-05-21 17:59:04 +04:00
Alexander Machehin
d643bb3cd0
[refs #90 ] try to prevent create same pull
2012-05-21 19:24:16 +06:00
Alexander Machehin
6b6887250b
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-05-21 17:31:49 +06:00
konstantin.grabar
be2ab9154c
[refs #442 ] Fix checkboxes styles. Return delay for build all. Add mass build select and more fixes
2012-05-21 14:18:29 +04:00
konstantin.grabar
cd3564bb81
[refs #442 ] Add mass build model and new build_all fixes
2012-05-18 19:12:51 +04:00
Pavel Chipiga
bea7ed26d6
Fix advisory template. Fix rosa tour. Refs #428 , #482
2012-05-18 01:38:43 +03:00
Pavel Chipiga
b41a9e3b49
Redo project assign for build_list_packages. Redo and fix double render error during build_list publish. Refs #444 , #481
2012-05-18 00:19:57 +03:00
Vladimir Sharshov
aceb9e61fc
Rename is_rpm to is_package in ability.rb
2012-05-18 01:07:04 +04:00
Vladimir Sharshov
50249a68b6
Merge branch 'master' into 461-rename_is_rpm_to_is_package
2012-05-18 00:43:40 +04:00
Alexander Machehin
fcffff4178
Merge branch 'master' into 90-pull
...
Conflicts:
app/assets/stylesheets/design/custom.scss
config/locales/title.en.yml
config/locales/title.ru.yml
config/routes.rb
db/schema.rb
2012-05-17 22:58:29 +06:00
Alexander Machehin
74aee232f9
[refs #90 ] some fixes and merge button
2012-05-17 22:49:29 +06:00
konstantin.grabar
3e57359c96
[refs #442 ] Add mass build page functional
2012-05-17 19:20:03 +04:00
Pavel Chipiga
cd4dd31d24
Change project assign for container data. Refs #444
2012-05-17 16:00:38 +03:00
konstantin.grabar
ec9c19352e
[refs #461 ] Merge master into to 461-rename_is_rpm_to_is_package. Again
2012-05-17 12:00:21 +04:00
Vladimir Sharshov
9e3afa8fc0
Merge pull request #476 from warpc/438-remove_rsync_mount_from_app
...
[refs #438 ] Repair arch factory and rename rsync stub method, remove symlink dir creation
2012-05-16 12:09:45 -07:00
konstantin.grabar
4f38bb5364
[refs #438 ] Remove symlink dir creation
2012-05-16 20:58:15 +04:00
Alexander Machehin
f96990bd25
[refs #90 ] change view
2012-05-16 22:50:30 +06:00
Vladimir Sharshov
1550d7a59e
Merge pull request #459 from warpc/438-remove_rsync_mount_from_app
...
[refs #438 ] Remove rsync mount and umount from platforms
2012-05-16 06:24:31 -07:00
konstantin.grabar
208310e83b
[refs #438 ] Add rake task to symlink migrate. Change rsync stubs
2012-05-16 17:01:25 +04:00
konstantin.grabar
9d871af7ef
Merge master into 461-rename_is_rpm_to_is_package
2012-05-16 14:40:10 +04:00
konstantin.grabar
1385133ed5
[refs #461 ] Merge master into 461-rename_is_rpm_to_is_package
2012-05-16 14:37:35 +04:00
konstantin.grabar
5ad43c684e
Merge master into 429-uname_format_error_explain
2012-05-16 14:01:41 +04:00
konstantin.grabar
e807e5f3ec
[refs #429 ] Add format explain error message for uname
2012-05-15 15:11:18 +04:00
konstantin.grabar
1f088c0cfc
[refs #461 ] Rename is_rpm to is_package
2012-05-15 14:00:57 +04:00
konstantin.grabar
2c4169a3c7
[refs #438 ] Rename mount_path to symlink_path
2012-05-15 13:33:27 +04:00
konstantin.grabar
254629a4a9
[refs #438 ] Add symlinking paths for platforms
2012-05-15 12:53:41 +04:00
Pavel Chipiga
78ab229c4f
Fix advisories relaton. Minor code cleanup. Write more specs. Refs #444
2012-05-14 23:00:04 +03:00
Pavel Chipiga
8470674c62
Apply basic build list packages store functionality. Display build list package content. Write specs. Refactor. Refs #444
2012-05-14 22:08:31 +03:00
Alexander Machehin
ff016efe1c
[refs #90 ] choose project
2012-05-14 23:09:18 +06:00
konstantin.grabar
014f1c319c
[refs #438 ] Remove rsync mount and umount from platforms
2012-05-14 18:37:19 +04:00
Alexander Machehin
b7dee0b6af
Merge pull request #457 from warpc/454-routes_dot
...
[#454 ] Исправление проблемы с точкой в имени проекта
2012-05-14 07:04:28 -07:00
Pavel Chipiga
f335863881
Fix dot in project name routes. Refactor and write basic route specs. Refs #454
2012-05-14 16:24:01 +03:00
Alexander Machehin
944626d59a
[refs #455 ] add ability for build lists
2012-05-14 16:51:08 +06:00
Alexander Machehin
bd2bb2b91f
[refs #90 ] fixed merge
2012-05-12 22:34:27 +06:00
Alexander Machehin
85d4489009
[refs #90 ] dont work pull
2012-05-12 00:23:09 +06:00
George Vinogradov
b74dd01262
[issue #430 ] Changed task
2012-05-11 22:00:27 +04:00
George Vinogradov
1a9f529152
[issue #430 ] Added rake task to remove outdated BuildLists.
2012-05-11 21:44:19 +04:00
Alexander Machehin
d4a5b78b21
[refs #90 ] add state setter
2012-05-10 15:42:25 +06:00
George Vinogradov
05ef799fa4
[issue #428 ] Added advisories list. Added translations.
2012-05-05 21:18:29 +04:00
Alexander Machehin
381ae0a8b9
[refs #90 ] diff - dont work
2012-05-05 22:57:12 +06:00
George Vinogradov
1f07332892
[issue #428 ] Merge branch 'master' into 428-advisory
...
Conflicts:
app/controllers/projects/build_lists_controller.rb
config/routes.rb
db/schema.rb
2012-05-04 21:29:04 +04:00
George Vinogradov
8350fc8fb1
[issue 428] Added advisory.
2012-05-04 21:12:51 +04:00
Alexander Machehin
36b4ce2d99
Merge branch 'master' into 90-pull
...
Conflicts:
Gemfile
Gemfile.lock
app/controllers/projects/issues_controller.rb
app/models/project.rb
config/locales/menu.en.yml
config/routes.rb
db/schema.rb
2012-05-03 23:19:43 +06:00
Pavel Chipiga
abb60a503a
Minor design fix. Refactor register requests. Refactor case insensitive search. Other minor fixes and code cleanup. Refacor and improve owner constraint. Refs #263
2012-05-03 17:08:02 +03:00
Alexander Machehin
9e5db741d3
Merge branch 'master' into 90-pull
...
Conflicts:
app/models/project.rb
db/schema.rb
2012-05-02 23:08:24 +06:00
Alexander Machehin
eec083dc8b
[refs #90 ] fixed tests
2012-05-02 21:36:39 +06:00
Alexander Machehin
30ac14a413
Merge branch '90-pull' of github.com:warpc/rosa-build into 90-pull
...
Conflicts:
app/models/project.rb
app/models/pull_request.rb
db/migrate/20120412173938_create_pull_requests.rb
db/schema.rb
spec/models/pull_request_spec.rb
2012-05-02 15:18:56 +06:00
Pavel Chipiga
2539ef4795
Great controllers and routes refactor - separate them to namespaces. Add user/group routes in github style, refactor. Implement templates inheritance. Refactor and cleanup views. Fix specs. Other minor fixes. Refs #263
2012-05-02 12:18:07 +03:00
Pavel Chipiga
b957600eda
Merge branch 'master' into 263-refactoring
...
Conflicts:
app/models/project.rb
app/views/projects/_repo_block.html.haml
db/schema.rb
spec/controllers/issues_controller_spec.rb
spec/controllers/projects_controller_spec.rb
2012-05-01 15:54:13 +03:00
Alexander Machehin
4ad39b05c0
[refs #90 ] model PullRequest, tests
2012-04-28 23:30:54 +06:00
Vladimir Sharshov
77414b3092
Universal mass rebuildfor platform onwer without hardcoded main repository or architecture
2012-04-26 13:18:11 +04:00
George Vinogradov
de093d7065
[issue #425 ] Changed object to actor in Relation and to eventable in
...
EventLog
2012-04-26 05:38:33 +04:00
Vladimir Sharshov
2a24997eb4
Allow set custom priority for mass rebuild
2012-04-24 23:03:45 +04:00
Pavel Chipiga
cf907c19e8
Merge branch 'master' into 263-refactoring
...
Conflicts:
app/controllers/build_lists_controller.rb
2012-04-24 19:06:43 +03:00
George Vinogradov
9c9e4d8738
[issue #347 ] Removed unnecessary comment
2012-04-24 19:07:40 +04:00
George Vinogradov
326b35b4f8
[issue #347 ] Fixed bag with creating collaborator.
...
Before this changes if we have initialize Collaborator with project_id
and change project, Relation, incapsulated by Collaborator wasn't
changes.
2012-04-24 18:59:50 +04:00
Pavel Chipiga
7af06cc7ab
Downgrade unicorn. Fix project fork. Fix reserved_names validator. Add comments, cleanup code and refactor. Fix some bugs. Redo specs project URLs. Refs #263
2012-04-23 23:55:42 +03:00
Alexander Machehin
628fed40ea
[refs #90 ] issue status -> state
2012-04-23 23:34:11 +06:00
Alexander Machehin
598c072a80
[refs #90 ] add already state
2012-04-23 23:34:11 +06:00
Alexander Machehin
a37bf7b50a
Revert "[refs #90 ] more security"
...
This reverts commit 09d9cdcb4a54082a31a5d04e972609e434ad41ec.
2012-04-23 23:34:11 +06:00
Alexander Machehin
41fb4f2700
[refs #90 ] more security
2012-04-23 23:34:11 +06:00
Alexander Machehin
fda1a847f5
[refs #90 ] some tests and questions
2012-04-23 23:34:10 +06:00
Alexander Machehin
58776a6e9e
[refs #90 ] fixing pull methods
2012-04-23 23:34:10 +06:00
Alexander Machehin
71fdaa4e4d
[refs #90 ] initial
2012-04-23 23:34:10 +06:00
Pavel Chipiga
c0d2d67c73
Merge branch 'master' into 263-refactoring
...
Conflicts:
Gemfile
Gemfile.lock
config/routes.rb
2012-04-23 17:58:45 +03:00
Alexander Machehin
25bd2a6e77
[refs #90 ] issue status -> state
2012-04-20 23:19:23 +06:00
Alexander Machehin
5dc8a4ead1
[refs #90 ] add already state
2012-04-20 22:23:28 +06:00
Alexander Machehin
61a27bbb7d
Revert "[refs #90 ] more security"
...
This reverts commit 09d9cdcb4a54082a31a5d04e972609e434ad41ec.
2012-04-20 21:17:43 +06:00
Alexander Machehin
aa83c14165
[refs #90 ] more security
2012-04-20 17:38:19 +06:00
Pavel Chipiga
701da7e1f9
Disable bluepill. Update gems. Github project style URLs. Fix project load. Fix abilities. Fic urls generation. Fix some specs. Refs #263
2012-04-19 22:45:50 +03:00
Alexander Machehin
b1365fc567
[refs #90 ] some tests and questions
2012-04-20 01:09:00 +06:00
Alexander Machehin
c66931d347
[refs #90 ] fixing pull methods
2012-04-19 21:57:42 +06:00
Alexander Machehin
d48a3413cc
[refs #90 ] initial
2012-04-19 21:57:41 +06:00
George Vinogradov
510b0c0c50
[issue #347 ] Merge branch 'master' into 347-javascript_refactoring
...
Conflicts:
app/assets/stylesheets/design/custom.scss
app/models/group.rb
app/models/user.rb
2012-04-19 19:32:11 +04:00
George Vinogradov
f9d2baef5a
[issue #347 ] Added filter.
2012-04-19 19:27:16 +04:00
Vladimir Sharshov
5b5aec490a
Merge pull request #409 from warpc/396-rss_atom_feed
...
[refs #396 ] Add atom feed for activity feed
2012-04-19 07:08:59 -07:00
konstantin.grabar
3d1cb4bfee
Merge master into 396-rss_atom_feed
2012-04-18 16:53:53 +04:00
konstantin.grabar
8ef020427d
[refs #396 ] Add token auth for atom feed
2012-04-18 16:46:09 +04:00
Vladimir Sharshov
3e4eba7f9d
Merge pull request #411 from warpc/408-frozen_platform
...
[issue #408 ] Allow publish build list in released platform only for platform members. Add rejected function for bs.
2012-04-18 04:17:32 -07:00
George Vinogradov
6c64125787
[issue #408 ] Changed behavior of build list for released platform
2012-04-17 22:18:39 +04:00
Alexander Machehin
644b95d5bd
Fuuu!
...
Revert "[refs #385 ] removed dublicate ability"
This reverts commit 72de5731722f0a5b7110983ecb97cba1beda3056.
2012-04-17 19:52:52 +06:00
Alexander Machehin
05ec6cbac3
[refs #385 ] removed dublicate ability
2012-04-17 16:21:45 +06:00
Alexander Machehin
2716c19635
[refs #385 ] add anonymous access to project archive
2012-04-17 16:18:03 +06:00
konstantin.grabar
1b871bf6dd
[refs #404 ] Remove downloads statistics functional
2012-04-17 12:23:58 +04:00
George Vinogradov
871c8ed1f4
[issue #347 ] Fixed bugs. Some changes.
2012-04-16 23:22:08 +04:00
Vladimir Sharshov
07cc2db49e
Merge pull request #399 from warpc/194-assignee_and_user
...
[refs #194 ] Move user_id to assignee_id and creator_id to user_id, because user_id in project used only as author.
2012-04-16 09:39:23 -07:00
Vladimir Sharshov
40090f0903
[Refs #223 ] Fix human_average_build_time (wrong time)
2012-04-14 20:10:18 +04:00
Vladimir Sharshov
afd82ab4ec
[Refs #223 ] Mass rebuild method now connect project platform repository and main if main exist.
2012-04-14 17:46:39 +04:00
Pavel Chipiga
c1ddc2204f
Fix scopes. Refs #223
2012-04-14 01:27:24 +03:00
Vladimir Sharshov
afbfbcd9e4
[Refs #223 ] Fix time calculation
2012-04-14 01:20:56 +04:00
Vladimir Sharshov
2c0f047b38
[Refs #223 ] Fix errors and tests
2012-04-14 00:49:29 +04:00
Alexander Machehin
2dedbd92d0
[refs #194 ] assignee & user
2012-04-14 01:44:04 +06:00
Alexander Machehin
ba9184cc49
Merge pull request #398 from warpc/223-build_list_notify_and_duration_updates
...
223 build list notify and duration updates
2012-04-13 11:43:57 -07:00
Alexander Machehin
42967381b6
[refs #223 ] some refactoring
2012-04-14 00:26:34 +06:00
Vladimir Sharshov
652bc9c471
[Refs #223 ] Fix update_attributes for project
2012-04-13 21:00:43 +04:00
Vladimir Sharshov
100a166699
[Refs #223 ] Refactoring for pull request
2012-04-13 17:24:43 +04:00
Vladimir Sharshov
8ffc6be347
Merge branch '223-change_build_lists_new_js_handlers' into 223-build_list_notify_and_duration_updates
...
Conflicts:
app/models/build_list.rb
config/locales/models/build_list.en.yml
config/locales/models/build_list.ru.yml
2012-04-13 17:21:30 +04:00
Pasha
d8edf8e673
Merge pull request #397 from warpc/223-change_build_lists_new_js_handlers
...
[refs #223 ] Add build list duration
2012-04-13 05:25:20 -07:00
Vladimir Sharshov
36447051ec
[Refs #223 ] Small refactoring for pull request
2012-04-13 13:48:57 +04:00
George Vinogradov
a68d4a2926
[issue #347 ] Many changes.
...
Changes includes:
* Changed Collaborator model;
* Autocomplete now works through backbone;
* Changed autocomplete styles;
* Groups have their own avatar;
* Changed previous backbone scripts;
2012-04-13 02:01:24 +04:00
konstantin.grabar
65f1cfc822
[refs #223 ] Add current duration and project average build time
2012-04-12 18:55:32 +04:00
konstantin.grabar
26a468f6e3
[refs #223 ] Replace notified_at by updated_at
2012-04-12 16:12:06 +04:00
konstantin.grabar
742603ab7e
[refs #223 ] Add build list duration
2012-04-12 14:29:04 +04:00
Alexander Machehin
770030e180
[refs #385 ] zip archive
2012-04-12 00:29:08 +06:00
George Vinogradov
442b44a68e
[issue #347 ] Added not_member_of scope. Added ActsLikeMember module
2012-04-10 19:45:38 +04:00
Vladimir Sharshov
f0b9cabefa
[Refs #223 ] Change order for version select in build list creation page.
2012-04-10 19:45:18 +04:00
konstantin.grabar
18bda07369
Merge master into 223-change_build_lists_new_js_handlers
2012-04-10 18:00:48 +04:00
konstantin.grabar
207be85ff4
[refs #223 ] Add group select to versions
2012-04-10 16:03:33 +04:00
Alexander Machehin
e349a69883
[refs #353 ] can fork project to group
2012-04-09 23:56:03 +06:00
George Vinogradov
71c8efabf9
[issue #347 ] Added backbone. Changed collaborators page.
2012-04-09 21:11:39 +04:00
Pavel Chipiga
a9ecc683f2
Fix search bug. Write anonymous read specs for issues and search controllers. Refs #263
2012-04-05 20:11:02 +03:00
Pavel Chipiga
977ec8382c
Merge branch 'master' into 263-refactoring
2012-04-05 19:58:46 +03:00
Alexander Machehin
01976015a6
[refs #295 ] fix broken create/fork project
2012-04-05 22:52:21 +06:00
Vladimir Sharshov
4bb8a38fbb
Merge pull request #376 from warpc/263-dj
...
[Refs #295 ] Customized DJ jobs and workers:
* set priority to delayed jobs;
* 4 workers to dj;
* division init bare & fork.
2012-04-05 06:54:28 -07:00
Alexander Machehin
6d5cee2c04
[refs #383 ] added ability to destroy project
2012-04-05 17:36:53 +06:00
Pavel Chipiga
20e5936d0c
Fix and refactor build lists, comments and other specs. Refactor comments controller, models and views. Code cleanup. Refs #263
2012-04-05 00:43:06 +03:00
Alexander Machehin
302179eff8
[refs #295 ] set priority to delayed jobs
2012-04-04 18:13:10 +06:00
Vladimir Sharshov
a6ec36086c
[Refs #263 ] Refactoring ProductBuildList. Add tests
2012-04-04 00:56:21 +04:00
Alexander Machehin
f4937559a6
Merge pull request #378 from warpc/263-product_refactoring
...
[Refs #263 ] Refactoring product. Add tests.
2012-04-03 06:56:46 -07:00
George Vinogradov
fe053537c3
[ fixed #377 ] Fixed Group.by_admin scope.
2012-04-03 17:08:22 +04:00
Vladimir Sharshov
d382732e68
[Refs #263 ] Refactoring product. Add tests.
2012-04-03 16:21:39 +04:00
Alexander Machehin
1fb63cf1a7
[refs #263 ] division init bare & fork
2012-04-03 17:32:00 +06:00
Alexander Machehin
5a384c6846
[refs #263 ] added dj queues
2012-04-03 01:29:06 +06:00
Alexander Machehin
d06e452935
[refs #263 ] fixed feed with no repo
2012-04-03 01:27:36 +06:00
Alexander Machehin
dfa538abef
Merge pull request #375 from warpc/263-repository_refactoring
...
[Refs #263 ] Refactoring repository. Add tests
2012-04-02 10:44:28 -07:00
Vladimir Sharshov
431ed14e83
Fix "NameError: undefined local variable or method `platform' for ProductBuildList"
2012-04-02 21:39:43 +04:00
Vladimir Sharshov
d31d0c9672
[Refs #263 ] Refactoring repository. Add tests
2012-04-02 19:43:59 +04:00
Vladimir Sharshov
fef3affc07
[Refs #263 ] Refactoring platforms, add platform tests and software license, showing warning for errors in update project action
2012-04-01 19:19:54 +04:00
Pavel Chipiga
265090a172
Merge branch 'master' into 349-anonymous_access
...
Conflicts:
db/schema.rb
2012-03-31 02:41:25 +03:00
Pavel Chipiga
d6e6959f46
Write basic robots.txt. Apply configurable anonymous access, hide some functionality from guests. Apply basic design for main page. Autoconfirm manually created users. Code refactor and cleanup. Remove unused code, routes, containers, rpms, personal_repositories. Redo product_build_lists monitoring and filtering. Fix add_project to repo bug. Add links to bottom menu. Switch off deploy assets sppedup. Refs #349 , #263
2012-03-31 02:37:54 +03:00
George Vinogradov
7234cb7f99
[issue #195 ] Changed scopes.
2012-03-31 03:13:09 +04:00
George Vinogradov
0c09568d74
[issue #195 ] Merge branch 'master' into 195-new_design_for_projects
...
Conflicts:
app/models/group.rb
app/models/user.rb
2012-03-31 02:48:44 +04:00
George Vinogradov
71c1a4afcf
[issue #195 ] Owner removed from list of collaborators when editing list
2012-03-31 02:45:05 +04:00
Alexander Machehin
0f91e0e8a1
[refs #344 ] fixed ability and submenu
2012-03-30 23:23:46 +06:00
Vladimir Sharshov
3cedef5f07
Merge branch 'master' into 344-fix_products_monitoring
...
Conflicts:
db/schema.rb
2012-03-30 20:30:06 +04:00
konstantin.grabar
d3c2bac226
[refs #344 ] Add product buils list filter and search
2012-03-30 15:26:28 +04:00
Vladimir Sharshov
4dd97d8c63
[Refs #263 ] Remove xml-rpc gem, clear CanCan abilities and tests
2012-03-30 00:24:45 +04:00
Vladimir Sharshov
34011513b5
[Refs #263 ] Remove old xml-rpc API
2012-03-29 23:19:00 +04:00
Vladimir Sharshov
0c2d0f4612
[Refs #263 ] Delete Categories
2012-03-29 23:01:25 +04:00
Vladimir Sharshov
5db485a4c0
[Refs #263 ] Remove Aut BuildList. Part 2
2012-03-29 22:43:46 +04:00
Vladimir Sharshov
66c285c796
[Refs #263 ] Delete AutoBuildList
2012-03-29 22:22:48 +04:00
Vladimir Sharshov
9a45353ccb
Merge pull request #342 from warpc/128-account-activation
...
[Refs #128 ] account activation
2012-03-29 09:09:03 -07:00
Pavel Chipiga
9ee350b007
Refactor search controllers and scopes. Add search query whitespace strip. Refs #263
2012-03-28 02:58:03 +03:00
Pavel Chipiga
c9f4cf0ea4
Fix and refactor project membered abilities. Refs #195
2012-03-28 00:28:50 +03:00
George Vinogradov
2ba4a282cd
[issue #195 ] Global admin can change members in all projects
2012-03-28 00:16:33 +04:00
George Vinogradov
baf35da99c
[issue #195 ] Merge branch 'master' into 195-new_design_for_projects
...
Conflicts:
app/controllers/projects_controller.rb
2012-03-27 21:23:09 +04:00
Alexander Machehin
c2960b7083
[refs #263 ] fixed commentable accessibility
2012-03-27 22:45:07 +06:00
Alexander Machehin
3b57bb56bc
[refs #263 ] removed project_id from access lists
2012-03-27 21:11:52 +06:00
Alexander Machehin
a0b7f243d6
[refs #263 ] changed and fixed comment tests; some refactoring
2012-03-27 21:09:04 +06:00
konstantin.grabar
8b31c6373f
Merge branch 'master' into 128-account-activation
2012-03-27 13:46:21 +04:00
Pavel Chipiga
dafedb3dcf
Reroute and refactor admin user creation to force invitation and self registration work correct. Refs #270
2012-03-26 17:49:00 +03:00
konstantin.grabar
ae0ca1ce99
[refs #128 ] Fix devise mails. Fix confirm ability
2012-03-26 18:33:02 +04:00
konstantin.grabar
a3d334f0c2
[refs #128 ] Merge 3.2-master into 128-account-activation
2012-03-26 13:55:45 +04:00
Pavel Chipiga
4b96c988d4
Reduce build batch size. Refs #263
2012-03-24 02:09:49 +02:00
Pavel Chipiga
099ba2a3dd
Build platform for both arches. Refs #263
2012-03-24 01:53:07 +02:00
Vladimir Sharshov
9ced817560
[Refs #279 ] Temporary fix for mass rebuild
2012-03-24 03:30:12 +04:00
Pavel Chipiga
d44de9f2bb
Redo projects list. Allow view projects through groups. Hide delete from project link from project owners. Refs #195
2012-03-23 22:37:17 +02:00
Pavel Chipiga
7f31246463
Tune project specific build_lists page filters. Cleanup. Refs #223
2012-03-22 22:58:02 +02:00
Pavel Chipiga
4553affa56
Add missing magic_encodings. Fix blame commit select, hide blank blame. Fix git repo hooks - redo branch parse to support non-ascii branches. Refs #190 , #134
2012-03-22 19:11:12 +02:00
Alexander Machehin
071c391a6e
Merge branch '3.2-master' into 270-user_control
...
Conflicts:
app/assets/stylesheets/design/custom.scss
2012-03-22 21:15:10 +06:00
Alexander Machehin
23eeb1cae7
[refs #270 ] changes in ban
2012-03-22 20:50:15 +06:00
Alexander Machehin
787eed92a3
[refs #270 ] removed ssh_key
2012-03-22 17:47:56 +06:00
Alexander Machehin
71f1822fce
[refs #270 ] some refactoring
2012-03-22 17:17:11 +06:00
Alexander Machehin
867d678dc4
[refs #270 ] some users tests
2012-03-22 02:05:27 +06:00
Pavel Chipiga
89f31e9782
Minor gems update. Prepare gemfile for jruby and rbx tests. Remove encoding hacks. Apply grit fixes for encoding support. Recode incorrect encodings. Refactor, cleanup and fix lots bugs in git section. Refactor and remove unused git routes. Translate some untranslated parts. Redo branch/tags selector. Fix files tree last commit message. Project section templates refactor and cleanup. Refs #190
2012-03-21 21:55:14 +02:00
Vladimir Sharshov
87e1ee4700
Merge pull request #317 from warpc/232-groups_tests
...
[refs #232 ] Add groups tests and mass assignment protect
2012-03-21 12:06:00 -07:00
Alexander Machehin
bf1340939b
[refs #270 ] fixed users filtration
2012-03-22 00:02:58 +06:00
Alexander Machehin
a6a5b722d2
[refs #270 ] use devise lockable to ban
2012-03-21 23:45:51 +06:00
konstantin.grabar
72c02282aa
[refs #232 ] Add mass-assignment fixes. Add create and mass-assig tests.
2012-03-21 17:52:35 +04:00
Alexander Machehin
3c7dec3b97
Merge branch '3.2-master' into 270-user_control
2012-03-21 19:39:55 +06:00
Pavel Chipiga
8b252d8c14
Add and tune devise lockable strategy. Refs #270
2012-03-21 15:37:16 +02:00
Alexander Machehin
4a6ce6c8a8
Merge branch '3.2-master' into 270-user_control
...
Conflicts:
app/views/users/index.html.haml
2012-03-21 15:29:44 +06:00
Alexander Machehin
5c408540ff
[refs #270 ] can ban user
2012-03-21 02:06:51 +06:00
Vladimir Sharshov
347b5283b0
Merge pull request #320 from warpc/279-new_design_for_platforms
...
[issue #279 ] Disable members for personal platforms
2012-03-20 11:49:21 -07:00
George Vinogradov
cd42c912d8
[issue #279 ] Fixed permissions for personal platforms.
2012-03-20 22:41:14 +04:00
Vladimir Sharshov
047425a27f
Merge pull request #318 from warpc/279-new_design_for_platforms
...
[Refs #279 ] new design for platforms(add control for members, fix bugs)
2012-03-20 09:48:57 -07:00
George Vinogradov
7c0585ee87
[issue #279 ] Added members and other changes.
2012-03-20 20:24:18 +04:00
Vladimir Sharshov
d3c3726a84
[Refs #66 ] Add priority in build list
2012-03-20 14:56:51 +04:00
Vladimir Sharshov
56f1d06da8
[Refs #66 ] Add priority to build list
2012-03-20 14:08:24 +04:00
Vladimir Sharshov
4ce3e5bf32
Merge pull request #310 from warpc/252-user_appeal
...
[refs #252 ] fixed appeal to user in email and in welcome message in activity feed
2012-03-19 09:07:21 -07:00
George Vinogradov
ddc95c25fb
[issue #279 ] Merge branch '3.2-master' into 279-new_design_for_platforms
...
Conflicts:
app/assets/stylesheets/design/custom.scss
2012-03-19 18:56:04 +04:00
George Vinogradov
1cbc3f5b7a
[issue #279 ] Added block of connection data for personal platform.
2012-03-19 18:46:12 +04:00
Alexander Machehin
9b2dc6538d
[refs #252 ] new user notifications
2012-03-19 20:45:47 +06:00
Alexander Machehin
d5dc05233f
[refs #252 ] fixed appeal to user
2012-03-19 20:34:57 +06:00
Alexander Machehin
296acd80da
[refs #265 ] added build waiting message
2012-03-19 15:07:09 +06:00
Alexander Machehin
86871ab32d
Merge branch '3.2-master' into 265-activity_feed_messages
...
Conflicts:
config/locales/menu.en.yml
config/locales/menu.ru.yml
2012-03-17 01:09:04 +06:00
Alexander Machehin
fb89eedca3
[refs #265 ] forgot build list setup
2012-03-17 00:58:41 +06:00
Alexander Machehin
dd5f51de71
[refs #265 ] added build tasks feed
2012-03-16 21:37:58 +06:00
George Vinogradov
3d9f9b5c73
[issue #279 ] Fixed permissions and moved some buttons.
...
Removed Freeze/Unfreeze actions from Platform.
2012-03-16 17:25:34 +04:00
Vladimir Sharshov
42eb250942
Merge pull request #302 from warpc/279-new_design_for_platforms
...
[issue #279 ] Fixed some bugs:
* Redirect to repositroies page when remove repository.
* Fixed sorting background in Datatables styles.
* Fixed save button translation in platforms form.
* Fixed platform save & create flashes.
* Fixed cancel buttons in platform, product & repository forms.
* Redirect to created product on creation.
* Redirect to platform's products page after product destruction.
* Fixed permissions to Build button on product page.
* Fixed permissions to Add button on repository page.
* Fixed forbidden redirect when trying to acces
* RepositoriesController#projects_list by unprivilleged user.
2012-03-15 16:15:58 -07:00
George Vinogradov
cc68163238
[issue #279 ] Fixed some bugs:
...
* Redirect to repositroies page when remove repository.
* Fixed sorting background in Datatables styles.
* Fixed save button translation in platforms form.
* Fixed platform save & create flashes.
* Fixed cancel buttons in platform, product & repository forms.
* Redirect to created product on creation.
* Redirect to platform's products page after product destruction.
* Fixed permissions to Build button on product page.
* Fixed permissions to Add button on repository page.
* Fixed forbidden redirect when trying to acces
RepositoriesController#projects_list by unprivilleged user.
2012-03-16 02:56:12 +04:00
Vladimir Sharshov
e719633862
Merge pull request #300 from warpc/279-new_design_for_platforms
...
[Refs #279 ] new design for platforms (bugfixes, ACL and filters)
2012-03-15 14:50:37 -07:00
George Vinogradov
9911d9f25e
[issue #279 ] Removed can_clone? and can_build? from Product
2012-03-16 01:10:24 +04:00
Alexander Machehin
3719b40889
[refs #265 ] removed unused code
2012-03-16 00:22:56 +06:00
Alexander Machehin
4addff059b
[refs #265 ] added activity feed tabs
2012-03-15 23:52:54 +06:00
Vladimir Sharshov
09dcb43da8
Merge pull request #301 from warpc/265-activity_feed_messages
...
[refs #265 ] Fixed check rails env
2012-03-15 07:08:23 -07:00
Alexander Machehin
e7ac387466
[refs #265 ] fixed check rails env
2012-03-15 18:10:10 +06:00
George Vinogradov
76af82805d
[issue #279 ] Fixes.
...
* Fixed permissions.
* Added pagination in repository view.
2012-03-15 04:07:53 +04:00
George Vinogradov
3c60347a23
[issue #279 ] Fixes.
...
* Almost finished permissions fixes
* Removed is_template from product
* Some fixes in crontab_generator partial
2012-03-15 03:34:09 +04:00
George Vinogradov
747edb73a5
[issue #279 ] Merge branch '3.2-master' into 279-new_design_for_platforms
...
Conflicts:
db/schema.rb
2012-03-14 21:43:08 +04:00
Vladimir Sharshov
79e56eec52
Merge pull request #298 from warpc/265-activity_feed_messages
...
[Refs #265 ] Restyle comments and issues feeds messages, refactoring, fix bugs
2012-03-14 10:29:10 -07:00
Alexander Machehin
3642163fd7
[refs #265 ] changed feed messages
2012-03-14 23:00:26 +06:00
Alexander Machehin
20079d4fc5
[refs #265 ] changed comments feed
2012-03-14 20:40:41 +06:00
Alexander Machehin
d9c3f9ddc8
[refs #265 ] fixed comment to commit feed
2012-03-14 20:33:16 +06:00
Vladimir Sharshov
9c429e893e
Merge pull request #294 from warpc/265-activity_feed_messages
...
[refs #265 ] changed activity feed messages; fixed avatar sizes; fixed message for deleted branch
2012-03-14 05:20:48 -07:00
Vladimir Sharshov
dc6e380647
Merge pull request #296 from warpc/194-issue_page
...
[refs #194 ] fixed remove executor from issue
2012-03-14 04:18:29 -07:00
Alexander Machehin
4b8e9682b5
[refs #194 ] some refactor
2012-03-14 16:53:23 +06:00
Alexander Machehin
5ffd976086
[refs #194 ] fixed remove executor from issue
2012-03-14 16:39:59 +06:00
Vladimir Sharshov
9f9eb23e43
Merge pull request #293 from warpc/265-new_design_for_activity_feed
...
[Refs #265 ] Fix subscribe dublicates
2012-03-13 13:48:32 -07:00
Alexander Machehin
b93032e226
[refs #265 ] fixed avatar sizes
2012-03-14 00:53:37 +06:00
Alexander Machehin
ba437f7703
[refs #265 ] changed activity feed messages
2012-03-14 00:47:37 +06:00
Alexander Machehin
5b932879e2
[refs #265 ] fixed subscribe dublicates
2012-03-13 19:56:58 +06:00
Pavel Chipiga
51e2584995
Fix abilities for invites. Refs #174
2012-03-12 23:24:05 +02:00
Alexander Machehin
f6dd072a24
Merge branch '3.2-master' into 257-new_design_for_profiles
...
Conflicts:
config/locales/users.en.yml
config/locales/users.ru.yml
2012-03-12 23:04:31 +06:00
Alexander Machehin
843d95b64e
[refs #257 ] fixed 'big' geometry
2012-03-12 23:02:02 +06:00
Alexander Machehin
4fd91e2bfe
[refs #257 ] force convert avatar to jpg
2012-03-12 22:28:56 +06:00
Alexander Machehin
24639b8684
[refs 257] renamed to profile
2012-03-12 21:03:25 +06:00
Pavel Chipiga
bb7cff5de8
Fix abilities - allow users search build_lists. Refs #223
2012-03-12 13:46:57 +02:00
George Vinogradov
535c075d3e
[issue #279 ] Added platform main page, menu & sidebar
2012-03-12 03:08:50 +04:00
Pavel Chipiga
a78b7b4155
Merge branch 'master' into 3.2-master
2012-03-11 23:39:11 +02:00
Alexander Machehin
6d5120e5cc
Merge branch '3.2-master' into 265-new_design_for_activity_feed
2012-03-11 22:44:25 +06:00
Pavel Chipiga
1cf2660cda
Fix search order. Refs #255
2012-03-08 02:32:12 +02:00
Pavel Chipiga
41ae79eb46
Add configurable arch parameter to project build_for method. Write rake task for projects build. Refs #282
2012-03-08 01:25:17 +02:00
Pavel Chipiga
41cd1ddaf3
Redo cusel assign to avoid side effects. Refactor and cleanup projects controller, routes, views. Apply new design and functionality for projcts list page. Add fork button and fix fork. Apply gap repo during repo fork. Apply attr_accessible for projects. Cleanup locales. Fix new_build link ability check. Refs #195
2012-03-07 23:34:49 +02:00
Alexander Machehin
c657efc338
[refs #194 ] show all project labels without searching
2012-03-07 19:36:17 +06:00
Alexander Machehin
7588a318da
Merge branch '3.2-master' into 265-new_design_for_activity_feed
...
Conflicts:
app/models/user.rb
2012-03-07 03:58:35 +06:00
Alexander Machehin
13ba125dc0
[refs #265 ] add project_id to comment & fix email notification
2012-03-07 03:49:29 +06:00
Alexander Machehin
0f823bd9f3
[refs #265 ] fix security & commit to comments
2012-03-07 02:51:51 +06:00
Alexander Machehin
4b9d0616d6
Merge branch '3.2-master' into 194-issue_page
...
Conflicts:
app/views/issues/_create_sidebar.html.haml
2012-03-07 01:19:34 +06:00
Pavel Chipiga
7308c4a0d2
Merge branch '3.2-master' into 255-search
...
Refactor avatars. Fix user bugs. Remove ssh_key delete migration
Conflicts:
app/assets/stylesheets/design/custom.scss
app/models/user.rb
2012-03-06 20:59:29 +02:00
Alexander Machehin
872132d8a6
[refs #265 ] fix find owner and project
2012-03-07 00:20:14 +06:00
Alexander Machehin
8ae7ebee2b
Merge branch '3.2-master' into 194-issue_page
2012-03-06 22:51:13 +06:00
Pavel Chipiga
d6f9b2c3e9
Minor gems update. Apply search design and controller. Add and refactor search scopes. Fix relations. Separate and refactor search translations. Refactor search form. Refs #255
2012-03-06 17:53:04 +02:00
Alexander Machehin
b9de81f4df
[refs #194 ] managing labels in the issue
2012-03-06 21:21:13 +06:00
konstantin.grabar
7e53a6c511
[refs #265 ] Fix git push and delete branch partials and logic
2012-03-06 18:57:05 +04:00
konstantin.grabar
f54d889f74
[refs #265 ] Fix activity partials messages and locales. Fix observer.
2012-03-06 18:04:05 +04:00
Alexander Machehin
4f995ca548
[refs #265 ] hook mode 775 -> 755
2012-03-06 15:39:23 +06:00
Alexander Machehin
de0f7c83c8
[refs #265 ] fix hook and add execute bit for it
2012-03-06 15:07:14 +06:00
Alexander Machehin
9e6d06f1c9
[refs #194 ] manage issue executer
2012-03-06 00:28:55 +06:00
Vladimir Sharshov
91ba8b1543
[Refs #257 ] Fix password change, refactoring.
2012-03-05 19:36:23 +04:00
konstantin.grabar
73296059eb
[refs #257 ] Merge 3.2-master into 257-new_design_for_profiles
2012-03-05 13:42:39 +04:00
konstantin.grabar
c176304088
Add first version of new design to activity feed. Add new scope to BuildList model. Fix one moment into observer.
2012-03-05 13:11:50 +04:00
konstantin.grabar
9b68752ffd
[refs #257 ] Change avatar helper and logic. Add paperclip avatar to users
2012-03-03 22:05:02 +04:00
konstantin.grabar
f58e24b134
[refs #257 ] User edit pages fixes
2012-03-03 20:03:23 +04:00
Pavel Chipiga
159fbe65dc
Re-add compass. Add flash messages design. Refactor and fix bugs after merge. Remove duplicates, sync and separate locales . Fix some specs. Refs #263
2012-03-03 02:28:27 +02:00
Pavel Chipiga
a831a4aa63
Merge branch '3.2-master' of github.com:warpc/rosa-build into 3.2-master
2012-03-03 01:43:14 +02:00
Pavel Chipiga
56a12dc9ea
Merge branch 'master' into 3.2-master
...
Conflicts:
app/models/comment.rb
app/models/issue.rb
config/locales/en.yml
2012-03-03 01:38:43 +02:00
Vladimir Sharshov
622d80c6d3
Merge pull request #261 from warpc/194-tracker
...
[Refs #194 ] Fix ACL and tests for issues
2012-03-02 11:48:10 -08:00
Alexander Machehin
7cd3e40efc
[refs #194 ] fix accessible list
2012-03-03 01:23:45 +06:00
konstantin.grabar
8677fa7493
[refs #232 ] Remove name field
2012-03-02 14:39:48 +04:00
Alexander Machehin
56b9371ee2
[refs #194 ] add default scope for comments
2012-03-02 01:10:12 +06:00
Pavel Chipiga
7d112d0524
Fix build_lists bugs. Add build list display and new build list pages design, apply compass. Refactor and cleanup assets. Refactor abilities. Refactor build_list search. Improve layout_class helper. Change defaul build_lists index filter and fix specs. Fix assets path. Refs #223
2012-03-01 19:33:46 +02:00
konstantin.grabar
bc75b318ce
[refs #195 ] Merge 3.2-master into 195-new_design_for_projects
2012-02-29 21:37:28 +04:00
Pavel Chipiga
cefaa902b1
Apply new design for projects build monitoring page. Improve and refactor filters. Improve abilities. Switch off old statuses. Separate build_lists translations. Refactor and remove duplicate translations. Refactor and code cleanup. Fix specs. Apply layout class helper. Refs #223
2012-02-29 16:04:38 +02:00
Vladimir Sharshov
b20c533e6b
[Refs #221 ] Fix xml-rpc call
2012-02-29 16:00:02 +04:00
Alexander Machehin
2e16d3c4ee
Merge pull request #237 from warpc/221-delete_product_build_list
...
[Refs #221 ] delete product build list
2012-02-29 03:25:25 -08:00
Vladimir Sharshov
02cbec8d86
[Refs #221 ] Add xml-rpc call for iso container destroy
2012-02-29 15:15:49 +04:00
Vladimir Sharshov
97c9eab3be
[ Fix #236 ] Add application/octet-stream content type for tar.bz2 product attachment
2012-02-29 13:41:42 +04:00
George Vinogradov
fe46e53ad8
[issue #195 ] Many changes.
...
* Base presenter moved to lib
* Added diff display
* Changes in some views
TODO Add translations.
TODO Change commit page layout.
TODO Change representation of commit on commit page.
TODO Fix bug with tree/branch select.
2012-02-29 06:02:07 +04:00
Alexander Machehin
895b095058
Merge branch '3.2-master' into 194-tracker
...
Conflicts:
app/assets/stylesheets/custom.scss
app/assets/stylesheets/main.scss
2012-02-28 22:31:00 +06:00
konstantin.grabar
e9ae923b60
[refs #195 ] Merge 3.2-master into 195-new_design_for_projects
2012-02-28 20:10:31 +04:00
Vladimir Sharshov
529d8d3708
Merge pull request #192 from warpc/123-activity-feed
...
[Refs #123 ] activity feed (commits notifcation not work)
2012-02-28 07:46:55 -08:00
konstantin.grabar
06795a56be
[refs #195 ] Add sections action ability for projects
2012-02-28 19:44:16 +04:00
Pavel Chipiga
2f39b050ae
Merge branch 'master' into 3.2-master
...
Conflicts:
config/deploy.rb
2012-02-28 17:44:11 +02:00
Alexander Machehin
0abea8ff55
[refs #194 ] fix issues count
2012-02-28 20:28:11 +06:00
Alexander Machehin
bc4a157703
Merge branch '3.2-master' into 194-tracker
...
Conflicts:
app/assets/stylesheets/application.scss
app/views/issues/_form.html.haml
app/views/platforms/show.html.haml
2012-02-28 20:13:08 +06:00
Alexander Machehin
0d75a37451
[refs #194 ] show page beta version
2012-02-28 20:05:18 +06:00
Vladimir Sharshov
7d56267e03
[ Fix #224 ] Alphabetic order category list
2012-02-28 14:35:17 +04:00
Pavel Chipiga
70963d0943
Merge branch 'master' into 3.2-master
2012-02-27 22:34:21 +02:00
Pavel Chipiga
159ef26b38
Merge branch 'master' into 3.2-master
...
Conflicts:
app/views/wiki/_compare.html.haml
app/views/wiki/_diff_data.html.haml
db/schema.rb
2012-02-27 22:32:57 +02:00
Vladimir Sharshov
ddda2b92ab
[Refs #221 ] Delete product build lists (only in web)
2012-02-28 00:00:33 +04:00
Pavel Chipiga
1005fbd64f
Add link to product container. Refs #217
2012-02-27 18:21:56 +02:00
Alexander Machehin
27c85d32df
[refs #194 ] create page; index pagination; some bugs
2012-02-27 22:10:12 +06:00
Pavel Chipiga
e1f7817624
Add local admin ability to build product. Fix template links. Refactor. Refs #217
2012-02-27 15:49:24 +02:00
konstantin.grabar
72fec3b314
[refs #195 ] Add owner choose on project create
2012-02-27 13:03:28 +04:00
Alexander Machehin
dde81b5554
[refs #123 ] fix activity feed for commit comments; remove reply notification
2012-02-25 00:25:35 +06:00
Vladimir Sharshov
46a5ab1c76
Merge branch 'master' into 123-activity-feed
...
Conflicts:
config/deploy.rb
db/schema.rb
2012-02-24 20:44:36 +04:00
Vladimir Sharshov
3c8f1c062b
Fix ActivityFeed for user, remove info about password [Refs #207 ]
2012-02-24 20:33:00 +04:00
Vladimir Sharshov
3685eafe57
Remove unused code [Refs #207 ]
2012-02-24 19:35:29 +04:00
Pavel Chipiga
51e2c85b0a
Fix build_for settings. Refs #207
2012-02-24 19:28:01 +04:00
Pavel Chipiga
165a8dd6f4
Build only main repo. Refs #207
2012-02-24 19:28:01 +04:00
Pavel Chipiga
15f78e30a0
Redo platform build_all with sleep and errors rescue. Refs #207
2012-02-24 19:28:00 +04:00
Pavel Chipiga
07093c0d1d
Create directory for platform before clone. Fix created directory permissions. Increase timeout during XML RPC clone. Switch off cascade XML RPC requests during platform destroy. Refs #207
2012-02-24 19:28:00 +04:00
Pavel Chipiga
9015b971aa
Redo clone logic. Split clone process for repositories. Optimize and refactor. Refs #207
2012-02-24 19:28:00 +04:00
Pavel Chipiga
069c226110
Place platform destroy to background. Redo clone process to 2 phases - base_clone and relations_clone. Place relations clone and XML RPC to background. Remove unneeded validations. Refactor xml_rpc_clone. Refs #207
2012-02-24 19:28:00 +04:00
Pavel Chipiga
600df031f5
Refactor platform clone controller and routes. Refactor and fix clone process for platform, repository, product. Place XML RPC clone request to DJ. Refs #207
2012-02-24 19:27:59 +04:00
Pavel Chipiga
5e58ec9e59
Delegate all repo abilities to platform. Remove repository owner and relations. Fix templates and specs. Refactor and code cleanup. Refs #205
2012-02-24 19:27:58 +04:00
Alexander Machehin
30f47a1748
[refs #134 ] lost env!
2012-02-24 19:27:57 +04:00
Alexander Machehin
a809a4c116
[refs #134 ] fixed bug with new project
2012-02-24 19:27:57 +04:00
Alexander Machehin
41861185c0
[refs #134 ] fixed git hook
2012-02-24 19:27:56 +04:00
Pavel Chipiga
bab3a90155
Apply approved and rejected filters for register requests. Tune abilities. Link to user profile if user have already registered. Refs #174
2012-02-24 19:27:55 +04:00
Pavel Chipiga
bda978a306
Fix bug with group autocomplete. Do not delete during rsync
2012-02-24 17:27:49 +02:00
konstantin.grabar
28e2494e14
[refs #123 ] Remove stubs controller
2012-02-24 15:26:50 +04:00
Pavel Chipiga
dde34cdffb
Fix build_for settings. Refs #207
2012-02-23 22:20:44 +02:00
Pavel Chipiga
86c717dee5
Build only main repo. Refs #207
2012-02-23 21:06:28 +02:00
Pavel Chipiga
66fc31e404
Redo platform build_all with sleep and errors rescue. Refs #207
2012-02-23 20:32:56 +02:00
Alexander Machehin
9e5e7cd5e4
[refs #194 ] labels manage
2012-02-23 20:48:46 +06:00
Pavel Chipiga
b192ebdcea
Create directory for platform before clone. Fix created directory permissions. Increase timeout during XML RPC clone. Switch off cascade XML RPC requests during platform destroy. Refs #207
2012-02-23 00:57:43 +02:00
Pavel Chipiga
9eb191da7b
Redo clone logic. Split clone process for repositories. Optimize and refactor. Refs #207
2012-02-22 22:24:29 +02:00
Pavel Chipiga
8f4c207545
Place platform destroy to background. Redo clone process to 2 phases - base_clone and relations_clone. Place relations clone and XML RPC to background. Remove unneeded validations. Refactor xml_rpc_clone. Refs #207
2012-02-22 14:35:40 +02:00
Pavel Chipiga
5b29de93af
Refactor platform clone controller and routes. Refactor and fix clone process for platform, repository, product. Place XML RPC clone request to DJ. Refs #207
2012-02-21 23:27:11 +02:00
Alexander Machehin
ecb29d1762
[refs #194 ] tags -> labels
2012-02-22 02:28:04 +06:00
George Vinogradov
85f3d956f5
[issue #195 ] Merge branch '203-feed_message' into 195-new_design_for_projects
...
Conflicts:
app/views/layouts/application.html.haml
2012-02-21 19:42:30 +04:00
Pavel Chipiga
ed60751dfa
Delegate all repo abilities to platform. Remove repository owner and relations. Fix templates and specs. Refactor and code cleanup. Refs #205
2012-02-21 01:13:05 +02:00
Alexander Machehin
0ce76207af
[refs #194 ] Add issue tags
2012-02-21 00:41:40 +06:00
Alexander Machehin
76beb6a277
[refs #194 ] add creator to issue
2012-02-19 23:28:43 +06:00
George Vinogradov
edc8774387
[issue #203 ] Some layout changes & presenters.
...
* Fixed bugs in layout
* Fixed typos
* Fixed bugs in JS
* Added universal partial _feed_message.html.haml
* Added presenters
* Added CommitAsMessage presenter, that prepares Grit::Commit
to be shown as message.
2012-02-19 02:47:57 +04:00
Alexander Machehin
a5375c369c
[refs #134 ] lost env!
2012-02-16 22:29:41 +06:00
Alexander Machehin
4888993c3f
[refs #134 ] fixed bug with new project
2012-02-16 21:08:08 +06:00
Alexander Machehin
20836e8864
[refs #134 ] fixed git hook
2012-02-15 17:12:49 +06:00
Alexander Machehin
da0d791f74
[refs #96 ] fixed commentable & subscribeable ids
2012-02-15 02:28:01 +06:00
Pavel Chipiga
2c493cdbb7
Apply approved and rejected filters for register requests. Tune abilities. Link to user profile if user have already registered. Refs #174
2012-02-14 20:15:52 +02:00
konstantin.grabar
101fa63514
Small ActivityFeed refactoring
2012-02-14 20:46:08 +04:00
konstantin.grabar
08ffd8c25d
[refs #123 ] Add wiki to ActivityFeed
2012-02-14 20:09:41 +04:00
Pavel Chipiga
b7b69a86d8
Minor gems update. Sync with newest styles, javascripts, images. Refactor assets. Merge and fix wiki assets, temporary disable buggy ones. Change subscribeable_id type from string to decimal to avoid bugs. Auto convert commit subscribe subscribeable_id from hex to decimal. Refactor commentable. Fix bugs and some specs. Refactor application.yml. Refs #96
2012-02-14 18:05:41 +02:00
konstantin.grabar
5039907431
Merge branch 'master' into 123-activity-feed
2012-02-14 14:30:27 +04:00
Pavel Chipiga
7d74b0af13
Merge branch 'master' into 96-upgrade_rails
...
Conflicts:
Gemfile
Gemfile.lock
app/models/group.rb
app/views/layouts/application.html.haml
db/schema.rb
public/stylesheets/git/style.css
2012-02-14 02:14:03 +02:00
George Vinogradov
99c314fb11
[issue #133 ] Merge branch 'master' into 133-editing_from_web
...
Conflicts:
db/schema.rb
2012-02-13 21:48:40 +04:00
konstantin.grabar
1356ffa437
[refs #178 ] Fix project create error with group owner
2012-02-13 14:23:20 +04:00
konstantin.grabar
9271c15a5f
[refs #123 ] Add new commits support
2012-02-10 21:33:05 +04:00
Pavel Chipiga
704c544cbc
Add more register_requests fields, change design. Apply invitation mail sending. Refactor. Refs #174
2012-02-10 18:33:16 +02:00
Pavel Chipiga
e535ca2b64
Fix validations. Refs #174
2012-02-10 01:33:06 +02:00
George Vinogradov
d0fe7f55d5
[issue #174 ] added static pages and some changes
2012-02-10 02:57:43 +04:00
George Vinogradov
edef21068d
[issue #174 ] Fixed bug with RegisterRequest
2012-02-10 01:44:47 +04:00
George Vinogradov
ce39cdd04f
[issue #174 ] A half of work to create invitations system
2012-02-09 21:46:23 +04:00
George Vinogradov
e23a02d357
[issue #133 ] Some fixes in Git::Repository#update_file
2012-02-09 04:03:40 +04:00
Pavel Chipiga
7223b7deb9
Upgrade rails, devise, delayed_jobs and other gems. Fix dependencies. Apply assets pipeline, add to deploy. Refactor and cleanup Gemfile. Fix after upgrade bugs. Redo commentable_id from string to decimal. Refactor and code cleanup. Apply basic new design. Refactor main template. Automate menus. Improve translations. Refs #96
2012-02-09 01:46:25 +02:00
George Vinogradov
d44a274c77
[issue #133 ] Fixed bug and added comments
2012-02-09 00:56:18 +04:00
George Vinogradov
74d401d087
[issue #133 ] Writed draft of web editing.
2012-02-08 21:51:30 +04:00
Alexander Machehin
c47db56270
[refs #168 ] can read repos in the open platform
2012-02-07 19:55:45 +06:00
Alexander Machehin
325667dde0
[refs #168 ] removed wrong ability
2012-02-07 17:31:00 +06:00
Vladimir Sharshov
a1fcc62768
Merge pull request #167 from warpc/143-fix-destroy-group
...
[Fixs #143 ] Group dooes not destroy personal platfrom when deleting
2012-02-07 00:02:13 -08:00
Alexander Machehin
36f609ec7d
[refs #143 ] fix destroy
2012-02-07 01:47:39 +06:00
konstantin.grabar
96d3b35bdf
[refs #123 ] Merge master into 123-activity-feed
2012-02-06 19:46:32 +04:00
Vladimir Sharshov
4e3d6b4056
Show xml-rpc error code in error message
2012-02-06 19:07:08 +04:00
Vladimir Sharshov
c367fc818b
Merge branch 'master' of github.com:warpc/rosa-build
2012-02-06 19:05:50 +04:00
Alexander Machehin
fde67a2c22
[refs #134 ] add post receive hook to repos
2012-02-06 15:31:22 +06:00
Vladimir Sharshov
85c0d8b827
Change git branch for mass rebuild
2012-02-03 18:32:04 +04:00
Vladimir Sharshov
4165b188eb
Merge branch 'master' into 64-project_wiki
...
Conflicts:
app/models/project.rb
config/locales/en.yml
2012-02-03 00:55:16 +04:00
George Vinogradov
0006bf3b63
Returned before_initialize to Group.
2012-02-02 01:20:10 +04:00
Alexander Machehin
cb7a9fcc21
fix group autocomplete
2012-02-02 02:42:23 +06:00
Vladimir Sharshov
8562b882da
Merge pull request #136 from warpc/114-comment_notifications
...
Notifications and subscribtions about new comments in commit [Refs #114 ]
2012-02-01 11:12:24 -08:00
George Vinogradov
d0717c8f9e
[issue #64 ] Merge branch 'master' into 64-project_wiki
...
Conflicts:
Gemfile.lock
db/schema.rb
2012-02-01 22:39:04 +04:00
konstantin.grabar
0559f1b678
[refs #127 ] Filter request refactor
2012-02-01 20:00:19 +04:00
Pavel Chipiga
34b105675a
Add 1 more mime type to product
2012-01-31 23:29:25 +02:00
Pavel Chipiga
fde298cc85
Rollback to redhillonrails_core instead of schema_plus to avoid some bugs. Add platform reference to project_imports, change indexes and validators. Adjust sync algoritm to use platform_id. Improve rsync params. Refs #112 , #138
2012-01-31 20:48:37 +02:00
Alexander Machehin
f15cb90b87
Merge branch 'master' into 114-comment_notifications
...
Conflicts:
config/locales/ru.yml
2012-01-31 21:42:37 +06:00
George Vinogradov
24124766f4
[issue #64 ] Merge branch 'master' into 64-project_wiki
...
Conflicts:
Gemfile.lock
config/locales/en.yml
db/schema.rb
2012-01-31 02:07:11 +04:00
Pavel Chipiga
13780a1b53
Add magic encodings. Refs #95
2012-01-30 22:39:34 +02:00
Pavel Chipiga
33dce21312
Upgrade to ruby 1.9.3 and fix bugs. Fix bug with commit_hash save during project build. Move some russian text to yml. Code cleanup. Fix templates, deploy and import scripts. Fix specs. Translate event_logs. Refs #95
2012-01-30 22:36:58 +02:00
George Vinogradov
5f40030e30
[issue #64 ] Fixed bug with cloning wiki repository
2012-01-30 18:17:00 +04:00
Alexander Machehin
119c378149
[refs #114 ] change subsrcibe status to boolean
2012-01-30 17:59:57 +06:00
George Vinogradov
2f315f869d
[issue #64 ] Merge branch 'master' into 64-project_wiki
...
Conflicts:
Gemfile.lock
app/models/project.rb
db/schema.rb
2012-01-30 13:27:22 +04:00
Alexander Machehin
5efaca77cf
Merge branch 'master' into 114-comment_notifications
...
Conflicts:
app/models/project.rb
app/views/user_mailer/new_comment_notification.en.haml
app/views/user_mailer/new_comment_notification.ru.haml
app/views/user_mailer/new_comment_reply_notification.ru.haml
config/locales/devise.en.yml
config/locales/en.yml
config/locales/ru.yml
db/schema.rb
2012-01-30 13:06:06 +06:00
Alexander Machehin
8962e85b2d
[refs #114 ] fix reverting
2012-01-30 12:38:31 +06:00
Alexander Machehin
e0b7699ffd
Revert "Merge branch '114-comment_notifications' into user-emails-list"
...
This reverts commit 2179cbbf40334cbe5d4fa9ba3a7f297d8f543a0a, reversing
changes made to 9bf06e5e1a595f320dc4527ebd44f14be05fcd64.
Conflicts:
app/models/user.rb
2012-01-30 12:22:54 +06:00
Alexander Machehin
f6b6bbfb54
Revert "[refs #114 ] emails control"
...
This reverts commit 26fb1fcbfb843163231d8b8f0caf582bafccbe57.
Conflicts:
app/models/subscribe.rb
app/models/user.rb
spec/models/comment_for_commit_spec.rb
2012-01-30 12:19:54 +06:00
Alexander Machehin
dc39eefe62
Revert "[refs #114 ] add js"
...
This reverts commit 48a9c4d50b9f11a11cc4f2c5831c4b5b25fdc4d1.
2012-01-30 12:16:09 +06:00
Alexander Machehin
ea7cbe1908
Revert "[refs #114 ] fix emails uniqueness"
...
This reverts commit bc9649561f5b8ac58f9b27d31d66365f16d0cce0.
Conflicts:
app/models/subscribe.rb
app/models/user_email.rb
2012-01-30 12:15:33 +06:00
Alexander Machehin
2e2e7e43d3
[refs #114 ] some refactoring
2012-01-30 02:18:14 +06:00
Alexander Machehin
39a4479fa3
[refs #114 ] fix emails uniqueness
2012-01-29 22:27:46 +06:00
Pavel Chipiga
43a4aecc66
Change indexes to composite, unique, case insensitive. Redo sync logging. Verbose params for tasks. Refs #112
2012-01-28 04:05:31 +02:00
Pavel Chipiga
fab4aa6eb6
Refactor and fix projects by_name scope. Apply case insensitive projects, repositories and platforms name uniqness validation. Apply case insensitive project search fallback. Redirect import task outnput to log file. Rename all task. Refs #112
2012-01-28 03:04:11 +02:00
Vladimir Sharshov
e966e523e9
Merge pull request #132 from warpc/112-sync_projects
...
Auto sync for mandriva repo
* Apply rsync for mandriva repo
* Parse and import changes from official repo
* Fix attachment types
* Redo srpm upload wrapper to use it without paperclip
* Add cron task through whenever
2012-01-27 08:46:58 -08:00
Pavel Chipiga
74f891fc83
Apply rsync for mandriva repo. Parse and import changes from official repo. Fix attachment types. Redo srpm upload wrapper to use it without paperclip. Add cron task through whenever. Refs #112
2012-01-27 17:35:18 +02:00
konstantin.grabar
e01fe571b4
[refs #123 ] Add activity feed en translation fixes
2012-01-27 18:59:28 +04:00
konstantin.grabar
a5d6889999
[refs #128 ] Add devise confirmable and reconfirmable options
2012-01-27 18:58:38 +04:00
George Vinogradov
549f0a55e8
[issue #64 ] Merge branch 'master' into 64-project_wiki
...
Conflicts:
Gemfile.lock
app/models/project.rb
app/models/user.rb
app/views/projects/_form.html.haml
config/locales/ru.yml
db/schema.rb
2012-01-27 18:27:23 +04:00
Alexander Machehin
06ab99a1d0
[refs #114 ] add js
2012-01-27 18:20:07 +06:00
konstantin.grabar
72fd821bc8
[refs #123 ] Add fixes for activity feed
2012-01-27 16:06:04 +04:00
George Vinogradov
eed3040944
[issue #64 ] Changed validation message and removed unnecessary
...
validation of projects owner.
2012-01-27 10:13:56 +04:00
Vladimir Sharshov
45c175942b
Temporary change arch for mass rebuild
2012-01-27 05:00:44 +04:00
George Vinogradov
2d1e36fb1a
[issue #64 ] Changed own_projects validation.
2012-01-27 04:16:07 +04:00
George Vinogradov
ba84d5f216
[issue #64 ] Added validation of own_projects count.
2012-01-27 03:37:19 +04:00
George Vinogradov
1498e937f6
[issue #64 ] Added own_projects counters to User & Group
2012-01-27 02:33:18 +04:00
Alexander Machehin
e71a9e84cb
[refs #114 ] emails control
2012-01-27 02:11:07 +06:00
konstantin.grabar
0eb0eb9713
[refs #123 ] Activity Feed logic global refactoring.
2012-01-26 21:04:58 +04:00
Alexander Machehin
e04b2eb59b
Merge branch '114-comment_notifications' into user-emails-list
...
Conflicts:
app/models/subscribe.rb
config/locales/en.yml
2012-01-26 14:55:16 +06:00
Alexander Machehin
77420d2a8f
[refs #114 ] user emails
2012-01-26 14:53:40 +06:00
Alexander Machehin
4cca8f7bb1
[refs #114 ] some refactoring
2012-01-25 23:33:26 +06:00
konstantin.grabar
dd1493d677
[refs #123 ] Add activity feed page. Remove some unnessary code. Some logic fixes.
2012-01-25 17:05:39 +04:00
konstantin.grabar
990a46018c
[refs #123 ] Add base logic for activity feed
2012-01-25 12:31:49 +04:00