Commit Graph

298 Commits

Author SHA1 Message Date
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 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
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
Alexander Machehin e71a9e84cb [refs #114] emails control 2012-01-27 02:11:07 +06: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 990a46018c [refs #123] Add base logic for activity feed 2012-01-25 12:31:49 +04:00
Pavel Chipiga 3f4bf65825 Upgrade paperclip. Apply srpm_import script and UI. Fix specs. Refs #31 2012-01-24 22:35:36 +02:00
Alexander Machehin 61be317b21 [refs #114] i18n 2012-01-25 01:00:51 +06:00
Alexander Machehin 6582a9afa5 [refs #114] fix tests 2012-01-24 18:15:56 +06:00
Alexander Machehin 651c5637ed [refs #114] fix committer notification 2012-01-22 23:49:41 +06:00
Alexander Machehin 36a895385c [refs #114] changed rules 2012-01-22 01:13:33 +06:00
Alexander Machehin d8df6c6279 [refs #114] committer subscribe + some tests 2012-01-21 00:22:25 +06:00
Alexander Machehin 3a00a66b86 [refs #114] polish controller tests 2012-01-20 22:48:21 +06:00
Alexander Machehin 371abac031 [refs #114] fix controller tests 2012-01-20 21:17:05 +06:00
Alexander Machehin 876351edb5 [refs #114] Fixed tests 2012-01-20 12:27:13 +06:00
Alexander Machehin 800b02f544 [refs #18] Add project subsribe, tests 2012-01-20 00:20:03 +06:00
Alexander Machehin dba11f4662 [refs #114] FIXME subscribers 2012-01-19 01:12:52 +06:00
Pasha 4ba268dd67 Merge pull request #109 from warpc/18-commit_comments
18 commit comments
2012-01-18 05:49:57 -08:00
Pavel Chipiga f8be867aaf Replace annotated tags to lightweight. Improve specs. Restore lost migrations. Refs #103 2012-01-17 19:37:41 +02:00
santaux 62d0419bdd Merge pull request #106 from warpc/103-bl_publish_new_params
Сохранение сборочного коммита, добавление неподписанного тега на сохраненный коммит после публикации
2012-01-17 04:34:15 -08:00
Pavel Chipiga b5170e2f2a Write specs for tag based build. Refs #103 2012-01-17 14:25:54 +02:00
Alexander Machehin bf4e4f02ed Right merge branch 'master' into 18-commit_comments
Conflicts:
	app/controllers/comments_controller.rb
	app/views/comments/edit.html.haml
	app/views/issues/show.html.haml
	db/schema.rb
2012-01-17 15:52:46 +06:00
konstantin.grabar ee58a8e789 [refs #54] Fix comments failed specs 2012-01-17 12:20:06 +04:00
Pavel Chipiga a687a6601b Save commit_hash during build_list create. Tag git repo during build_list publish. Write and fix specs. Refs #103 2012-01-16 23:51:20 +02:00
Vladimir Sharshov 68744b1676 Fix broken tests in #94 from pull request #92 2012-01-17 01:07:48 +04:00
Alexander Machehin 69debdd83e fix tests for shared elements 2012-01-16 19:43:23 +06:00
konstantin.grabar 52696791f2 [refs #54, #94] Merge master into issues 2012-01-16 13:42:44 +04:00
Alexander Machehin 674d5f8e56 [refs #18] model tests 2012-01-14 18:36:00 +06:00
Alexander Machehin bdc3b3a3d1 [refs #18] controller tests 2012-01-14 18:16:42 +06:00
Pavel Chipiga 712ca8d95a Save package_version during success build_list publish. Add specs. Refs #103 2012-01-13 18:45:13 +02:00
Alexander Machehin 794c55a030 Merge branch 'master' of github.com:warpc/rosa-build into 18-commit_comments 2012-01-13 22:01:30 +06:00
Alexander Machehin 2b1fe79adc [refs #18] controller tests 2012-01-13 22:00:28 +06:00
George Vinogradov 729bd94045 [issue #64] Merge branch 'master' into 64-project_wiki
Conflicts:
	config/routes.rb
	db/schema.rb
2012-01-13 18:05:42 +04:00
Pavel Chipiga c23312ad51 Research and fix problem with build_lists#auto_publish feature. Fix specs. Refs #97 2012-01-11 21:43:33 +02:00
konstantin.grabar 2b8aca5f09 [refs #54] Add settings notifier 2012-01-11 17:58:13 +04:00
konstantin.grabar dda40d9e9d [refs #54] Mailer specs for comments and issues 2012-01-11 11:12:23 +04:00
konstantin.grabar 60a7f3e87f [refs #54] Fix comments specs 2012-01-10 15:24:43 +04:00
konstantin.grabar a44530980e [refs #54] Remove some unnessacary comments 2011-12-30 18:44:47 +04:00
konstantin.grabar e8977a7d95 Merger issues with master 2011-12-30 18:23:16 +04:00
konstantin.grabar 3f72082e0e [refs #54] Add comments, subscribes models specs. Finish subscribes controller specs. Some ability.rb fixes 2011-12-30 18:21:08 +04:00
konstantin.grabar 402133aff6 [refs #54] Add some subscribe specs and factory 2011-12-29 21:03:53 +04:00
konstantin.grabar 635e2b7977 [refs #54] Add comments specs and factory. Remove unused code. Add one delay and fix some links. 2011-12-29 15:16:54 +04:00
Pavel Chipiga acb970686c Apply auto_publish for build_lists. Apply publish build_list error status. Remove circle build info. Display auto_publish info. Fix bugs. Refactor. Apply specs for all build_lists core callbacks. Refs #72 2011-12-29 04:37:34 +02:00
konstantin.grabar a783b460bd Merge issues with master 2011-12-28 13:22:57 +04:00
Pavel Chipiga 5e3addd5d2 Great refactor for cancan abilities. Remove product relations. Fix git abilities. Fix and refactor specs. Refs #85. Refactor issues controller to avoid serial_id problem. Fix links and routes. Fix minor bugs and translations. Fix specs. Refs #54 2011-12-28 04:59:05 +02:00
George Vinogradov 81378478ca [issue #64] Added Wiki controller and some methods in Project 2011-12-26 21:07:07 +04:00
konstantin.grabar ce6746f7a9 [refs #54] Add subscribes and notifications 2011-12-26 19:48:57 +04:00
Pavel Chipiga 7d3dd5eaf1 [#82] Merge branch 'master' into 65-build_repo
Conflicts:
	spec/models/cancan_spec.rb
2011-12-26 14:51:30 +02:00
konstantin.grabar 5237939f49 Merge issues with master 2011-12-26 13:26:13 +04:00
Pavel Chipiga 0e5b39985e Clarify tests. Write autostart docs. Refs #65, #53 2011-12-23 20:47:13 +02:00
George Vinogradov 3b300f2ca4 [issue #79] Removed comments 2011-12-23 21:17:02 +04:00
George Vinogradov 7d8d77a386 [issue #79] Added validation to ProjectToRepository 2011-12-23 21:06:47 +04:00
konstantin.grabar 894bc0c077 [refs #54] Add issues tests. Fix some CanCan rights. Make some fixes to logic 2011-12-23 14:56:46 +04:00
Pavel Chipiga 8c3291d237 Fix and redo specs after great build_lists refactoring and improvement. Fix minor bugs. Code cleanup. Refs #65 2011-12-23 04:14:28 +02:00
George Vinogradov 6c48e058be [close #70] Removed all & filter methods in BuildListsController
*  Removed methods
*  Changed abilities
*  Changed routes
*  Added specs
2011-12-21 05:30:34 +04:00
George Vinogradov 3eb2ae545a [issue #27] Merge branch 'master' into build_list_visibilities
Conflicts:
	app/views/build_lists/_filter.html.haml
2011-12-20 21:25:35 +04:00
George Vinogradov ce008fdeb1 [issue #27] Added group specs. 2011-12-20 16:59:09 +04:00
George Vinogradov 70e04c25fd [issue #27] Rewrited spec. Need to add spec for groups. 2011-12-20 12:44:58 +04:00
konstantin.grabar d20d43eb2b [refs #54] Base logic and templates for issues and comments to them 2011-12-19 19:30:14 +04:00
santaux df61ee8459 Merge pull request #59 from warpc/23-project_search_fixes
#23 project search fixes
2011-12-16 00:14:37 -08:00
konstantin.grabar c81698b81b [refs #57] Forbid access to users_path for simple users 2011-12-16 11:32:34 +04:00
George Vinogradov a946349bb4 [close #23] Changed searching. 2011-12-16 04:33:44 +04:00
Vladimir Sharshov 021f1f8691 Merge pull request #58 from warpc/47-fork_bug
Fix #47. Problem with fork when project already exist in personal repository

* Allow to add only own projects to personal repository(solution);
* Fix tests;
* Remove deprected relation.
2011-12-15 14:08:03 -08:00
George Vinogradov 0c3b62b235 [issue #27] Changed abilities. Added test, but test fails. 2011-12-16 01:58:20 +04:00
Pavel Chipiga 7448d74416 Allow to add only own projects to personal repository. Fix tests. Remove deprected relation. Refs #47 2011-12-15 23:52:45 +02:00
konstantin.grabar 2290cd8601 [refs #32] Add users controller specs 2011-12-15 21:08:29 +04:00
konstantin.grabar df124275cd Merge conflicts of master to rename_all_shared_examples 2011-12-15 16:22:20 +04:00
konstantin.grabar aca207cda4 [refs #40] Global test names and shared examples refactor 2011-12-15 13:38:40 +04:00
Vladimir Sharshov a931fd4bad Add stub rsync for test (missing in #38). Problem describe in #8 2011-12-15 02:29:29 +04:00
Vladimir Sharshov 85231d3f91 Merge pull request #38 from warpc/37-acl_build_list_bug_fix
[issue #37] Fixed bug that user can't show created build_list

* Changed ability.rb to grant priviliges to show build_list to non-admin users
* Added specs
2011-12-14 14:09:39 -08:00
George Vinogradov c118e69769 [issue #37] Moved shared examples to main file. 2011-12-15 02:04:05 +04:00
George Vinogradov 9510318937 [issue #37] Added shared specs for build_lists_controller 2011-12-15 01:31:46 +04:00
George Vinogradov 4c8e66816b [issue #37] Changed specs. 2011-12-15 01:30:15 +04:00
George Vinogradov 98bbc2e6e6 [issue #37] Added tests. 2011-12-15 01:04:39 +04:00
Vladimir Sharshov 4d42fb67e1 Fix collaborators controller broken tests
Fix members controller broken tests
Add platforms controllers test
Fix mistake in cancan model test
2011-12-15 00:49:33 +04:00
Vladimir Sharshov b03805bccc Merge pull request #35 from warpc/build_list_date_fix
[fixed #34] Changed scopes in BuildList model
2011-12-14 09:37:03 -08:00
George Vinogradov dd1d7426c4 [update #34] Changed spec 2011-12-14 20:31:52 +04:00
George Vinogradov 528bcac033 [update #34] Added spec. 2011-12-14 20:30:35 +04:00
George Vinogradov 2a108981d5 [update #20] To server sends id instead of uname. Added some specs 2011-12-14 19:54:04 +04:00
konstantin.grabar 2c2fcb4a76 [refs #40] Refactor collaborators specs names 2011-12-13 19:03:06 +04:00
santaux bd8788fe49 Merge pull request #33 from warpc/8-personal_controller_tests
Fix #8.  Add pretty view for test listing, fix "mount ---", fix warning
2011-12-13 05:56:11 -08:00
Vladimir Sharshov 9478597c6f Fix #8. Remove unused code in tests 2011-12-13 17:44:44 +04:00
santaux 24766d2383 Merge pull request #14 from warpc/group_members_change
Changed adding members to group.
2011-12-13 02:16:37 -08:00
Vladimir Sharshov 602c59505e Fix #8. Add pretty view for test listing, fix "mount ---", fix warning 2011-12-13 13:20:11 +04:00
Vladimir Sharshov 0d2351a3f7 Merge pull request #22 from warpc/shared_examples_refactor
Fix sudo refactoring code. Refactoring tests(stub rsync calls, change shared examples)
2011-12-12 09:16:58 -08:00
konstantin.grabar 2c88c76876 [refs #8] Refactore some shared examples. Stubed rsync and sudo calls. Fix some specs. 2011-12-12 11:51:39 +04:00
George Vinogradov c3f4c8dd87 [updated #16] admin_id renamed to admin_uname. 2011-12-11 21:43:42 +04:00
George Vinogradov b9c0f1e3d9 [fixed #16] Changed owner fetching in PlatformsController#create 2011-12-11 20:00:50 +04:00
George Vinogradov 168e110169 [close #11] Changed adding members to group. 2011-12-10 03:40:13 +04:00
Vladimir Sharshov 5e3711505c Merge pull request #5 from warpc/build_lists_filter
New build lists filter (search by name and bs_id)
2011-12-08 14:17:03 -08:00
Pavel Chipiga 0ca7c5d451 Rename bs_id label and key. Stub XML RPC to raise exception and fix spec. Write specs for build_lists filters. Refs #2 2011-12-08 20:51:25 +02:00
George Vinogradov 3e41e6fb42 Issue #4 fixed duplication of Relations when creating personal
repository
2011-12-08 18:03:56 +04:00
George Vinogradov 26689f3bd2 Start writing Group tests. 2011-12-07 23:51:08 +04:00
konstantin.grabar 0f827f2644 [refs #2249] Fix collaborators controller. Fix projects specs. 2011-12-07 13:47:43 +04:00
konstantin.grabar fcc17da1ad [refs #2249] Add products specs. Fix some things in other specs 2011-12-06 19:24:33 +04:00
konstantin.grabar fc4643ce9b [refs #2249] Fix some specs. Fix shared examples. Fix new/create repositories and products ability 2011-12-06 19:24:33 +04:00
Pavel Chipiga 04a17cb691 Redo deploy to work multistage on same host. Add ui and pingwinsoft stages, Refactor deploy. Refactor XML RPC stub. Apply nginx config generation script. Fix scripts. Cleanup code and config. Refs #2261 2011-12-06 16:45:20 +02:00
Pavel Chipiga d7c9452efa Update gems. Redo exception catch for BuildServer.get_status. Write specs. Experiments with large file uploads. Refs #2261 2011-12-02 03:30:25 +02:00
konstantin.grabar eed248676d [refs #2249] Add personal repositories specs. Correct perosnal repository factory 2011-11-30 13:53:53 +04:00
Pavel Chipiga 0134f4adf9 Fix bugs after renaming unixname to name. Refs #2261 2011-11-30 01:41:12 +02:00
konstantin.grabar e92f633124 [refs #2249] Add repositories specs. Fixes perosonal repo factory 2011-11-29 21:45:03 +04:00
konstantin.grabar ff9bfa3f9d [refs #2249] Add corrections to rspec controllers tests 2011-11-29 18:36:51 +04:00
konstantin.grabar 05054abdb9 [refs #2249] Add platforms specs. Correct some collaborators specs 2011-11-28 17:28:29 +04:00
Pavel Chipiga 02a813a474 Upgrade rails, devise and other gems. Refactor controllers. Fix application.yml config - remove unused keys and setup correct values for tests. Add product build lists status_build callback auth. Allow platform and project unixname uppercase. Write tests and fix bugs for ProductBuildList controller. Fix all unresolved test problems. Refs #2262 2011-11-26 02:54:40 +02:00
Vladimir Sharshov 74acc3b4a5 Block non-working test 2011-11-25 22:59:00 +04:00
Vladimir Sharshov b1affb3f32 Config APP_CONFIG['root_path'] for testing 2011-11-25 22:57:56 +04:00
konstantin.grabar 8200f1c5e2 [refs #2249] Fix colloborators specs 2011-11-25 20:36:02 +04:00
konstantin.grabar c2202e8113 [refs #2249] Add projects controller specs 2011-11-25 20:23:10 +04:00
Pavel Chipiga 796ff75857 Great models refactoring. Refactor some cancan abilities and controllers authorization. Move some common parts to modules. Fix lots bugs. Remove unused files and code. Drop ACL tables. Add more can? helpers. Refs #2249 2011-11-24 23:48:58 +02:00
konstantin.grabar 0573acb650 [refs #2249] Add more Collaborators and Projects controllers specs 2011-11-24 23:22:37 +04:00
konstantin.grabar 97e4a7d26d [refs #2249] Finished CanCan models tests. Add new factories 2011-11-23 22:12:55 +04:00
konstantin.grabar fc3c6a05c9 [refs #2249] CanCan tests 2011-11-22 23:21:31 +04:00
konstantin.grabar 140eaf6265 [refs #2249] Remove old roles managment system 2011-11-21 21:43:37 +04:00
Pavel Chipiga 7996740ae7 Improve build_lists time. Apply product build lists basic functionality. Move product build functionality to separate controller. Apply event logging for product build. Fix logging for project build list publishing. Code refactor and cleanup. Refs #2161 2011-11-11 19:13:09 +02:00
George Vinogradov b9ee6e365b Added collaborators management. 2011-10-31 02:59:03 +04:00
konstantin.grabar 30564e8e17 [refs #2161] Add auto build lists functional 2011-10-29 23:09:50 +04:00
konstantin.grabar 3114eb1ecc [refs #2106] Add personal repos to project. Some changes of private repos controller and logic 2011-10-27 17:04:03 +04:00
George Vinogradov 54c7c80af8 Merge branch 'master' of github.com:warpc/rosa-build 2011-10-22 19:57:26 +04:00
George Vinogradov a69b55502d Added specs form merged branches 2011-10-21 19:41:03 +04:00
Pavel Chipiga 644d57b420 Merge branch 'catalog'
Conflicts:
	Gemfile
	Gemfile.lock
	app/views/layouts/application.html.haml
	app/views/repositories/show.html.haml
	config/locales/ru.yml
	config/routes.rb
	db/schema.rb
2011-10-21 17:55:41 +03:00
George Vinogradov 505cb74c34 Merge branch 'itima_web_refactoring'
Conflicts:
	app/models/user.rb
2011-10-20 20:00:52 +04:00
George Vinogradov a92282de1e Merge branch 'chipiga'
Conflicts:
	app/controllers/application_controller.rb
	app/views/layouts/application.html.haml
	config/locales/ru.yml
	db/schema.rb
2011-10-20 19:55:03 +04:00
George Vinogradov 1659ad5805 Merge branch 'private_repos'
Conflicts:
	config/application.yml.sample
	config/locales/ru.yml
	config/routes.rb
	db/schema.rb
2011-10-20 19:49:35 +04:00
George Vinogradov 2dd99d32f9 Merge branch 'downloads'
First turn of merging.

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	config/locales/ru.yml
	config/routes.rb
	db/schema.rb
2011-10-20 19:22:11 +04:00
Pavel Chipiga 5291752419 Add categories and apply basic CRUD actions. Add category link and description to project. Apply category assign to project. Apply categorization with platforms. Integrate to common design and layout. Import basic categories structure. Refs #1858 2011-10-19 23:58:31 +03:00
Toljio b84ab42d00 add extension actions, model role_relations 2011-10-20 00:19:45 +04:00
santaux 5f17928423 [refs #1923] Add private repositories to project 2011-10-18 17:47:17 +04:00
Pavel Chipiga 5f705cdd0d Develop and apply event logging mechanism without source code modification and with localization. Apply events log display with pagination. Apply XML RPC requests stub for local test. Refactor. Refs #1828 2011-10-17 11:04:36 +03:00
santaux 8103b14e15 [refs #1861] Add downloads statistics 2011-10-14 10:35:25 +04:00
George Vinogradov 229b4bb3f4 Created new models and provided relationships between them. 2011-10-13 19:55:03 +04:00
Alexey Nayden cd6e7ade15 Product Builder xml-rpc and Product model 2011-04-11 12:35:08 +04:00
Timothy N. Tsvetkov 3b51d53225 freeze + spec 2011-03-17 17:47:16 +03:00
Timothy N. Tsvetkov a655d0eb6b sequences for the factory girl 2011-03-17 17:03:02 +03:00
Alexey Nayden 002dc417b5 Container/Arch/Rpm 2011-03-16 00:52:27 +03:00
Alexey Nayden 80304ef7f2 Trying to add repositories to my hierarchy 2011-03-11 19:08:41 +03:00
Alexey Nayden 0ff80b3e16 User management 2011-03-11 00:48:15 +03:00
Alexey Nayden 0a7c0e4e9b Platforms list + UI enchancements 2011-03-10 14:35:46 +03:00
Alexey Nayden af3c9b52be Hoptoad + blank platforms#index 2011-03-09 22:27:51 +03:00
Alexey Nayden 0218f5dfd0 Platform and Project core models 2011-03-09 20:38:21 +03:00
Alexey Nayden d3fd18a700 Device users 2011-03-09 19:16:48 +03:00
Alexey Nayden eae3c46912 Initial commit 2011-03-09 16:13:36 +03:00