e0b7699ffd
Revert "Merge branch '114-comment_notifications' into user-emails-list"
...
This reverts commit 2179cbbf40334cbe5d4fa9ba3a7f297d8f543a0a, reversing
changes made to 9bf06e5e1a595f320dc4527ebd44f14be05fcd64.
Conflicts:
app/models/user.rb
2012-01-30 12:22:54 +06:00
f6b6bbfb54
Revert "[refs #114 ] emails control"
...
This reverts commit 26fb1fcbfb843163231d8b8f0caf582bafccbe57.
Conflicts:
app/models/subscribe.rb
app/models/user.rb
spec/models/comment_for_commit_spec.rb
2012-01-30 12:19:54 +06:00
dc39eefe62
Revert "[refs #114 ] add js"
...
This reverts commit 48a9c4d50b9f11a11cc4f2c5831c4b5b25fdc4d1.
2012-01-30 12:16:09 +06:00
acdd1f22b6
[issue #64 ] Fixed bug with revert all wiki.
2012-01-28 16:10:43 +04:00
9caf496454
[issue #64 ] Added missing translations.
2012-01-27 20:48:48 +04:00
549f0a55e8
[issue #64 ] Merge branch 'master' into 64-project_wiki
...
Conflicts:
Gemfile.lock
app/models/project.rb
app/models/user.rb
app/views/projects/_form.html.haml
config/locales/ru.yml
db/schema.rb
2012-01-27 18:27:23 +04:00
06ab99a1d0
[refs #114 ] add js
2012-01-27 18:20:07 +06:00
72fd821bc8
[refs #123 ] Add fixes for activity feed
2012-01-27 16:06:04 +04:00
eed3040944
[issue #64 ] Changed validation message and removed unnecessary
...
validation of projects owner.
2012-01-27 10:13:56 +04:00
2d1e36fb1a
[issue #64 ] Changed own_projects validation.
2012-01-27 04:16:07 +04:00
e71a9e84cb
[refs #114 ] emails control
2012-01-27 02:11:07 +06:00
0eb0eb9713
[refs #123 ] Activity Feed logic global refactoring.
2012-01-26 21:04:58 +04:00
c529e63c96
Merge pull request #122 from warpc/105-internationalization
...
[refs #105 ] Fix devise translations
2012-01-26 08:06:34 -08:00
e04b2eb59b
Merge branch '114-comment_notifications' into user-emails-list
...
Conflicts:
app/models/subscribe.rb
config/locales/en.yml
2012-01-26 14:55:16 +06:00
77420d2a8f
[refs #114 ] user emails
2012-01-26 14:53:40 +06:00
dd1493d677
[refs #123 ] Add activity feed page. Remove some unnessary code. Some logic fixes.
2012-01-25 17:05:39 +04:00
11f5305bec
Merge pull request #126 from warpc/112-sync_projects
...
Add feature #126 : import SRPM package in web
2012-01-24 13:39:46 -08:00
9e8c8efc80
Merge pull request #125 from warpc/124-fix-device-locale
...
[refs #124 ] Add missing translation
2012-01-24 12:59:49 -08:00
bdb31b4e13
Fix locale. Refs #31
2012-01-24 22:42:16 +02:00
3f4bf65825
Upgrade paperclip. Apply srpm_import script and UI. Fix specs. Refs #31
2012-01-24 22:35:36 +02:00
61be317b21
[refs #114 ] i18n
2012-01-25 01:00:51 +06:00
0f06d4f627
[refs #124 ] Add missing translation
2012-01-25 00:18:16 +06:00
c3f415e90c
Add new build status for Item
2012-01-23 22:11:53 +04:00
06a977ea21
Merge branch 'master' into 114-comment_notifications
2012-01-20 22:03:04 +06:00
23573a1a07
[issue #64 ] Added creation wiki to project.
2012-01-20 19:10:30 +04:00
011efb0c4b
[issue #64 ] Added git access to Wiki.
2012-01-20 19:01:59 +04:00
e3a716b7db
[refs #105 ] Fix some translations
2012-01-20 15:29:32 +04:00
25bd2cd13d
Fix for localization files
2012-01-20 00:33:28 +04:00
54bc26d960
[issue #64 ] Added translations.
2012-01-19 18:37:36 +04:00
0c527af291
[issue #64 ] Added revisions comparsion.
2012-01-19 17:49:32 +04:00
538e3da8c8
[issue #64 ] Added search through wiki
2012-01-19 16:10:50 +04:00
71447a29e3
[refs #114 ] add settings for commits notifications
2012-01-19 00:20:08 +06:00
2af0135fb5
[issue #64 ] Added All Pages representation.
2012-01-18 19:09:25 +04:00
8a1486664f
[issue #64 ] Fixed typo
2012-01-18 18:19:52 +04:00
4ba268dd67
Merge pull request #109 from warpc/18-commit_comments
...
18 commit comments
2012-01-18 05:49:57 -08:00
2522dd3c63
[issue #64 ] Added page history views.
2012-01-18 03:30:54 +04:00
51e9b5d1f6
[issue #64 ] Some changes in views and routes.
2012-01-18 02:28:59 +04:00
bbbf17c2b4
[refs #105 ] Merge master with 105-internationalization
2012-01-17 17:58:49 +04:00
726eddc40e
[refs #105 ] Add internationalization support to project
2012-01-17 15:48:40 +04:00
fab62c548f
Hide container_path if build_list published. Cleanup translations. Refs #100
2012-01-17 13:04:50 +02: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
62922c30a3
[issue #64 ] Added search partial.
2012-01-17 04:05:07 +04:00
52696791f2
[refs #54 , #94 ] Merge master into issues
2012-01-16 13:42:44 +04:00
794c55a030
Merge branch 'master' of github.com:warpc/rosa-build into 18-commit_comments
2012-01-13 22:01:30 +06:00
db0a66846b
[refs #94 ] Add new notifier rules. Fix some issues and comments bugs
2012-01-13 19:07:01 +04:00
0751a94974
[update #76 ] Merge branch 'master' into 76-project_autocomplete
...
Conflicts:
app/views/layouts/_stylesheets.html.haml
2012-01-12 20:43:32 +04:00
73b710ae4e
[ close #76 ] Changed styles. Fixed bug with pagination.
2012-01-12 20:37:50 +04:00
636c90e6e4
[refs #18 ] add some I18n
2012-01-12 20:27:45 +06:00
2b8aca5f09
[refs #54 ] Add settings notifier
2012-01-11 17:58:13 +04:00
e8977a7d95
Merger issues with master
2011-12-30 18:23:16 +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
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
d3ba83135e
[refs #54 ] Add some locales and interface fixes for issues
2011-12-27 17:18:25 +04:00
8face9208e
[refs #54 ] Add fixes and locales to subscribes
2011-12-27 16:35:31 +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
bf2f3d1bc7
[refs #54 ] Add issue statuses filters
2011-12-23 18:34:32 +04: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
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
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
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
58cfe07124
[refs #56 ] Change project build page title
2011-12-16 11:59:34 +04:00
b3f422e713
[refs #32 ] Add user filter
2011-12-15 20:15:25 +04:00
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
2edf0ad172
Merge pull request #44 from warpc/tuning_monitoring_view
...
Tuning monitring view
2011-12-14 05:34:34 -08:00
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
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
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
4a723369a2
[refs #12 ] Add platform update options
2011-12-13 17:27:27 +04:00
24766d2383
Merge pull request #14 from warpc/group_members_change
...
Changed adding members to group.
2011-12-13 02:16:37 -08:00
842a74d000
#24 . Fix translation missing: ru.layout.build_lists.items.statuses.build_started
2011-12-12 21:03:13 +04:00
5815ef46ec
Merge pull request #25 from warpc/24-update_build_status
...
24 update build status
2011-12-12 07:54:33 -08: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
5c07046dac
[updated #16 ] Fixed localization fauldnames.
2011-12-11 22:50:55 +04:00
d2831da4b8
Issue #11 updated. Added check if user already added.
2011-12-10 21:26:57 +04:00
168e110169
[ close #11 ] Changed adding members to group.
2011-12-10 03:40:13 +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
0ca7c5d451
Rename bs_id label and key. Stub XML RPC to raise exception and fix spec. Write specs for build_lists filters. Refs #2
2011-12-08 20:51:25 +02:00
8e97f4e23d
fixed #3 . Changed locale for Group.uname and User.uname
2011-12-08 20:13:11 +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
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
96d4886f49
[refs #2249 ] Add new ACL relations
2011-12-01 18:20:24 +04:00
438bedd226
Add build all btn to platforms
2011-11-30 18:48:50 +04:00
4f46b82914
Fix bugs after renaming unixname to name. 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
0134f4adf9
Fix bugs after renaming unixname to name. Refs #2261
2011-11-30 01:41:12 +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
141fe7677f
Apply project fork button. Refactor and cleanup code. Refs #2243
2011-11-23 17:52:33 +02:00
ba77244b02
[refs #2249 ] Some rules and roles fixes
2011-11-22 23:21:31 +04:00
366ca320e0
Change and fix role assign logic and abilities. Other minor fixes. Refs #2261
2011-11-21 21:06:34 +02:00
44191926f7
[refs #2249 ] Some CanCan fixes. Add ru exception message
2011-11-19 15:49:14 +04:00
3b36943b91
Remove gitolite and it callbacks. Add git repo create, destroy callbacks. Improve grack wrappers: separate read/write requests, ask password for push even for public repo, prepare for cancan, apply hooks, refactor. Fix auto_build_lists order. Refactor auto_build - move to model. Redo git_repo_url. Improve and test project import script. Fix bugs, refactor and cleanup. Refs #2243
2011-11-17 23:57:30 +02:00
e7f9d8251a
Rename product field build to build_script. Change links. Refs #2161
2011-11-11 21:12:15 +02:00
7996740ae7
Improve build_lists time. Apply product build lists basic functionality. Move product build functionality to separate controller. Apply event logging for product build. Fix logging for project build list publishing. Code refactor and cleanup. Refs #2161
2011-11-11 19:13:09 +02:00
8449b5b826
Add BuildList status validation. Change publish logic and btn icon
2011-11-11 14:38:17 +04:00
3e2e01deb6
Changed My Projects block
2011-11-03 01:39:50 +04:00
f5ba1b34f2
Fix repository and personal_repository - add_project add remove_project actions. Fix links. Refactor. Refs #2162
2011-11-02 23:37:19 +02:00
f8c0a3a8df
Update description to tar.bz2
2011-11-02 23:38:04 +04:00
1a0e235167
Add auto_build_lists destroy action. Fix auto_build process. Improve auto_build relations. Refs #2162
2011-11-02 21:18:43 +02:00
b048c54004
Added own projects sidebar
2011-11-02 20:22:42 +04:00
4341155771
[refs #2161 ] Change private users and personal repos menus
2011-11-02 16:43:41 +04:00
7b8df283eb
[refs #2161 ] Change regenerate logic for private_users
2011-11-02 14:42:08 +04:00
103cb16f27
Added form to set name of platfroms clone
2011-11-02 02:00:44 +04:00
4bda937075
[refs #2161 ] Catalogs fixes
2011-11-02 01:07:32 +04:00
8bec7d6a6b
[refs #2161 ] Change catalogs translate
2011-11-02 00:26:24 +04:00
9c06e35842
[refs #2161 ] Fix downloads message
2011-11-02 00:19:28 +04:00
92011e493b
[refs #2161 ] Add new titles to application
2011-11-02 00:18:52 +04:00
ee02bc7a4a
Fix category projects counter. Fix git blame links. Stub error when git commit diff is too big. Refs #2162
2011-11-01 20:13:08 +02:00
8b23d76a08
Added confirm_clone translation
2011-11-01 20:42:27 +04:00
e03d711d1b
[refs #2161 ] Global private users and repos fixes
2011-11-01 17:32:50 +04:00
5c97e89829
Fix gitolito update_key bug. Push project colaborators git. Fix key update. Hide colaborators groups. Improve RPC XML tests. Refactor and code cleanup. Refs #2162
2011-11-01 02:52:24 +02:00
de959bb527
[refs #2161 ] Add refresh option to statistics
2011-10-31 19:58:04 +04:00
afc1d492a8
Add events logging for platform change_visibility action. Improve autobuild events logging. Add events log for private access to hidden repositories. Change owner assign for platform and repository. Improve gitolite doc. Refactor. Refs #2162
2011-10-31 02:13:22 +02:00
b9ee6e365b
Added collaborators management.
2011-10-31 02:59:03 +04:00
4e9e418c66
[refs #2161 ] Fix some links and save method into personal repos
2011-10-31 00:03:41 +04:00
8f742b8b19
Fix missing: ru.activerecord.models.auto_build_list
2011-10-30 18:41:09 +04:00
bc23b9d44e
Add support build_canceled status
2011-10-30 17:47:18 +04:00
61408e74ef
[refs #2161 ] Small fixes of translates
2011-10-30 16:58:27 +04:00
12727a2149
[refs #2161 ] Add more roles. Fix visibility bug on personal repo page
2011-10-30 14:51:05 +04:00
30564e8e17
[refs #2161 ] Add auto build lists functional
2011-10-29 23:09:50 +04:00
b82320a4cd
Merge branch 'master' of github.com:warpc/rosa-build
2011-10-29 21:51:53 +04:00
3e12402245
Update status code for XML-RCP kernel
2011-10-29 21:50:47 +04:00
411e40267a
Added stub for add_collaborators action.
2011-10-29 19:56:44 +04:00
2a7a13000f
Added some translations.
2011-10-29 18:28:20 +04:00
8f3ffbe827
Merge branch 'master' of github.com:warpc/rosa-build
2011-10-29 18:06:22 +04:00
8c7b196764
Update BuildListItems for new requirement
2011-10-29 18:05:40 +04:00
512364be32
[refs #2161 ] Add get_status call
2011-10-29 17:38:17 +04:00
33ebe192c5
[refs #2161 ] Fix bpl and pl translates
2011-10-29 16:29:47 +04:00
3cb8d5c4c7
Fix group creation bug. Add builds_list to layout menu. Change login error notification. Refs #2162
2011-10-29 13:56:26 +03:00
b55a99adfa
Added showing of global_role to user list
2011-10-29 02:36:02 +04:00
78f784cf1b
Remove visibility from Repository. Refs #2136
2011-10-29 00:03:30 +03:00
cdedcee801
Skip ACL for some actions. Log git hook to system events log. Fix build_list version format. Fix sidebar for build list display. Translate for ACL. Doc for project bootstrap. Refs #2136
2011-10-28 22:59:07 +03:00
87cdb88731
Added use_default and use_default_for_owner to roles
2011-10-27 22:09:22 +04:00
37c37f5cbd
Merge branch 'master' of github.com:warpc/rosa-build
2011-10-27 18:49:14 +04:00
89312375fd
Merge master and personal_repos
2011-10-27 17:13:53 +04:00
3114eb1ecc
[refs #2106 ] Add personal repos to project. Some changes of private repos controller and logic
2011-10-27 17:04:03 +04:00
d932999b8c
Fixed bug in determining visibility of object
2011-10-27 01:14:16 +04:00
0171a0a42a
Apply basic git repo functionality operation: add, change, destroy user ssh_key. Create, destroy, open/close project git repos. Calc project owner. Improve UI for users, groups and projects: fix links and routes, add actions refactor. Other minor fixes and refactoring. Add ssh_key uniqness check. Add uname uniqness check between User and Group. Check project owner ssh_key existance before project creation. Temporary disable uname and unixname change due to gitolite stranges. Refs #2136
2011-10-26 23:57:51 +03:00
02a8a62f36
Added dump to yml and load from yml abilities for roles.
2011-10-26 04:35:01 +04:00
9c182f0bda
Merge master and build_lists_queue
2011-10-24 14:40:36 +04:00
82d72a851c
ACL for testing.
2011-10-24 01:39:44 +04:00
5a5529ba3e
[refs #1832 ] Build list process fixes
2011-10-23 15:24:46 +04:00
Alexander Machehin
George Vinogradov
konstantin.grabar
Vladimir Sharshov
Pavel Chipiga
Pasha
George Vinogradov