Commit Graph

957 Commits

Author SHA1 Message Date
Pavel Chipiga a61d211862 Fix bugs. Change included_repos format. Refs #65 2011-12-21 20:59:19 +02:00
Pasha de40834382 Merge pull request #74 from warpc/65-build_repo
Подключаемые репозитории
2011-12-21 10:16:34 -08: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
Pavel Chipiga 7f58a52602 Autocheck current save platform and disable unavailable base platforms on JS level. Refs #65 2011-12-21 19:51:55 +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
santaux c1292d4873 Merge pull request #71 from warpc/70-build_list_controller_refactoring
Removed all & filter methods in BuildListsController
2011-12-21 02:25:32 -08: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
Vladimir Sharshov dc8021da9b Merge pull request #69 from warpc/63-build_list_show_user
Show user that create build list
2011-12-20 09:41:04 -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
George Vinogradov 61cd0a7532 [close #27] Fixed error in template. 2011-12-20 17:08:48 +04:00
George Vinogradov ce008fdeb1 [issue #27] Added group specs. 2011-12-20 16:59:09 +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
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
Vladimir Sharshov f1206a4abd Merge pull request #62 from warpc/platform_validation_problem
[Fix #41] Remove platform validation stub
2011-12-16 00:58:41 -08: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
Vladimir Sharshov 19eb931b76 Merge pull request #61 from warpc/change_project_build_title
[solved #56] Add project name in project build page title
2011-12-16 00:01:46 -08:00
konstantin.grabar 58cfe07124 [refs #56] Change project build page title 2011-12-16 11:59:34 +04:00
Vladimir Sharshov 15d41e1334 Merge pull request #60 from warpc/change_users_path_rights
[refs #57] Forbid access to users_path for simple users
2011-12-15 23:57:41 -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
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
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
Vladimir Sharshov 9fa3d534b8 Merge pull request #55 from warpc/user_search_extending
Add nickname in user list
Add search by email
2011-12-15 13:44:47 -08:00
konstantin.grabar 2290cd8601 [refs #32] Add users controller specs 2011-12-15 21:08:29 +04:00
konstantin.grabar 7f10fea681 [refs #32] Add user uname field to user profile 2011-12-15 20:20:17 +04:00
konstantin.grabar b3f422e713 [refs #32] Add user filter 2011-12-15 20:15:25 +04:00
Vladimir Sharshov 3575d5a266 Merge pull request #51 from warpc/rename_all_shared_examples
Refactoring all shared examples for best viewing
2011-12-15 04:57:40 -08: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
Pavel Chipiga 06e08dcfc6 Fix indentions 2011-12-15 02:36:14 +02:00
George Vinogradov e3663381db Merge branch 'master' into build_list_visibilities 2011-12-15 03:29:22 +04:00
George Vinogradov 4b83619092 Merge pull request #48 from warpc/fix-broken-test-for-38-pull
Add stub rsync for test (missing in #38). Problem describe in #8
2011-12-14 14:31:50 -08:00
Vladimir Sharshov a931fd4bad Add stub rsync for test (missing in #38). Problem describe in #8 2011-12-15 02:29:29 +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
George Vinogradov c118e69769 [issue #37] Moved shared examples to main file. 2011-12-15 02:04:05 +04: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 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