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
Pavel Chipiga
37c8a50bf8
Refactor and fix bluepill capistrano recipe. Refs #1
2011-12-14 23:06:31 +02:00
George Vinogradov
98bbc2e6e6
[issue #37 ] Added tests.
2011-12-15 01:04:39 +04:00
George Vinogradov
859f385fce
Merge pull request #45 from warpc/fix-broken-tests
...
Fix broken tests
2011-12-14 12:59:29 -08: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
Pavel Chipiga
e7bf100806
Redo autostart script to start from user. Write doc. Refactor bluepill capistrano recipe. Refs #1
2011-12-14 22:16:00 +02: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
06c627b1cf
Merge branch 'build_list_date_fix' of github.com:warpc/rosa-build into build_list_date_fix
2011-12-14 20:33:43 +04: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
7b6863352f
[ fixed #34 ] Changed skopes in BuildList model.
2011-12-14 20:30:35 +04:00
Vladimir Sharshov
86aed85985
Merge pull request #21 from warpc/project_collaborators_change
...
[closed #20 ] Changed collaborators page of project:
* Added form to input group and/or project nickname.
* In tables show only projects/groups that already added to project
2011-12-14 08:13:26 -08:00
George Vinogradov
cfd7f57899
Merge branch 'project_collaborators_change' of github.com:warpc/rosa-build into project_collaborators_change
...
Conflicts:
config/routes.rb
spec/controllers/collaborators_controller_spec.rb
2011-12-14 20:01:11 +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
George Vinogradov
1b3e473b94
[ closed #20 ] Changed adding collaborators to project
...
Changed collaborators page of project:
* Added form to input group and/or project nickname.
* In tables show only projects/groups that already added to project
2011-12-14 19:52:47 +04:00
George Vinogradov
2570fb96bb
[update #20 ] To server sends id instead of uname. Added some specs
2011-12-14 19:28:31 +04:00
Pavel Chipiga
697e9df87e
Fix bluepill recipe. Refs #1
2011-12-14 17:26:31 +02:00
Pavel Chipiga
c0b3350a2f
Re-set correct rails env for DJ one more. Refactor. Refs #1
2011-12-14 16:47:32 +02:00
Pavel Chipiga
54df702223
Re-set correct rails env for DJ again. Refs #1
2011-12-14 15:51:39 +02:00
Pavel Chipiga
af2f2b4819
Re-set correct rails env for DJ. Refs #1
2011-12-14 15:46:41 +02:00
Pasha
2edf0ad172
Merge pull request #44 from warpc/tuning_monitoring_view
...
Tuning monitring view
2011-12-14 05:34:34 -08:00
Pavel Chipiga
ae7cc892f7
Set correct rails env for DJ. Refs #1
2011-12-14 15:24:58 +02:00
Vladimir Sharshov
7614d027a6
Reordered search by id and name;
...
Change localization for project_name_search.
Fix wrong label for field
2011-12-14 17:11:40 +04:00
Pavel Chipiga
09b18e2bb5
Refix ENV var syntax. Refs #1
2011-12-14 15:07:39 +02:00
Pavel Chipiga
31bd8d799f
Fix ENV var syntax. Fix autostart. Refs #1
2011-12-14 15:04:16 +02:00
Pavel Chipiga
326fe3f998
Use absolute PID path. Ignore errors if bluepill is not runing. Refs #1
2011-12-14 14:34:44 +02: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
Pavel Chipiga
3379419eae
Run bluepill as user. Fix configs. Refs #1
2011-12-14 13:06:56 +02: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
b9a7853cbd
[update #34 ] Changed spec
2011-12-13 20:37:57 +04: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
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
George Vinogradov
af717009e4
[update #34 ] Added spec.
2011-12-13 17:35:16 +04:00
konstantin.grabar
4a723369a2
[refs #12 ] Add platform update options
2011-12-13 17:27:27 +04:00