80ba40f6ee
Merge branch 'master' into 18-commit_comments
...
rspec spec/ = 528 examples, 12 failures
2012-01-17 00:52:16 +06:00
52696791f2
[refs #54 , #94 ] Merge master into issues
2012-01-16 13:42:44 +04:00
bdc3b3a3d1
[refs #18 ] controller tests
2012-01-14 18:16:42 +06:00
712ca8d95a
Save package_version during success build_list publish. Add specs. Refs #103
2012-01-13 18:45:13 +02:00
a1a92e9878
[refs #54 ] Fix comments serial_id routing and some logic
2012-01-13 20:07:46 +04:00
794c55a030
Merge branch 'master' of github.com:warpc/rosa-build into 18-commit_comments
2012-01-13 22:01:30 +06:00
8252367537
some fix
2012-01-13 21:58:48 +06: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
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
f6e4de3b72
[refs #54 ] Fix issue assign user subscribe update filter
2012-01-12 17:07:54 +04:00
07dc7a4800
[refs #18 ] add comments to commit
2012-01-12 17:19:22 +06:00
49082c2a8d
[issue #76 ] Fixed bug with JSON generation.
2012-01-12 01:12:56 +04:00
c23312ad51
Research and fix problem with build_lists#auto_publish feature. Fix specs. Refs #97
2012-01-11 21:43:33 +02: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
7c50b2c3f5
[issue #76 ] Added jQuery DataTable. But it doesn't work yet
2011-12-31 02:42:58 +04:00
e8977a7d95
Merger issues with master
2011-12-30 18:23:16 +04:00
633e5ebffc
Added actions to WikiController
2011-12-29 22:00:43 +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
49ec1ebe98
[refs #54 ] Remove unused comments
2011-12-28 18:24:24 +04: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
8face9208e
[refs #54 ] Add fixes and locales to subscribes
2011-12-27 16:35:31 +04:00
ec95373d28
[#issue 64] Routes to Wiki and some methods in controller.
...
Useless yet.
2011-12-26 21:07:16 +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
7d3dd5eaf1
[ #82 ] Merge branch 'master' into 65-build_repo
...
Conflicts:
spec/models/cancan_spec.rb
2011-12-26 14:51:30 +02: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
894bc0c077
[refs #54 ] Add issues tests. Fix some CanCan rights. Make some fixes to logic
2011-12-23 14:56:46 +04:00
8c3291d237
Fix and redo specs after great build_lists refactoring and improvement. Fix minor bugs. Code cleanup. Refs #65
2011-12-23 04:14:28 +02:00
e2144e0fdb
[refs #54 ] Fix issue ability and comment redirect after update
2011-12-22 11:41:37 +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
8c2b837600
Fix build_list user assign. Refs #65
2011-12-21 21:17:55 +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
a946349bb4
[ close #23 ] Changed searching.
2011-12-16 04:33:44 +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
b3f422e713
[refs #32 ] Add user filter
2011-12-15 20:15:25 +04:00
e3663381db
Merge branch 'master' into build_list_visibilities
2011-12-15 03:29:22 +04:00
a855366a75
Fix merge bug. Take back method. Refs #1
2011-12-15 00:11:31 +02: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
2a108981d5
[update #20 ] To server sends id instead of uname. Added some specs
2011-12-14 19:54:04 +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
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
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
4a723369a2
[refs #12 ] Add platform update options
2011-12-13 17:27:27 +04:00
e0e0dd1fed
Merge branch 'master' of github.com:warpc/rosa-build
2011-12-13 17:15:22 +04:00
fdd89eb51b
#24 . Fix "uninitialized constant BuildList::BUILD_STARTED"
2011-12-13 15:02:41 +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
461cf3fd8e
[issue #27 ] Added using of new BuildList scope in controller
2011-12-13 04:27:03 +04:00
222033de5e
[refs #12 ] Fix platform relations again
2011-12-12 19:37:37 +04:00
6a364b73a6
[refs #12 ] Fix platform admin relations. Locales correction. Add validationa and rsync stubs.
2011-12-12 18:10:39 +04:00
c3f4c8dd87
[updated #16 ] admin_id renamed to admin_uname.
2011-12-11 21:43:42 +04:00
b9c0f1e3d9
[ fixed #16 ] Changed owner fetching in PlatformsController#create
2011-12-11 20:00:50 +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
603e4b3691
fixed #4 . Removed unnecessary routes and views parts.
2011-12-08 18:47:18 +04:00
26689f3bd2
Start writing Group tests.
2011-12-07 23:51:08 +04:00
0d9b683100
Fixed bug in ApplicationController#get_owner
2011-12-07 16:32:42 +04:00
0f827f2644
[refs #2249 ] Fix collaborators controller. Fix projects specs.
2011-12-07 13:47:43 +04:00
0bffb0581e
Some changes in groups.
2011-12-07 03:45:09 +04:00
c6e5ace271
fixed bug with empty group form submitting
2011-12-07 00:16:19 +04:00
701ccf54dd
Fix OpenID registration bug. Refs #2261
2011-12-06 21:45:25 +02:00
fcc17da1ad
[refs #2249 ] Add products specs. Fix some things in other specs
2011-12-06 19:24:33 +04:00
fc4643ce9b
[refs #2249 ] Fix some specs. Fix shared examples. Fix new/create repositories and products ability
2011-12-06 19:24:33 +04: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
d7c9452efa
Update gems. Redo exception catch for BuildServer.get_status. Write specs. Experiments with large file uploads. Refs #2261
2011-12-02 03:30:25 +02: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
76c5c86c27
Add db default value for build_lists field build_requires. Refs #2261
2011-11-30 21:03:58 +02:00
e7a6b01e09
Fix and refactor platform build_all. Add more settings. Refs #2261
2011-11-30 19:46:20 +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
438bedd226
Add build all btn to platforms
2011-11-30 18:48:50 +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
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
7023dda7e0
First iteration of groups refactoring.
2011-11-30 16:58:14 +04: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
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
148a0fec28
[refs #2249 ] Global name to description and unixname to name renames
2011-11-29 14:51:14 +04: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
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
366ca320e0
Change and fix role assign logic and abilities. Other minor fixes. Refs #2261
2011-11-21 21:06:34 +02:00
b98453bd62
[refs #2249 ] Add new user managment logic
2011-11-21 22:26:56 +04:00
140eaf6265
[refs #2249 ] Remove old roles managment system
2011-11-21 21:43:37 +04:00
5e7ded2e93
[refs #2249 ] Remove custom ACL from project
2011-11-19 16:11:44 +04:00
44191926f7
[refs #2249 ] Some CanCan fixes. Add ru exception message
2011-11-19 15:49:14 +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
4be634a8fb
Add slash to easy_urpmi url. Refs #test_prepare
2011-11-18 15:00:31 +02:00
a819185ecc
Try to fix deploy. Fix easy_urpmi url. Refs #test_prepare
2011-11-18 14:50:06 +02: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
497e8f64f4
Redo commit diffs display. Fix tree blob blame display. Refs #2162
2011-11-18 11:48:50 +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
2503503252
Process auto_build through DJ. Refs #test_prepare
2011-11-18 02:07:51 +02:00
cbfa5858d4
Add tags ordering, check and fix. Refactor auto_build. Refs #test_prepare
2011-11-18 00:28:02 +02: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
2772bddc06
[refs #2249 ] Add new rules. Fix joins trouble. Add new relations dynamic methods.
2011-11-17 23:34:02 +04:00
4d4f5deed4
[refs #2249 ] Remove bitmask. Add new rules. Add some authorize filters. Add some template can? helpers
2011-11-16 22:45:01 +04:00
827936a06c
Remove custom ACL calls. Add CanCan and some rules. Add bitmask_attribute
2011-11-16 00:05:08 +04:00
b36cc24a64
Redo commit diffs display. Fix tree blob blame display. Refs #2162
2011-11-11 23:57:10 +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
c64f93f6bd
One more fix build_lists#cancel logging. Improve XML RPC stubbing. Refactor. Refs #2161
2011-11-08 00:54:25 +02:00
fb165483b8
Refix platform clone with products. Refs #2162
2011-11-03 14:49:14 +02:00
8030ea1afb
Fix test sudo action
2011-11-03 15:18:26 +04:00
4b4df620ff
Fix test sudo action
2011-11-03 15:16:17 +04:00
d9a03013b4
[refs #2161 ] Fixes projects filter
2011-11-03 15:01:29 +04:00
117ae7bbff
[refs #2161 ] Repair projects filter
2011-11-03 14:56:41 +04:00
df2f3abe62
[refs #2161 ] Add test sudo action
2011-11-03 14:33:23 +04:00
49e4dea478
Redo platform clone. Refs #2162
2011-11-03 10:32:45 +02:00
f4c3bafb6d
[refs #2161 ] Change logic and output of urpmi commands
2011-11-03 12:03:08 +04:00
910446954c
Fixed access to BuildList
2011-11-03 02:13:58 +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
e1ba3dda2e
Merge branch 'master' of github.com:warpc/rosa-build
2011-11-03 00:34:52 +04:00
f1bd00545e
Show code of task
2011-11-03 00:34:31 +04:00
96e223d0eb
Fix project search during auto_build action. Refs #2162
2011-11-02 22:28:08 +02:00
ae6919a240
Add url for downloading file archive
2011-11-03 00:25:25 +04:00
Alexander Machehin
konstantin.grabar
Pavel Chipiga
George Vinogradov
Vladimir Sharshov