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
0978312366
[update #27 ] Removed unnecessary comments.
2011-12-20 21:22:44 +04:00
39dade9945
[ closed #63 ] Added user column to build_list.
2011-12-20 21:09:29 +04:00
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
61cd0a7532
[ close #27 ] Fixed error in template.
2011-12-20 17:08:48 +04:00
ce008fdeb1
[issue #27 ] Added group specs.
2011-12-20 16:59:09 +04:00
446cdac8e6
[refs #54 ] Add new locales. Fix routes. Fix issues and comments update
2011-12-20 14:20:00 +04:00
70e04c25fd
[issue #27 ] Rewrited spec. Need to add spec for groups.
2011-12-20 12:44:58 +04:00
d20d43eb2b
[refs #54 ] Base logic and templates for issues and comments to them
2011-12-19 19:30:14 +04:00
f1206a4abd
Merge pull request #62 from warpc/platform_validation_problem
...
[Fix #41 ] Remove platform validation stub
2011-12-16 00:58:41 -08:00
f9c46185fc
[refs #41 ] Remove platform validation stub
2011-12-16 12:48:39 +04:00
df61ee8459
Merge pull request #59 from warpc/23-project_search_fixes
...
#23 project search fixes
2011-12-16 00:14:37 -08:00
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
58cfe07124
[refs #56 ] Change project build page title
2011-12-16 11:59:34 +04:00
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
c81698b81b
[refs #57 ] Forbid access to users_path for simple users
2011-12-16 11:32:34 +04:00
a946349bb4
[ close #23 ] Changed searching.
2011-12-16 04:33:44 +04:00
88ea7110f3
[issue #23 ] Fixed scope 'by_name' in Project model.
2011-12-16 04:32:42 +04:00
194aabdbc3
[issue #27 ] Fixed typo in ability.rb
2011-12-16 02:09:05 +04:00
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
0c3b62b235
[issue #27 ] Changed abilities. Added test, but test fails.
2011-12-16 01:58:20 +04:00
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
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
2290cd8601
[refs #32 ] Add users controller specs
2011-12-15 21:08:29 +04:00
7f10fea681
[refs #32 ] Add user uname field to user profile
2011-12-15 20:20:17 +04:00
b3f422e713
[refs #32 ] Add user filter
2011-12-15 20:15:25 +04:00
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
df124275cd
Merge conflicts of master to rename_all_shared_examples
2011-12-15 16:22:20 +04:00
aca207cda4
[refs #40 ] Global test names and shared examples refactor
2011-12-15 13:38:40 +04:00
06e08dcfc6
Fix indentions
2011-12-15 02:36:14 +02:00
e3663381db
Merge branch 'master' into build_list_visibilities
2011-12-15 03:29:22 +04:00
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
a931fd4bad
Add stub rsync for test (missing in #38 ). Problem describe in #8
2011-12-15 02:29:29 +04:00
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
a855366a75
Fix merge bug. Take back method. Refs #1
2011-12-15 00:11:31 +02:00
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
c118e69769
[issue #37 ] Moved shared examples to main file.
2011-12-15 02:04:05 +04:00
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
9510318937
[issue #37 ] Added shared specs for build_lists_controller
2011-12-15 01:31:46 +04:00
4c8e66816b
[issue #37 ] Changed specs.
2011-12-15 01:30:15 +04:00
37c8a50bf8
Refactor and fix bluepill capistrano recipe. Refs #1
2011-12-14 23:06:31 +02:00
98bbc2e6e6
[issue #37 ] Added tests.
2011-12-15 01:04:39 +04:00
859f385fce
Merge pull request #45 from warpc/fix-broken-tests
...
Fix broken tests
2011-12-14 12:59:29 -08:00
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
e7bf100806
Redo autostart script to start from user. Write doc. Refactor bluepill capistrano recipe. Refs #1
2011-12-14 22:16:00 +02:00
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
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
dd1d7426c4
[update #34 ] Changed spec
2011-12-14 20:31:52 +04:00
528bcac033
[update #34 ] Added spec.
2011-12-14 20:30:35 +04:00
7b6863352f
[ fixed #34 ] Changed skopes in BuildList model.
2011-12-14 20:30:35 +04:00
George Vinogradov
konstantin.grabar
Vladimir Sharshov
Pavel Chipiga
George Vinogradov