d8df6c6279
[refs #114 ] committer subscribe + some tests
2012-01-21 00:22:25 +06:00
06a977ea21
Merge branch 'master' into 114-comment_notifications
2012-01-20 22:03:04 +06:00
371abac031
[refs #114 ] fix controller tests
2012-01-20 21:17:05 +06:00
011efb0c4b
[issue #64 ] Added git access to Wiki.
2012-01-20 19:01:59 +04:00
bae56741d0
Temporary disable AutoBuild functions for users (not working at now)
2012-01-20 12:24:57 +04:00
800b02f544
[refs #18 ] Add project subsribe, tests
2012-01-20 00:20:03 +06:00
022a013b79
[issue #64 ] Added Wiki seeding on create.
2012-01-19 16:06:27 +04:00
dba11f4662
[refs #114 ] FIXME subscribers
2012-01-19 01:12:52 +06:00
4ba268dd67
Merge pull request #109 from warpc/18-commit_comments
...
18 commit comments
2012-01-18 05:49:57 -08:00
01d8cd8dcc
[refs #105 ] Change LANGUAGE constant into User
2012-01-18 17:06:18 +04:00
d205eb2dd9
[refs #105 ] Add language check on user save
2012-01-17 15:57:46 +04:00
726eddc40e
[refs #105 ] Add internationalization support to project
2012-01-17 15:48:40 +04:00
a0aad7103e
some fixes
2012-01-17 17:38:40 +06:00
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
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
80ba40f6ee
Merge branch 'master' into 18-commit_comments
...
rspec spec/ = 528 examples, 12 failures
2012-01-17 00:52:16 +06:00
bdc3b3a3d1
[refs #18 ] controller tests
2012-01-14 18:16:42 +06:00
a1a92e9878
[refs #54 ] Fix comments serial_id routing and some logic
2012-01-13 20:07:46 +04:00
db0a66846b
[refs #94 ] Add new notifier rules. Fix some issues and comments bugs
2012-01-13 19:07:01 +04:00
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
caf7adef70
[refs #18 ] FIXME subscribe don't work
2012-01-12 20:50:27 +06:00
980e455b31
[refs #54 ] Fix comment deliver notification user check
2012-01-12 17:45:22 +04:00
f6e4de3b72
[refs #54 ] Fix issue assign user subscribe update filter
2012-01-12 17:07:54 +04:00
f8d00f5235
[refs #18 ] Fix cancan ability for commit comments
2012-01-12 18:04:16 +06:00
07dc7a4800
[refs #18 ] add comments to commit
2012-01-12 17:19:22 +06:00
c18b71bf0b
[refs #18 ] changed refs id to string
2012-01-12 00:10:23 +06:00
2b8aca5f09
[refs #54 ] Add settings notifier
2012-01-11 17:58:13 +04:00
16c9d0ec15
[refs #54 ] Fix some bugs of issues and comments + add comment body to email
2011-12-31 14:51:47 +04:00
e8977a7d95
Merger issues with master
2011-12-30 18:23:16 +04:00
3f72082e0e
[refs #54 ] Add comments, subscribes models specs. Finish subscribes controller specs. Some ability.rb fixes
2011-12-30 18:21:08 +04:00
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
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
fa8656d1f5
[refs #54 ] Refactor subscires routes and authorize
2011-12-28 17:54:45 +04:00
1c263c6e0a
[refs #54 ] Notification DJ support. Routes fixes.
2011-12-28 14:47:54 +04:00
a783b460bd
Merge issues with master
2011-12-28 13:22:57 +04:00
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
ecbfed9300
[refs #54 ] Fix user_id validation into issues
2011-12-27 21:49:08 +04:00
81378478ca
[issue #64 ] Added Wiki controller and some methods in Project
2011-12-26 21:07:07 +04:00
ce6746f7a9
[refs #54 ] Add subscribes and notifications
2011-12-26 19:48:57 +04:00
5237939f49
Merge issues with master
2011-12-26 13:26:13 +04:00
7d8d77a386
[issue #79 ] Added validation to ProjectToRepository
2011-12-23 21:06:47 +04:00
894bc0c077
[refs #54 ] Add issues tests. Fix some CanCan rights. Make some fixes to logic
2011-12-23 14:56:46 +04:00
e2144e0fdb
[refs #54 ] Fix issue ability and comment redirect after update
2011-12-22 11:41:37 +04:00
96d458875e
Remove publish validator. Add can_cancel/can_publish checking to cancel/publish methods. Refs #80
2011-12-22 04:08:11 +02:00
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
2ac4391edf
Redo build_list publish to check returned status. Refs #77
2011-12-22 01:31:05 +02:00
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
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
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
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
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
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
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
446cdac8e6
[refs #54 ] Add new locales. Fix routes. Fix issues and comments update
2011-12-20 14:20:00 +04:00
d20d43eb2b
[refs #54 ] Base logic and templates for issues and comments to them
2011-12-19 19:30:14 +04: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
c81698b81b
[refs #57 ] Forbid access to users_path for simple users
2011-12-16 11:32:34 +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
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
e3663381db
Merge branch 'master' into build_list_visibilities
2011-12-15 03:29:22 +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
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
7b6863352f
[ fixed #34 ] Changed skopes in BuildList model.
2011-12-14 20:30:35 +04:00
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
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
1d6df950c4
[refs #42 ] Fix rpm name parse into Download parse method
2011-12-14 15:09:22 +04:00
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
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
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
b1eac17c4c
[issue #37 ] Fixed typos.
2011-12-13 19:11:16 +04:00
0d668be2c7
[issue #37 ] Fixed typos
2011-12-13 18:28:22 +04:00
7ebc2f22c9
[issue #37 ] Maybe fixed bug that user can't show created build_list
2011-12-13 18:21:25 +04:00
4a723369a2
[refs #12 ] Add platform update options
2011-12-13 17:27:27 +04:00
43feb029cd
[issue #27 ] Added new scope to BuildList
2011-12-13 04:13:36 +04:00
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
c0080388a1
Close #24 . Uninitialized constant BuildList::BUILD_STARTED
2011-12-12 20:51:38 +04:00
9d7cbab0f6
Fix #24 "unexpected tCONSTANT, expecting '}'"
2011-12-12 20:16:05 +04:00
6a364b73a6
[refs #12 ] Fix platform admin relations. Locales correction. Add validationa and rsync stubs.
2011-12-12 18:10:39 +04:00
55c41ca306
Fix mistake in dependency_test_failed
2011-12-12 16:49:15 +04:00
cf18550cfb
#24 . Add new statuses and remove repetition
2011-12-12 16:34:20 +04:00
e85ed8c1ca
[refs #9 ] Add corrections to sudo refactored code
2011-12-09 11:04:11 +04:00
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
0f855356ac
[refs #6 ] Add sudo mount fixes. Rename ID Admin fields into platform form
2011-12-09 00:41:01 +04:00
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
3e41e6fb42
Issue #4 fixed duplication of Relations when creating personal
...
repository
2011-12-08 18:03:56 +04:00
25f06edb65
Downloads and Rsync mount with sudo refactor
2011-12-08 11:44:02 +04:00
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
6794ca42fb
Fix date filter normalization. Add build, freeze, unfreeze confirmation. Refs #2261
2011-12-07 02:09:04 +02:00
0bffb0581e
Some changes in groups.
2011-12-07 03:45:09 +04:00
814a0a46fe
Fix OpenID init. Refs #2261
2011-12-06 21:57:03 +02:00
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
2bee3bd25d
Code cleanup. Redo deploy to unicorn. Refs #2261
2011-12-05 21:34:26 +02:00
2f5ce7cebe
Merge branch 'groups_reincarnation' into staging
...
Conflicts:
app/models/ability.rb
app/models/project.rb
config/environments/production.rb
2011-12-05 17:16:32 +04:00
9cc820080b
Groups base functional.
2011-12-05 16:32:18 +04:00
0af32351a2
Redo paperclip file upload through nginx upload module. Refs #2261
2011-12-03 02:52:19 +02:00
a9a2059cae
Force file uploads work with nginx upload module. Nginx compile instructions. Refs #2261
2011-12-03 00:15:44 +02:00
1abcdbc028
[refs #2249 ] Add corrections to ACL
2011-12-02 19:26:28 +04:00
233f9b8035
[refs #2249 ] Add corrections to ACL rules
2011-12-02 10:57:58 +04:00
96d4886f49
[refs #2249 ] Add new ACL relations
2011-12-01 18:20:24 +04:00
6d8e4f98b9
[refs #2249 ] Some ACL changes
2011-12-01 13:29:04 +04:00
e45ba6692a
Rename delete_build_list to cancel_build_list. Rescue XML get_status exception. Refs #2261
2011-12-01 00:55:47 +02:00
4ea4d7f56e
Refactor build_all - move to model. Apply delayed build_all. Refs #2261
2011-11-30 23:43:01 +02:00
81e290a9b3
Merge branch 'groups_reincarnation' of github.com:warpc/rosa-build into groups_reincarnation
2011-11-30 19:28:56 +04:00
f154ccc132
Fixed groups creation.
2011-11-30 19:27:19 +04:00
19076c805e
Skip authorization for callback actions during project build. Refactor. Refs #2261
2011-11-30 15:56:00 +02:00
3a2215d0ee
Redo project versions to use tags and branches for build. Refs #2261
2011-11-30 15:56:00 +02:00
6a3c0cec6c
Rollback last changes and fix deploy script. Refs #2261
2011-11-30 15:55:59 +02:00
20e0757adf
Try to fix strange production error with project fork. Refs #2261
2011-11-30 15:55:59 +02:00
3bc2ff894c
Improve and fix project fork functionality. Fix project create and validation. Add user role display. Add user role at user edit form. Refs #2261
2011-11-30 15:55:59 +02:00
7535fc124a
Skip authorization for callback actions during project build. Refactor. Refs #2261
2011-11-30 02:56:57 +02:00
4971fbbbde
Redo project versions to use tags and branches for build. Refs #2261
2011-11-30 02:22:26 +02:00
43eb873b70
Rollback last changes and fix deploy script. Refs #2261
2011-11-30 00:23:09 +02:00
a0cb729140
Try to fix strange production error with project fork. Refs #2261
2011-11-30 00:16:20 +02:00
c4a31e3d29
Improve and fix project fork functionality. Fix project create and validation. Add user role display. Add user role at user edit form. Refs #2261
2011-11-29 23:42:58 +02:00
bc504dfcf7
[refs #2249 ] Add more fixes to global renaming
2011-11-29 14:51:14 +04:00
148a0fec28
[refs #2249 ] Global name to description and unixname to name renames
2011-11-29 14:51:14 +04:00
cfceda9c53
Fix product_build_list XML create callback. Refs #2261
2011-11-28 23:13:59 +02:00
ea42fc19f2
Separate product XML build requests based on platform distrib_type. Adjust code to use new settings structure. Refactor settings and product builder. Refs #2261
2011-11-28 22:38:50 +02:00
05054abdb9
[refs #2249 ] Add platforms specs. Correct some collaborators specs
2011-11-28 17:28:29 +04:00
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
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
0573acb650
[refs #2249 ] Add more Collaborators and Projects controllers specs
2011-11-24 23:22:37 +04:00
141fe7677f
Apply project fork button. Refactor and cleanup code. Refs #2243
2011-11-23 17:52:33 +02:00
fc3c6a05c9
[refs #2249 ] CanCan tests
2011-11-22 23:21:31 +04:00
ba77244b02
[refs #2249 ] Some rules and roles fixes
2011-11-22 23:21:31 +04:00
4bd9b81f65
Change default_url_options settings. Stub brutal hack. Refs #2261
2011-11-22 20:47:45 +02:00
366ca320e0
Change and fix role assign logic and abilities. Other minor fixes. Refs #2261
2011-11-21 21:06:34 +02:00
140eaf6265
[refs #2249 ] Remove old roles managment system
2011-11-21 21:43:37 +04:00
9daf08a36c
Minor fix
2011-11-21 15:26:32 +02:00
98a3493f41
[refs #2249 ] Add user role validation correction
2011-11-21 17:17:35 +04:00
ce60f7b057
Generate files for easy_urpmi during platform mount. Improve nd refactor auth module for grack, apply cancan. Adapt project import script to new source file. Fix bugs. Refactor. Refs #2261 , #2243
2011-11-21 14:59:23 +02:00
82433c0909
Fixed ROLES array and returned add_default_role method in User model.
2011-11-21 03:03:51 +04:00
5e7ded2e93
[refs #2249 ] Remove custom ACL from project
2011-11-19 16:11:44 +04:00
e50959e205
[refs #2249 ] Add full rules, helpers and filters of CanCan
2011-11-19 15:41:11 +04:00
d49880f24e
Merge branch 'smart_http' into staging
...
Conflicts:
app/models/relation.rb
app/models/user.rb
2011-11-18 20:35:12 +02:00
7b750a6f93
Merge branch 'cancan' into staging
2011-11-18 22:30:23 +04:00
4d78ce371f
Merge branch 'master' into staging
...
Conflicts:
app/models/build_list.rb
2011-11-18 20:27:33 +02:00
05bb9ce0c7
[refs #2249 ] CanCan rules update. Add admin role to relations. Change collaboratots edit logic and code
2011-11-18 22:26:22 +04:00
5f39e76b12
Merge branch 'master' into smart_http
...
Conflicts:
app/controllers/projects_controller.rb
app/models/build_list.rb
app/models/project.rb
2011-11-18 11:59:21 +02:00
d7702b9901
Sort project versions as numbers. Do not create duplicate build lists. Refs #test_prepare
2011-11-18 03:28:34 +02:00
9118c787b1
Redo personal repo urpmi links. Refs #test_prepare
2011-11-18 01:17:06 +02:00
b307043ee2
Merge branch 'master' of github.com:warpc/rosa-build
2011-11-18 02:34:43 +04:00
Alexander Machehin
George Vinogradov
Vladimir Sharshov
Pasha
konstantin.grabar
Pavel Chipiga
George Vinogradov