Commit Graph

459 Commits

Author SHA1 Message Date
Alexander Machehin f0d7ed0d89 [refs #114] fix notification for committer 2012-01-22 22:17:08 +06:00
Alexander Machehin ab081d3c46 [refs #114] only new comment notification 2012-01-22 22:15:25 +06:00
Alexander Machehin 36a895385c [refs #114] changed rules 2012-01-22 01:13:33 +06:00
Alexander Machehin 21d422c313 [refs #114] refactoring subscribe 2012-01-21 19:32:22 +06:00
Alexander Machehin d8df6c6279 [refs #114] committer subscribe + some tests 2012-01-21 00:22:25 +06:00
Alexander Machehin 06a977ea21 Merge branch 'master' into 114-comment_notifications 2012-01-20 22:03:04 +06:00
Alexander Machehin 371abac031 [refs #114] fix controller tests 2012-01-20 21:17:05 +06:00
George Vinogradov 011efb0c4b [issue #64] Added git access to Wiki. 2012-01-20 19:01:59 +04:00
Vladimir Sharshov bae56741d0 Temporary disable AutoBuild functions for users (not working at now) 2012-01-20 12:24:57 +04:00
Alexander Machehin 800b02f544 [refs #18] Add project subsribe, tests 2012-01-20 00:20:03 +06:00
George Vinogradov 022a013b79 [issue #64] Added Wiki seeding on create. 2012-01-19 16:06:27 +04: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
konstantin.grabar 01d8cd8dcc [refs #105] Change LANGUAGE constant into User 2012-01-18 17:06:18 +04:00
konstantin.grabar d205eb2dd9 [refs #105] Add language check on user save 2012-01-17 15:57:46 +04:00
konstantin.grabar 726eddc40e [refs #105] Add internationalization support to project 2012-01-17 15:48:40 +04:00
Alexander Machehin a0aad7103e some fixes 2012-01-17 17:38:40 +06:00
Alexander Machehin d2c5df93a9 Merge branch '18-commit_comments' of github.com:warpc/rosa-build into 18-commit_comments
Conflicts:
	app/models/comment.rb
	app/models/issue.rb
	app/views/comments/edit.html.haml
	app/views/issues/show.html.haml
2012-01-17 15:57:12 +06: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
Alexander Machehin 80ba40f6ee Merge branch 'master' into 18-commit_comments
rspec spec/ = 528 examples, 12 failures
2012-01-17 00:52:16 +06:00
Alexander Machehin bdc3b3a3d1 [refs #18] controller tests 2012-01-14 18:16:42 +06:00
konstantin.grabar a1a92e9878 [refs #54] Fix comments serial_id routing and some logic 2012-01-13 20:07:46 +04:00
konstantin.grabar db0a66846b [refs #94] Add new notifier rules. Fix some issues and comments bugs 2012-01-13 19:07:01 +04: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
Alexander Machehin caf7adef70 [refs #18] FIXME subscribe don't work 2012-01-12 20:50:27 +06:00
konstantin.grabar 980e455b31 [refs #54] Fix comment deliver notification user check 2012-01-12 17:45:22 +04:00
konstantin.grabar f6e4de3b72 [refs #54] Fix issue assign user subscribe update filter 2012-01-12 17:07:54 +04:00
Alexander Machehin f8d00f5235 [refs #18] Fix cancan ability for commit comments 2012-01-12 18:04:16 +06:00
Alexander Machehin 07dc7a4800 [refs #18] add comments to commit 2012-01-12 17:19:22 +06:00
Alexander Machehin c18b71bf0b [refs #18] changed refs id to string 2012-01-12 00:10:23 +06:00
konstantin.grabar 2b8aca5f09 [refs #54] Add settings notifier 2012-01-11 17:58:13 +04:00
konstantin.grabar 16c9d0ec15 [refs #54] Fix some bugs of issues and comments + add comment body to email 2011-12-31 14:51: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 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 fa8656d1f5 [refs #54] Refactor subscires routes and authorize 2011-12-28 17:54:45 +04:00
konstantin.grabar 1c263c6e0a [refs #54] Notification DJ support. Routes fixes. 2011-12-28 14:47:54 +04: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
konstantin.grabar ecbfed9300 [refs #54] Fix user_id validation into issues 2011-12-27 21:49:08 +04: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
konstantin.grabar 5237939f49 Merge issues with master 2011-12-26 13:26:13 +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
konstantin.grabar e2144e0fdb [refs #54] Fix issue ability and comment redirect after update 2011-12-22 11:41:37 +04:00
Pavel Chipiga 96d458875e Remove publish validator. Add can_cancel/can_publish checking to cancel/publish methods. Refs #80 2011-12-22 04:08:11 +02:00
Pavel Chipiga a82f59f35a Add route, action and statuses for publish_build. Apply status assign and check. Localize statuses. Convert tabs to spaces. Refs #80 2011-12-22 02:53:55 +02:00
Pavel Chipiga 2ac4391edf Redo build_list publish to check returned status. Refs #77 2011-12-22 01:31:05 +02:00
Pavel Chipiga 2c67843c34 Refactor and cleanup build_lists controller and routes. Rename methods. Allow deffis in platform and repository name. Add missing relation and migration to force work user assign in build_lists. Fix and simplify links. Abstract sidebar. Refs #65 2011-12-21 23:42:06 +02:00
Pavel Chipiga e588482f32 [#74] Merge branch 'master' into 65-build_repo
Conflicts:
	app/controllers/build_lists_controller.rb
	app/controllers/projects_controller.rb
	db/schema.rb
2011-12-21 20:13:57 +02:00
konstantin.grabar 3ab55d34b8 [refs #54] Add CanCan rules for issues and comments. Fix serial_id routes and some actions 2011-12-21 18:48:16 +04:00
Pavel Chipiga d901426b79 Move project build functinality to build_lists controller. Refactor downloads url - create model based methods for url genertion. Cleanup code. Add includeed_repos functionality. Display included_repos on build_list page. Refs #65 2011-12-21 16:01:50 +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
Vladimir Sharshov cb91bdb858 Merge pull request #68 from warpc/build_list_visibilities
Customize build list monitoring:
* show all user public build list
* show private build list only who have access for project
* admin see all build list
2011-12-20 15:46:43 -08: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 0978312366 [update #27] Removed unnecessary comments. 2011-12-20 21:22:44 +04:00
George Vinogradov 39dade9945 [closed #63] Added user column to build_list. 2011-12-20 21:09:29 +04:00
konstantin.grabar 375c98366f [ref #54] Add has_issue settings to projec edit. Fix routes and friendly_id bug. Fix some moments 2011-12-20 20:57:34 +04:00
konstantin.grabar 446cdac8e6 [refs #54] Add new locales. Fix routes. Fix issues and comments update 2011-12-20 14:20:00 +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
konstantin.grabar f9c46185fc [refs #41] Remove platform validation stub 2011-12-16 12:48:39 +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 88ea7110f3 [issue #23] Fixed scope 'by_name' in Project model. 2011-12-16 04:32:42 +04:00
George Vinogradov 194aabdbc3 [issue #27] Fixed typo in ability.rb 2011-12-16 02:09:05 +04: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
George Vinogradov e3663381db Merge branch 'master' into build_list_visibilities 2011-12-15 03:29:22 +04:00
George Vinogradov 97c43b74e3 Merge pull request #46 from warpc/1-bluepill
1 bluepill

  *  Apply bluepill configuration, write capistrano recipe for it
  *  Change deploy logic to integrate with bluepill
  *  Refactor unicorn config, run it through unixsocket
  *  Cleanup depoy
  *  Refactor mount_downloads script
  *  Write autostart script. Launch from rosa user
  *  Remove old scripts
  *  Refactor platform mount/umount methods
  *  Debug
2011-12-14 14:29:28 -08:00
Pavel Chipiga a855366a75 Fix merge bug. Take back method. Refs #1 2011-12-15 00:11:31 +02: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
Pavel Chipiga f1465f51ca Merge branch 'master' into 1-bluepill
Conflicts:
	app/controllers/platforms_controller.rb
	app/models/platform.rb
2011-12-14 23:51:31 +02:00
George Vinogradov 7b6863352f [fixed #34] Changed skopes in BuildList model. 2011-12-14 20:30:35 +04:00
Vladimir Sharshov b18b598a4a Merge pull request #43 from warpc/nginx_log_parse_fix
[refs #42] Fix rpm name parse into Download parse method(name included "-")
2011-12-14 03:20:00 -08:00
Vladimir Sharshov 9ab07c1675 Merge pull request #36 from warpc/platform_edit
Edit platform;
Added callback updates with new owner.
Added a button for call edit action;
Removed unnecessary to edit platform form field when you upgrade.
2011-12-14 03:15:41 -08:00
konstantin.grabar 1d6df950c4 [refs #42] Fix rpm name parse into Download parse method 2011-12-14 15:09:22 +04:00
Vladimir Sharshov 1d55e8758e Merge pull request #26 from warpc/platform_admin_fixes
Fix autocomplete. Rsync stubs for development env. Blocked problematic validation for development env
2011-12-14 02:00:01 -08:00
Pavel Chipiga 045b8441f6 Apply basic bluepill configuration, write capistrano recipe for it. Change deploy logic to integrate with bluepill. Refactor unicorn config. Cleanup depoy. Refactor mount_downloads script. Write autostart script. Remove old scripts. Refactor platform mount/umount methods. Fix bugs. Refs #1 2011-12-13 23:48:25 +02:00
George Vinogradov 30b08c4a80 [issue #27] Commented maybe unnecessarry scope.
Removed BuildList#scoped_open_to_user_with_groups because its
functionality provides CanCan after changes in [issue #37].
2011-12-13 19:24:02 +04:00
George Vinogradov b1eac17c4c [issue #37] Fixed typos. 2011-12-13 19:11:16 +04:00
George Vinogradov 0d668be2c7 [issue #37] Fixed typos 2011-12-13 18:28:22 +04:00
George Vinogradov 7ebc2f22c9 [issue #37] Maybe fixed bug that user can't show created build_list 2011-12-13 18:21:25 +04:00
konstantin.grabar 4a723369a2 [refs #12] Add platform update options 2011-12-13 17:27:27 +04:00
George Vinogradov 43feb029cd [issue #27] Added new scope to BuildList 2011-12-13 04:13:36 +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
Vladimir Sharshov c0080388a1 Close #24. Uninitialized constant BuildList::BUILD_STARTED 2011-12-12 20:51:38 +04:00
Vladimir Sharshov 9d7cbab0f6 Fix #24 "unexpected tCONSTANT, expecting '}'" 2011-12-12 20:16:05 +04:00
konstantin.grabar 6a364b73a6 [refs #12] Fix platform admin relations. Locales correction. Add validationa and rsync stubs. 2011-12-12 18:10:39 +04:00
Vladimir Sharshov 55c41ca306 Fix mistake in dependency_test_failed 2011-12-12 16:49:15 +04:00
Vladimir Sharshov cf18550cfb #24. Add new statuses and remove repetition 2011-12-12 16:34:20 +04:00
konstantin.grabar e85ed8c1ca [refs #9] Add corrections to sudo refactored code 2011-12-09 11:04:11 +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
konstantin.grabar 0f855356ac [refs #6] Add sudo mount fixes. Rename ID Admin fields into platform form 2011-12-09 00:41:01 +04:00
Vladimir Sharshov dc95df1073 Merge pull request #9 from warpc/groups_repositories_fixes
Fixed bug with duplicate relations and removed unnecessary routes and views part in users and groups, close #4
2011-12-08 07:10:38 -08:00
George Vinogradov 3e41e6fb42 Issue #4 fixed duplication of Relations when creating personal
repository
2011-12-08 18:03:56 +04:00
konstantin.grabar 25f06edb65 Downloads and Rsync mount with sudo refactor 2011-12-08 11:44:02 +04:00
Pavel Chipiga b89416e125 Add project name and bs_id filters for the build_lists list. Refactor and code cleanup to close #2 2011-12-08 00:46:01 +02:00
Pavel Chipiga 6794ca42fb Fix date filter normalization. Add build, freeze, unfreeze confirmation. Refs #2261 2011-12-07 02:09:04 +02:00