konstantin.grabar
a83d64eaab
[refs #150 ] Fix collaborators cancan authorize
2012-02-06 19:04:56 +04:00
Alexander Machehin
70346f0015
[refs #151 ] refactoring
2012-02-06 20:12:33 +06:00
Alexander Machehin
a79a081fd1
Merge branch 'master' into 151-grit_encodings_problems
2012-02-06 19:55:59 +06:00
George Vinogradov
f2bfcf8699
[issue #151 ] Probably fixed.
2012-02-05 00:12:37 +04:00
Alexander Machehin
87abfb4352
[refs #64 ] fixed forbidden redirection after signin
2012-02-03 21:28:19 +06:00
George Vinogradov
a2f07fad10
Merge branch '64-project_wiki' of github.com:warpc/rosa-build into 64-project_wiki
2012-02-03 04:05:18 +04:00
George Vinogradov
e05f391f8e
[issue #64 ] Write User.uname instead of User.name to commit
2012-02-03 04:04:20 +04:00
Vladimir Sharshov
4165b188eb
Merge branch 'master' into 64-project_wiki
...
Conflicts:
app/models/project.rb
config/locales/en.yml
2012-02-03 00:55:16 +04:00
Vladimir Sharshov
8562b882da
Merge pull request #136 from warpc/114-comment_notifications
...
Notifications and subscribtions about new comments in commit [Refs #114 ]
2012-02-01 11:12:24 -08:00
George Vinogradov
d0717c8f9e
[issue #64 ] Merge branch 'master' into 64-project_wiki
...
Conflicts:
Gemfile.lock
db/schema.rb
2012-02-01 22:39:04 +04:00
George Vinogradov
b117ec1331
[issue #64 ] Yet another hacks.
2012-02-01 22:33:53 +04:00
konstantin.grabar
0559f1b678
[refs #127 ] Filter request refactor
2012-02-01 20:00:19 +04:00
George Vinogradov
8733c4dc34
[issue #64 ] Some dirty hacks.
...
Diff for file with russian name don't work yet.
2012-02-01 03:20:42 +04:00
George Vinogradov
6f78e5456c
[issue #64 ] Changes for ruby 1.9.3 compatibility.
2012-01-31 20:40:46 +04:00
Alexander Machehin
f15cb90b87
Merge branch 'master' into 114-comment_notifications
...
Conflicts:
config/locales/ru.yml
2012-01-31 21:42:37 +06:00
George Vinogradov
24124766f4
[issue #64 ] Merge branch 'master' into 64-project_wiki
...
Conflicts:
Gemfile.lock
config/locales/en.yml
db/schema.rb
2012-01-31 02:07:11 +04:00
Pavel Chipiga
13780a1b53
Add magic encodings. Refs #95
2012-01-30 22:39:34 +02:00
Pavel Chipiga
33dce21312
Upgrade to ruby 1.9.3 and fix bugs. Fix bug with commit_hash save during project build. Move some russian text to yml. Code cleanup. Fix templates, deploy and import scripts. Fix specs. Translate event_logs. Refs #95
2012-01-30 22:36:58 +02:00
George Vinogradov
2a27cd3662
[issue #64 ] Some fixes.
2012-01-30 19:27:54 +04:00
Alexander Machehin
119c378149
[refs #114 ] change subsrcibe status to boolean
2012-01-30 17:59:57 +06:00
George Vinogradov
2f315f869d
[issue #64 ] Merge branch 'master' into 64-project_wiki
...
Conflicts:
Gemfile.lock
app/models/project.rb
db/schema.rb
2012-01-30 13:27:22 +04:00
George Vinogradov
f7c58f6a77
[issue #64 ] Removed unnecessary files.
2012-01-30 13:12:18 +04:00
Alexander Machehin
5efaca77cf
Merge branch 'master' into 114-comment_notifications
...
Conflicts:
app/models/project.rb
app/views/user_mailer/new_comment_notification.en.haml
app/views/user_mailer/new_comment_notification.ru.haml
app/views/user_mailer/new_comment_reply_notification.ru.haml
config/locales/devise.en.yml
config/locales/en.yml
config/locales/ru.yml
db/schema.rb
2012-01-30 13:06:06 +06:00
Alexander Machehin
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
Alexander Machehin
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
Alexander Machehin
dc39eefe62
Revert "[refs #114 ] add js"
...
This reverts commit 48a9c4d50b9f11a11cc4f2c5831c4b5b25fdc4d1.
2012-01-30 12:16:09 +06:00
Alexander Machehin
2e2e7e43d3
[refs #114 ] some refactoring
2012-01-30 02:18:14 +06:00
George Vinogradov
1ef2bc0f75
[issue #64 ] Actions authorization moved to filters
2012-01-29 22:02:18 +04:00
George Vinogradov
acdd1f22b6
[issue #64 ] Fixed bug with revert all wiki.
2012-01-28 16:10:43 +04:00
Pasha
cd41980441
Merge pull request #135 from warpc/112-sync_projects
...
Доработки автоматической синхронизации
2012-01-27 18:38:31 -08:00
George Vinogradov
aa5641da2f
[issue #64 ] Fixed CanCan bugs.
2012-01-28 06:05:13 +04:00
Pavel Chipiga
fab4aa6eb6
Refactor and fix projects by_name scope. Apply case insensitive projects, repositories and platforms name uniqness validation. Apply case insensitive project search fallback. Redirect import task outnput to log file. Rename all task. Refs #112
2012-01-28 03:04:11 +02:00
Vladimir Sharshov
f9abc2d39c
Hide participate projects
2012-01-28 04:25:11 +04:00
George Vinogradov
a89db6f3a5
[issue #64 ] Fixed bug with multiword page names
2012-01-27 23:14:53 +04:00
George Vinogradov
324e9a294f
[issue #64 ] Fixed some bugs.
2012-01-27 22:30:45 +04:00
George Vinogradov
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
Alexander Machehin
06ab99a1d0
[refs #114 ] add js
2012-01-27 18:20:07 +06:00
George Vinogradov
b04a9e0176
[issue #64 ] Removed duplicated authorization.
2012-01-27 00:51:11 +04:00
Alexander Machehin
e71a9e84cb
[refs #114 ] emails control
2012-01-27 02:11:07 +06:00
George Vinogradov
3cb426a508
[issue #64 ] Added cancan restrictions.
2012-01-26 20:26:21 +04:00
Vladimir Sharshov
c529e63c96
Merge pull request #122 from warpc/105-internationalization
...
[refs #105 ] Fix devise translations
2012-01-26 08:06:34 -08:00
George Vinogradov
da88ac7df7
[issue #64 ] Some refactoring
2012-01-26 18:10:25 +04:00
Alexander Machehin
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
Alexander Machehin
77420d2a8f
[refs #114 ] user emails
2012-01-26 14:53:40 +06:00
Pavel Chipiga
374628a216
Render answer before publication trying to avoid bug. Refs #97
2012-01-26 00:28:11 +02:00
Alexander Machehin
4cca8f7bb1
[refs #114 ] some refactoring
2012-01-25 23:33:26 +06:00
konstantin.grabar
990a46018c
[refs #123 ] Add base logic for activity feed
2012-01-25 12:31:49 +04:00
George Vinogradov
45877e8b5c
[issue #64 ] Bug fix & views refactoring
...
* Fixed bug with history
* Navigation moved to partial.
2012-01-25 00:47:55 +04:00
Alexander Machehin
61be317b21
[refs #114 ] i18n
2012-01-25 01:00:51 +06:00
Alexander Machehin
6df1640485
[refs #114 ] fix logics
2012-01-24 18:18:39 +06:00
Alexander Machehin
9127b6b689
[refs #114 ] changed logics
2012-01-24 01:42:54 +06:00
George Vinogradov
6140c0c0bc
[issue #64 ] Added some comments
2012-01-23 17:38:10 +04:00
George Vinogradov
230c25eefd
[issue #64 ] Some changes.
...
* WikiController#compare splitted into WikiController#compare
and WikiController#compate_wiki
* Show only last 30 versions in history.
2012-01-23 16:45:38 +04:00
George Vinogradov
d939edda8f
[issue #64 ] Fixed some bugs.
2012-01-21 02:11:46 +04:00
konstantin.grabar
5d93d40693
[refs #113 ] Remove unused action from blobs controller
2012-01-20 22:33:22 +04:00
konstantin.grabar
23ace52d90
[refs #113 ] Images render and download href for binary data into blobs
2012-01-20 22:31:01 +04:00
Alexander Machehin
06a977ea21
Merge branch 'master' into 114-comment_notifications
2012-01-20 22:03:04 +06:00
Alexander Machehin
371abac031
[refs #114 ] fix controller tests
2012-01-20 21:17:05 +06:00
George Vinogradov
011efb0c4b
[issue #64 ] Added git access to Wiki.
2012-01-20 19:01:59 +04:00
konstantin.grabar
e3a716b7db
[refs #105 ] Fix some translations
2012-01-20 15:29:32 +04:00
George Vinogradov
364f2e40c0
[issue #64 ] Added Wiki history, compare, revert.
2012-01-20 03:25:15 +04:00
Alexander Machehin
800b02f544
[refs #18 ] Add project subsribe, tests
2012-01-20 00:20:03 +06:00
George Vinogradov
54bc26d960
[issue #64 ] Added translations.
2012-01-19 18:37:36 +04:00
George Vinogradov
0c527af291
[issue #64 ] Added revisions comparsion.
2012-01-19 17:49:32 +04:00
George Vinogradov
32b64d3462
[issue #64 ] Minor fixes in WikiController
2012-01-19 16:07:08 +04:00
konstantin.grabar
bd6abf2681
[refs #105 ] Add locale fixes
2012-01-19 00:58:38 +04:00
Alexander Machehin
dba11f4662
[refs #114 ] FIXME subscribers
2012-01-19 01:12:52 +06:00
George Vinogradov
0386c34246
[issue #64 ] Added page deletion.
2012-01-18 18:33:35 +04:00
Pasha
4ba268dd67
Merge pull request #109 from warpc/18-commit_comments
...
18 commit comments
2012-01-18 05:49:57 -08:00
Pasha
eb6ec413da
Merge pull request #108 from warpc/105-internationalization
...
105 internationalization
2012-01-18 05:38:55 -08:00
George Vinogradov
a608ded8c4
[issue #76 ] Fixed potential bug in redirects
2012-01-18 04:44:42 +04:00
George Vinogradov
407130f3d7
[issue #64 ] Minor fix in WikiController#show.
2012-01-18 03:46:44 +04:00
George Vinogradov
a9989f07fe
[issue #64 ] Fixed bug with update page
2012-01-18 03:30:04 +04:00
George Vinogradov
51e9b5d1f6
[issue #64 ] Some changes in views and routes.
2012-01-18 02:28:59 +04:00
Alexander Machehin
310e11b666
[refs #18 ] Fix if blocking referer
2012-01-18 00:33:42 +06:00
Pavel Chipiga
f8be867aaf
Replace annotated tags to lightweight. Improve specs. Restore lost migrations. Refs #103
2012-01-17 19:37:41 +02:00
konstantin.grabar
bbbf17c2b4
[refs #105 ] Merge master with 105-internationalization
2012-01-17 17:58:49 +04:00
santaux
62d0419bdd
Merge pull request #106 from warpc/103-bl_publish_new_params
...
Сохранение сборочного коммита, добавление неподписанного тега на сохраненный коммит после публикации
2012-01-17 04:34:15 -08:00
konstantin.grabar
d205eb2dd9
[refs #105 ] Add language check on user save
2012-01-17 15:57:46 +04:00
konstantin.grabar
726eddc40e
[refs #105 ] Add internationalization support to project
2012-01-17 15:48:40 +04:00
Alexander Machehin
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
Alexander Machehin
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
Pavel Chipiga
a687a6601b
Save commit_hash during build_list create. Tag git repo during build_list publish. Write and fix specs. Refs #103
2012-01-16 23:51:20 +02:00
George Vinogradov
1e1dab369b
[issue #64 ] Added some views, styles and scripts.
...
* Added base gollum styles
* Added base gollum javascripts (with minor changes)
* Fixed some bugs in WikiController
* Added some views (draft yet)
2012-01-17 01:48:38 +04:00
Alexander Machehin
80ba40f6ee
Merge branch 'master' into 18-commit_comments
...
rspec spec/ = 528 examples, 12 failures
2012-01-17 00:52:16 +06:00
konstantin.grabar
52696791f2
[refs #54 , #94 ] Merge master into issues
2012-01-16 13:42:44 +04:00
Alexander Machehin
bdc3b3a3d1
[refs #18 ] controller tests
2012-01-14 18:16:42 +06:00
Pavel Chipiga
712ca8d95a
Save package_version during success build_list publish. Add specs. Refs #103
2012-01-13 18:45:13 +02:00
konstantin.grabar
a1a92e9878
[refs #54 ] Fix comments serial_id routing and some logic
2012-01-13 20:07:46 +04:00
Alexander Machehin
794c55a030
Merge branch 'master' of github.com:warpc/rosa-build into 18-commit_comments
2012-01-13 22:01:30 +06:00
Alexander Machehin
8252367537
some fix
2012-01-13 21:58:48 +06:00
konstantin.grabar
db0a66846b
[refs #94 ] Add new notifier rules. Fix some issues and comments bugs
2012-01-13 19:07:01 +04:00
George Vinogradov
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
George Vinogradov
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
George Vinogradov
73b710ae4e
[ close #76 ] Changed styles. Fixed bug with pagination.
2012-01-12 20:37:50 +04:00
konstantin.grabar
f6e4de3b72
[refs #54 ] Fix issue assign user subscribe update filter
2012-01-12 17:07:54 +04:00
Alexander Machehin
07dc7a4800
[refs #18 ] add comments to commit
2012-01-12 17:19:22 +06:00
George Vinogradov
49082c2a8d
[issue #76 ] Fixed bug with JSON generation.
2012-01-12 01:12:56 +04:00
Pavel Chipiga
c23312ad51
Research and fix problem with build_lists#auto_publish feature. Fix specs. Refs #97
2012-01-11 21:43:33 +02:00
konstantin.grabar
2b8aca5f09
[refs #54 ] Add settings notifier
2012-01-11 17:58:13 +04:00
konstantin.grabar
16c9d0ec15
[refs #54 ] Fix some bugs of issues and comments + add comment body to email
2011-12-31 14:51:47 +04:00
George Vinogradov
7c50b2c3f5
[issue #76 ] Added jQuery DataTable. But it doesn't work yet
2011-12-31 02:42:58 +04:00
konstantin.grabar
e8977a7d95
Merger issues with master
2011-12-30 18:23:16 +04:00
George Vinogradov
633e5ebffc
Added actions to WikiController
2011-12-29 22:00:43 +04:00
Pavel Chipiga
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
konstantin.grabar
49ec1ebe98
[refs #54 ] Remove unused comments
2011-12-28 18:24:24 +04:00
konstantin.grabar
fa8656d1f5
[refs #54 ] Refactor subscires routes and authorize
2011-12-28 17:54:45 +04:00
konstantin.grabar
1c263c6e0a
[refs #54 ] Notification DJ support. Routes fixes.
2011-12-28 14:47:54 +04:00
konstantin.grabar
a783b460bd
Merge issues with master
2011-12-28 13:22:57 +04:00
Pavel Chipiga
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
konstantin.grabar
ecbfed9300
[refs #54 ] Fix user_id validation into issues
2011-12-27 21:49:08 +04:00
konstantin.grabar
8face9208e
[refs #54 ] Add fixes and locales to subscribes
2011-12-27 16:35:31 +04:00
George Vinogradov
ec95373d28
[#issue 64] Routes to Wiki and some methods in controller.
...
Useless yet.
2011-12-26 21:07:16 +04:00
George Vinogradov
81378478ca
[issue #64 ] Added Wiki controller and some methods in Project
2011-12-26 21:07:07 +04:00
konstantin.grabar
ce6746f7a9
[refs #54 ] Add subscribes and notifications
2011-12-26 19:48:57 +04:00
Pavel Chipiga
7d3dd5eaf1
[ #82 ] Merge branch 'master' into 65-build_repo
...
Conflicts:
spec/models/cancan_spec.rb
2011-12-26 14:51:30 +02:00
konstantin.grabar
5237939f49
Merge issues with master
2011-12-26 13:26:13 +04:00
konstantin.grabar
bf2f3d1bc7
[refs #54 ] Add issue statuses filters
2011-12-23 18:34:32 +04:00
konstantin.grabar
894bc0c077
[refs #54 ] Add issues tests. Fix some CanCan rights. Make some fixes to logic
2011-12-23 14:56:46 +04:00
Pavel Chipiga
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
konstantin.grabar
e2144e0fdb
[refs #54 ] Fix issue ability and comment redirect after update
2011-12-22 11:41:37 +04:00
Pavel Chipiga
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
Pavel Chipiga
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
Pavel Chipiga
8c2b837600
Fix build_list user assign. Refs #65
2011-12-21 21:17:55 +02:00
Pavel Chipiga
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
konstantin.grabar
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
Pavel Chipiga
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
George Vinogradov
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
Vladimir Sharshov
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
George Vinogradov
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
George Vinogradov
0978312366
[update #27 ] Removed unnecessary comments.
2011-12-20 21:22:44 +04:00
George Vinogradov
39dade9945
[ closed #63 ] Added user column to build_list.
2011-12-20 21:09:29 +04:00
konstantin.grabar
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
konstantin.grabar
446cdac8e6
[refs #54 ] Add new locales. Fix routes. Fix issues and comments update
2011-12-20 14:20:00 +04:00
konstantin.grabar
d20d43eb2b
[refs #54 ] Base logic and templates for issues and comments to them
2011-12-19 19:30:14 +04:00
George Vinogradov
a946349bb4
[ close #23 ] Changed searching.
2011-12-16 04:33:44 +04:00
Vladimir Sharshov
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
George Vinogradov
0c3b62b235
[issue #27 ] Changed abilities. Added test, but test fails.
2011-12-16 01:58:20 +04:00
Pavel Chipiga
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
konstantin.grabar
b3f422e713
[refs #32 ] Add user filter
2011-12-15 20:15:25 +04:00
George Vinogradov
e3663381db
Merge branch 'master' into build_list_visibilities
2011-12-15 03:29:22 +04:00
Pavel Chipiga
a855366a75
Fix merge bug. Take back method. Refs #1
2011-12-15 00:11:31 +02: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
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
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
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
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
konstantin.grabar
4a723369a2
[refs #12 ] Add platform update options
2011-12-13 17:27:27 +04:00
Vladimir Sharshov
e0e0dd1fed
Merge branch 'master' of github.com:warpc/rosa-build
2011-12-13 17:15:22 +04:00
Vladimir Sharshov
fdd89eb51b
#24 . Fix "uninitialized constant BuildList::BUILD_STARTED"
2011-12-13 15:02:41 +04:00
santaux
24766d2383
Merge pull request #14 from warpc/group_members_change
...
Changed adding members to group.
2011-12-13 02:16:37 -08:00
George Vinogradov
461cf3fd8e
[issue #27 ] Added using of new BuildList scope in controller
2011-12-13 04:27:03 +04:00
konstantin.grabar
222033de5e
[refs #12 ] Fix platform relations again
2011-12-12 19:37:37 +04:00
konstantin.grabar
6a364b73a6
[refs #12 ] Fix platform admin relations. Locales correction. Add validationa and rsync stubs.
2011-12-12 18:10:39 +04:00
George Vinogradov
c3f4c8dd87
[updated #16 ] admin_id renamed to admin_uname.
2011-12-11 21:43:42 +04:00
George Vinogradov
b9c0f1e3d9
[ fixed #16 ] Changed owner fetching in PlatformsController#create
2011-12-11 20:00:50 +04:00
George Vinogradov
d2831da4b8
Issue #11 updated. Added check if user already added.
2011-12-10 21:26:57 +04:00
George Vinogradov
168e110169
[ close #11 ] Changed adding members to group.
2011-12-10 03:40:13 +04:00
George Vinogradov
603e4b3691
fixed #4 . Removed unnecessary routes and views parts.
2011-12-08 18:47:18 +04:00
George Vinogradov
26689f3bd2
Start writing Group tests.
2011-12-07 23:51:08 +04:00
George Vinogradov
0d9b683100
Fixed bug in ApplicationController#get_owner
2011-12-07 16:32:42 +04:00
konstantin.grabar
0f827f2644
[refs #2249 ] Fix collaborators controller. Fix projects specs.
2011-12-07 13:47:43 +04:00
George Vinogradov
0bffb0581e
Some changes in groups.
2011-12-07 03:45:09 +04:00
George Vinogradov
c6e5ace271
fixed bug with empty group form submitting
2011-12-07 00:16:19 +04:00
Pavel Chipiga
701ccf54dd
Fix OpenID registration bug. Refs #2261
2011-12-06 21:45:25 +02:00
konstantin.grabar
fcc17da1ad
[refs #2249 ] Add products specs. Fix some things in other specs
2011-12-06 19:24:33 +04:00
konstantin.grabar
fc4643ce9b
[refs #2249 ] Fix some specs. Fix shared examples. Fix new/create repositories and products ability
2011-12-06 19:24:33 +04:00
George Vinogradov
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
George Vinogradov
9cc820080b
Groups base functional.
2011-12-05 16:32:18 +04:00
Pavel Chipiga
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
konstantin.grabar
96d4886f49
[refs #2249 ] Add new ACL relations
2011-12-01 18:20:24 +04:00
konstantin.grabar
6d8e4f98b9
[refs #2249 ] Some ACL changes
2011-12-01 13:29:04 +04:00
Pavel Chipiga
e45ba6692a
Rename delete_build_list to cancel_build_list. Rescue XML get_status exception. Refs #2261
2011-12-01 00:55:47 +02:00
Pavel Chipiga
4ea4d7f56e
Refactor build_all - move to model. Apply delayed build_all. Refs #2261
2011-11-30 23:43:01 +02:00
Pavel Chipiga
76c5c86c27
Add db default value for build_lists field build_requires. Refs #2261
2011-11-30 21:03:58 +02:00
Pavel Chipiga
e7a6b01e09
Fix and refactor platform build_all. Add more settings. Refs #2261
2011-11-30 19:46:20 +02:00
George Vinogradov
81e290a9b3
Merge branch 'groups_reincarnation' of github.com:warpc/rosa-build into groups_reincarnation
2011-11-30 19:28:56 +04:00
George Vinogradov
f154ccc132
Fixed groups creation.
2011-11-30 19:27:19 +04:00
konstantin.grabar
438bedd226
Add build all btn to platforms
2011-11-30 18:48:50 +04:00
Pavel Chipiga
19076c805e
Skip authorization for callback actions during project build. Refactor. Refs #2261
2011-11-30 15:56:00 +02:00
Pavel Chipiga
3a2215d0ee
Redo project versions to use tags and branches for build. Refs #2261
2011-11-30 15:56:00 +02:00
Pavel Chipiga
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
George Vinogradov
7023dda7e0
First iteration of groups refactoring.
2011-11-30 16:58:14 +04:00
Pavel Chipiga
7535fc124a
Skip authorization for callback actions during project build. Refactor. Refs #2261
2011-11-30 02:56:57 +02:00
Pavel Chipiga
4971fbbbde
Redo project versions to use tags and branches for build. Refs #2261
2011-11-30 02:22:26 +02:00
Pavel Chipiga
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
konstantin.grabar
148a0fec28
[refs #2249 ] Global name to description and unixname to name renames
2011-11-29 14:51:14 +04:00
Pavel Chipiga
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
Pavel Chipiga
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
Pavel Chipiga
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
konstantin.grabar
0573acb650
[refs #2249 ] Add more Collaborators and Projects controllers specs
2011-11-24 23:22:37 +04:00
Pavel Chipiga
141fe7677f
Apply project fork button. Refactor and cleanup code. Refs #2243
2011-11-23 17:52:33 +02:00
Pavel Chipiga
366ca320e0
Change and fix role assign logic and abilities. Other minor fixes. Refs #2261
2011-11-21 21:06:34 +02:00
konstantin.grabar
b98453bd62
[refs #2249 ] Add new user managment logic
2011-11-21 22:26:56 +04:00
konstantin.grabar
140eaf6265
[refs #2249 ] Remove old roles managment system
2011-11-21 21:43:37 +04:00
konstantin.grabar
5e7ded2e93
[refs #2249 ] Remove custom ACL from project
2011-11-19 16:11:44 +04:00
konstantin.grabar
44191926f7
[refs #2249 ] Some CanCan fixes. Add ru exception message
2011-11-19 15:49:14 +04:00
konstantin.grabar
e50959e205
[refs #2249 ] Add full rules, helpers and filters of CanCan
2011-11-19 15:41:11 +04:00
Pavel Chipiga
d49880f24e
Merge branch 'smart_http' into staging
...
Conflicts:
app/models/relation.rb
app/models/user.rb
2011-11-18 20:35:12 +02:00
konstantin.grabar
7b750a6f93
Merge branch 'cancan' into staging
2011-11-18 22:30:23 +04:00
Pavel Chipiga
4d78ce371f
Merge branch 'master' into staging
...
Conflicts:
app/models/build_list.rb
2011-11-18 20:27:33 +02:00
konstantin.grabar
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
Pavel Chipiga
4be634a8fb
Add slash to easy_urpmi url. Refs #test_prepare
2011-11-18 15:00:31 +02:00
Pavel Chipiga
a819185ecc
Try to fix deploy. Fix easy_urpmi url. Refs #test_prepare
2011-11-18 14:50:06 +02:00
Pavel Chipiga
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
Pavel Chipiga
497e8f64f4
Redo commit diffs display. Fix tree blob blame display. Refs #2162
2011-11-18 11:48:50 +02:00
Pavel Chipiga
d7702b9901
Sort project versions as numbers. Do not create duplicate build lists. Refs #test_prepare
2011-11-18 03:28:34 +02:00
Pavel Chipiga
2503503252
Process auto_build through DJ. Refs #test_prepare
2011-11-18 02:07:51 +02:00
Pavel Chipiga
cbfa5858d4
Add tags ordering, check and fix. Refactor auto_build. Refs #test_prepare
2011-11-18 00:28:02 +02:00
Pavel Chipiga
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
konstantin.grabar
2772bddc06
[refs #2249 ] Add new rules. Fix joins trouble. Add new relations dynamic methods.
2011-11-17 23:34:02 +04:00
konstantin.grabar
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
konstantin.grabar
827936a06c
Remove custom ACL calls. Add CanCan and some rules. Add bitmask_attribute
2011-11-16 00:05:08 +04:00
Pavel Chipiga
b36cc24a64
Redo commit diffs display. Fix tree blob blame display. Refs #2162
2011-11-11 23:57:10 +02:00
Pavel Chipiga
e7f9d8251a
Rename product field build to build_script. Change links. Refs #2161
2011-11-11 21:12:15 +02:00
Pavel Chipiga
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
Pavel Chipiga
c64f93f6bd
One more fix build_lists#cancel logging. Improve XML RPC stubbing. Refactor. Refs #2161
2011-11-08 00:54:25 +02:00
Pavel Chipiga
fb165483b8
Refix platform clone with products. Refs #2162
2011-11-03 14:49:14 +02:00
konstantin.grabar
8030ea1afb
Fix test sudo action
2011-11-03 15:18:26 +04:00
konstantin.grabar
4b4df620ff
Fix test sudo action
2011-11-03 15:16:17 +04:00
konstantin.grabar
d9a03013b4
[refs #2161 ] Fixes projects filter
2011-11-03 15:01:29 +04:00
konstantin.grabar
117ae7bbff
[refs #2161 ] Repair projects filter
2011-11-03 14:56:41 +04:00
konstantin.grabar
df2f3abe62
[refs #2161 ] Add test sudo action
2011-11-03 14:33:23 +04:00
Pavel Chipiga
49e4dea478
Redo platform clone. Refs #2162
2011-11-03 10:32:45 +02:00
konstantin.grabar
f4c3bafb6d
[refs #2161 ] Change logic and output of urpmi commands
2011-11-03 12:03:08 +04:00
George Vinogradov
910446954c
Fixed access to BuildList
2011-11-03 02:13:58 +04:00
George Vinogradov
3e2e01deb6
Changed My Projects block
2011-11-03 01:39:50 +04:00
Pavel Chipiga
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
Vladimir Sharshov
e1ba3dda2e
Merge branch 'master' of github.com:warpc/rosa-build
2011-11-03 00:34:52 +04:00
Vladimir Sharshov
f1bd00545e
Show code of task
2011-11-03 00:34:31 +04:00
Pavel Chipiga
96e223d0eb
Fix project search during auto_build action. Refs #2162
2011-11-02 22:28:08 +02:00
Vladimir Sharshov
ae6919a240
Add url for downloading file archive
2011-11-03 00:25:25 +04:00
Pavel Chipiga
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
Vladimir Sharshov
18dae1e894
Fix for ProductBuild
2011-11-02 22:48:21 +04:00
Vladimir Sharshov
5b475ef2b8
Send platform unixname as path
2011-11-02 22:21:02 +04:00
George Vinogradov
b048c54004
Added own projects sidebar
2011-11-02 20:22:42 +04:00
George Vinogradov
1dfb272ffc
Fixed removing project from repository.
2011-11-02 16:55:20 +04:00
konstantin.grabar
4341155771
[refs #2161 ] Change private users and personal repos menus
2011-11-02 16:43:41 +04:00
George Vinogradov
18de67ba7d
Merge branch 'master' of github.com:warpc/rosa-build
2011-11-02 16:32:19 +04:00
George Vinogradov
33e8e49007
Changed platform clone
2011-11-02 16:30:47 +04:00
konstantin.grabar
7b8df283eb
[refs #2161 ] Change regenerate logic for private_users
2011-11-02 14:42:08 +04:00
Vladimir Sharshov
9c00f9b56b
Order correct on main page
2011-11-02 12:27:14 +04:00
George Vinogradov
392db40a31
Fixed bug with platforms#clone
2011-11-02 02:05:18 +04:00
George Vinogradov
103cb16f27
Added form to set name of platfroms clone
2011-11-02 02:00:44 +04:00
Pavel Chipiga
38f96adbba
Refix category display. Refs #2162
2011-11-01 23:56:50 +02:00
Pavel Chipiga
0255334bc5
Fix category display. Refs #2162
2011-11-01 23:28:41 +02:00
konstantin.grabar
2c0422a3bc
[refs #2161 ] Split platforms on three groups
2011-11-02 00:53:48 +04:00
konstantin.grabar
fffb73a484
[refs #2161 ] Update auto_build_lists controller scopes
2011-11-02 00:23:06 +04:00
Pavel Chipiga
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
George Vinogradov
b835c7ad3c
Find right @repositories in repositories#index
2011-11-01 20:27:34 +04:00
konstantin.grabar
b9c4ab3170
Fix downloads message
2011-11-01 20:06:50 +04:00
konstantin.grabar
e36389adfd
[refs #2161 ] Fix add_project
2011-11-01 18:34:35 +04:00
konstantin.grabar
643bf964e4
[refs #2161 ] Fix private users key pair remove
2011-11-01 17:54:28 +04:00
konstantin.grabar
e03d711d1b
[refs #2161 ] Global private users and repos fixes
2011-11-01 17:32:50 +04:00
George Vinogradov
5ac70da272
Fixed bug in ACL checks
2011-11-01 02:49:24 +04:00
George Vinogradov
dfc507ff59
Fixed some bugs in ACL checks.
2011-11-01 01:55:56 +04:00
George Vinogradov
28bc00e937
Merge branch 'master' of github.com:warpc/rosa-build
2011-10-31 22:14:55 +04:00
George Vinogradov
932251a190
Added ACL to controllers
2011-10-31 22:14:25 +04:00
konstantin.grabar
43e1c31ced
[refs #2161 ] Fix privates controller filters
2011-10-31 21:12:35 +04:00
konstantin.grabar
fcb9007a47
[refs #2161 ] Fix downloads actions
2011-10-31 20:18:55 +04:00
konstantin.grabar
de959bb527
[refs #2161 ] Add refresh option to statistics
2011-10-31 19:58:04 +04:00
Pavel Chipiga
ea0be5cd97
Fix distr_types. Refs #2162
2011-10-31 17:20:16 +02:00
George Vinogradov
0556ebdf8e
Fixed bug with adding collaborators.
2011-10-31 17:24:46 +04:00
George Vinogradov
5fb704d3c5
Fixed bug with user registration and changed hardcoded 'mandriva2011'
2011-10-31 04:33:47 +04:00
Pavel Chipiga
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
George Vinogradov
b9ee6e365b
Added collaborators management.
2011-10-31 02:59:03 +04:00
konstantin.grabar
cd14be75ce
[refs #2161 ] Fixed project versions collect
2011-10-31 01:11:59 +04:00
Pavel Chipiga
f39e51e516
Fix XML RPC responses. Refs #2162
2011-10-30 21:01:08 +02:00
Pavel Chipiga
0c3a044f81
Fix REXML Exception when using Unicorn or Passenger with XmlRPC. Add XML RPC events logging. Refactor. Improve after_rollback callback. Refs #2162
2011-10-30 18:46:52 +02:00
konstantin.grabar
8f194e97c5
Fix auto build list
2011-10-29 23:24:57 +04:00
konstantin.grabar
30564e8e17
[refs #2161 ] Add auto build lists functional
2011-10-29 23:09:50 +04:00
George Vinogradov
411e40267a
Added stub for add_collaborators action.
2011-10-29 19:56:44 +04:00
George Vinogradov
14bc7acc0b
Fixed mass assignment to global_role_id
2011-10-29 18:14:41 +04:00
George Vinogradov
a810c0fc3a
Added editing of global_role of user.
2011-10-29 17:39:40 +04:00
konstantin.grabar
512364be32
[refs #2161 ] Add get_status call
2011-10-29 17:38:17 +04:00
konstantin.grabar
4e0617a722
[refs #2161 ] Swap bpl and pl fields into BuildList
2011-10-29 16:18:41 +04:00
konstantin.grabar
372d7dac4d
[refs #2161 ] Fix categories group by and select
2011-10-29 15:25:11 +04:00
Vladimir Sharshov
05595c7ce6
Fix empty json answer
2011-10-29 13:38:52 +04:00
George Vinogradov
2f5e77ba56
Added call of visible_to to platforms and projects.
2011-10-29 02:34:51 +04:00
Pavel Chipiga
5910c8c29b
Apply event logs for build list create, cancel, publish. Refs #2136
2011-10-29 01:31:47 +03:00
Pavel Chipiga
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
George Vinogradov
324b730a7d
Added checking of global rights to all controllers.
2011-10-28 21:55:40 +04:00
konstantin.grabar
7b3167cfa7
Add personal repository rights. Add personal checker to controller
2011-10-28 18:28:45 +04:00
Pavel Chipiga
c39e01ba32
Add auto_build hook recivier. Remove XML RPC from project. Gitolite docs. Refs #2136
2011-10-28 16:27:12 +03:00
konstantin.grabar
6238012fa9
[refs #2106 ] Move visibility logic to platforms
2011-10-28 11:20:13 +04:00
konstantin.grabar
4f6bfac345
Fix rep destroy redirect
2011-10-28 03:16:22 +04:00
konstantin.grabar
04b49c9f65
Add hidden field for platform_id within repository new form
2011-10-28 02:49:37 +04:00
Pavel Chipiga
f66216fa6a
Change project redirect rules. Fux git repo clone port. Refs #2136
2011-10-28 01:44:02 +03:00
George Vinogradov
37c37f5cbd
Merge branch 'master' of github.com:warpc/rosa-build
2011-10-27 18:49:14 +04:00
konstantin.grabar
89312375fd
Merge master and personal_repos
2011-10-27 17:13:53 +04:00
konstantin.grabar
3114eb1ecc
[refs #2106 ] Add personal repos to project. Some changes of private repos controller and logic
2011-10-27 17:04:03 +04:00
Pavel Chipiga
857ae7621a
Merge branch 'gitolito'
2011-10-27 15:50:21 +03:00
Pavel Chipiga
7b9fa26ac8
Remove git_projects_path application config var. usr root_path instead. Fix bugs. Improve links, usability, refactor. Refs #2136
2011-10-27 15:49:26 +03:00
Pavel Chipiga
a470f01690
Move easy_urpmi json integration to separate action. Do not require authentication. Change name to unixname, improve URL generation. Refs #1959
2011-10-27 14:02:25 +03:00
konstantin.grabar
879b7acf8e
[refs #2109 ] Fixed platform editing
2011-10-27 13:30:38 +04:00
George Vinogradov
d932999b8c
Fixed bug in determining visibility of object
2011-10-27 01:14:16 +04:00
Pavel Chipiga
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
George Vinogradov
26f405fccd
Removed old methods from ApplicationController
2011-10-26 15:01:09 +04:00
George Vinogradov
02a8a62f36
Added dump to yml and load from yml abilities for roles.
2011-10-26 04:35:01 +04:00
George Vinogradov
bc761b4ef3
Added authenticate filters.
2011-10-24 17:01:15 +04:00
konstantin.grabar
9c182f0bda
Merge master and build_lists_queue
2011-10-24 14:40:36 +04:00
konstantin.grabar
d04de6e2fc
[refs #1832 ] Fixed git repos web interface routes
2011-10-24 14:19:04 +04:00
Ilya Krasilnikov
f5033a224c
XML-PRC controller
2011-10-24 05:59:16 +04:00
George Vinogradov
82d72a851c
ACL for testing.
2011-10-24 01:39:44 +04:00
konstantin.grabar
5a5529ba3e
[refs #1832 ] Build list process fixes
2011-10-23 15:24:46 +04:00
konstantin.grabar
d047e3f2b2
[refs #1832 ] Replace branches to tags in the project
2011-10-23 14:34:42 +04:00
konstantin.grabar
59bfac2be7
[refs #1832 ] Add some fixes to controllers. Add JS validation to project build
2011-10-23 11:37:54 +04:00
konstantin.grabar
56df3d05b0
[refs #1832 ] Fix build lists controller and some templates
2011-10-23 10:49:56 +04:00
konstantin.grabar
c24a9fae1b
[refs #1832 ] Build Lists updates. Project updates and fixes.
2011-10-22 19:28:41 +04:00
Pavel Chipiga
b61797e896
Merge branch 'easy_urpmi'
...
Conflicts:
app/controllers/application_controller.rb
2011-10-21 17:57:29 +03:00
Pavel Chipiga
644d57b420
Merge branch 'catalog'
...
Conflicts:
Gemfile
Gemfile.lock
app/views/layouts/application.html.haml
app/views/repositories/show.html.haml
config/locales/ru.yml
config/routes.rb
db/schema.rb
2011-10-21 17:55:41 +03:00
Pavel Chipiga
559f3d2ee9
Fix bug and refactor role relation. Apply platforms JSON display in supplied format. Refs #1959
2011-10-20 23:23:38 +03:00
George Vinogradov
5b5761e80e
Fixed some bugs.
2011-10-20 21:01:01 +04:00
George Vinogradov
505cb74c34
Merge branch 'itima_web_refactoring'
...
Conflicts:
app/models/user.rb
2011-10-20 20:00:52 +04:00
George Vinogradov
a92282de1e
Merge branch 'chipiga'
...
Conflicts:
app/controllers/application_controller.rb
app/views/layouts/application.html.haml
config/locales/ru.yml
db/schema.rb
2011-10-20 19:55:03 +04:00
George Vinogradov
1659ad5805
Merge branch 'private_repos'
...
Conflicts:
config/application.yml.sample
config/locales/ru.yml
config/routes.rb
db/schema.rb
2011-10-20 19:49:35 +04:00
George Vinogradov
2dd99d32f9
Merge branch 'downloads'
...
First turn of merging.
Conflicts:
.gitignore
Gemfile
Gemfile.lock
config/locales/ru.yml
config/routes.rb
db/schema.rb
2011-10-20 19:22:11 +04:00
Pavel Chipiga
5291752419
Add categories and apply basic CRUD actions. Add category link and description to project. Apply category assign to project. Apply categorization with platforms. Integrate to common design and layout. Import basic categories structure. Refs #1858
2011-10-19 23:58:31 +03:00
Toljio
b84ab42d00
add extension actions, model role_relations
2011-10-20 00:19:45 +04:00
George Vinogradov
ff36b1fdd3
Merge branch 'itima_web_refactoring'
...
Conflicts:
Gemfile
Gemfile.lock
app/models/user.rb
app/views/layouts/application.html.haml
config/locales/ru.yml
config/routes.rb
db/schema.rb
2011-10-19 18:09:58 +04:00
George Vinogradov
126e9e1db1
Merge branch 'itima_web_refactoring' of github.com:warpc/rosa-build into itima_web_refactoring
...
Conflicts:
app/models/platform.rb
2011-10-19 17:23:23 +04:00
George Vinogradov
ee9af32fa6
Adding projects to repositories.
2011-10-19 17:16:29 +04:00
Toljio
e5438b29bc
change roles/rights
2011-10-18 22:32:08 +04:00
santaux
5f17928423
[refs #1923 ] Add private repositories to project
2011-10-18 17:47:17 +04:00
Pavel Chipiga
099120e71b
Fix bugs. Refs #1858
2011-10-17 19:07:53 +03:00
George Vinogradov
3c31bdf29c
Changed Platforms representation
2011-10-17 18:27:07 +04:00
George Vinogradov
0d10c50710
Changed representation of Users
2011-10-17 18:23:51 +04:00
George Vinogradov
5a6248c1af
Changed representation of Projects
2011-10-17 18:21:29 +04:00
George Vinogradov
75cd0c7ae6
Changed representation of Repositories.
2011-10-17 18:20:35 +04:00
George Vinogradov
ff5aa09c30
Added method to determine current acter (group or user)
2011-10-17 18:16:21 +04:00
Pavel Chipiga
5f705cdd0d
Develop and apply event logging mechanism without source code modification and with localization. Apply events log display with pagination. Apply XML RPC requests stub for local test. Refactor. Refs #1828
2011-10-17 11:04:36 +03:00
George Vinogradov
fa3359b025
Some changes in representation
2011-10-17 00:50:56 +04:00
George Vinogradov
d7cddecbe8
Changed User representation.
2011-10-17 00:49:41 +04:00
George Vinogradov
f76a3aee39
Added groups representation.
2011-10-17 00:48:02 +04:00
santaux
8103b14e15
[refs #1861 ] Add downloads statistics
2011-10-14 10:35:25 +04:00
Pavel Chipiga
0efa8c83a2
Fix nickname format check. Apply readonly nickname field. Show flash notice during registration through OpenID. Fix email read from OpenID response. Refs #1954
2011-10-13 13:19:42 +03:00
Pavel Chipiga
77e03df70b
Refactor gemfile and upgrade rails, devise and other gems, fix conflicts, remove deprecations. Implement user classic registration and registration through omniauth OpenId. Allow user enter correct nickname and change other info during registration through OpenId. Make login through nickname or email. Apply profile edit form. Dont ask current password for profile update. Fix layout and devise links. Refs #1954
2011-10-11 23:56:51 +03:00
Vladimir Sharshov
02a9a46b60
Add publish function for BuildList
2011-09-15 21:56:20 +04:00
Vladimir Sharshov
b2b7382613
Update BuildServer
...
- Change xml-rpc call function (add_build_list).
Add id, that identify project new_bbbt and assign bs_id
- Add find_build_list_by_bs to post_build call
2011-09-05 18:40:49 +04:00
Alexey Nayden
232eb9461e
Platform clone ui
2011-05-30 13:04:32 +04:00
Timothy N. Tsvetkov
35483ce02f
Merge branch 'master' of github.com:evilmartians/rosa-build
2011-04-28 18:32:20 +04:00
Timothy N. Tsvetkov
c927abd073
added crontab to products without translations and setting values to generator form for existing crontab line
2011-04-28 18:32:11 +04:00
Alexey Nayden
315ede490e
Projects filter
2011-04-28 15:01:58 +04:00
Alexey Nayden
e3b3ce57b2
stupid bugfix
2011-04-28 14:26:10 +04:00
Alexey Nayden
babed29a53
Product deletion
2011-04-28 14:23:52 +04:00
Timothy N. Tsvetkov
5a03f4b01f
default paginattion
2011-04-28 11:33:03 +04:00
Alexey Nayden
4f29a63296
dedebug + ui fix
2011-04-22 20:13:47 +04:00
Alexey Nayden
f4c137000e
one more fix
2011-04-22 18:27:02 +04:00
Alexey Nayden
80174c6d3e
xmlrpc doc fix
2011-04-22 18:22:44 +04:00
Alexey Nayden
c9a68756a9
minor
2011-04-22 16:51:31 +04:00
Alexey Nayden
bbc178a790
Product build test
2011-04-22 16:48:08 +04:00
Alexey Nayden
90cffe7a43
XML RPC to doc fix
2011-04-22 16:14:22 +04:00
Alexey Nayden
91928f714f
Build List JSON parse for arrays
2011-04-22 16:08:58 +04:00
Timothy N. Tsvetkov
fb2808b9e6
crontab generator without translations, because im in fucken ISRAELgit add app/controllers/crontabs_controller.rb app/views/crontabs/show.html.hamlgit add app/controllers/crontabs_controller.rb app/views/crontabs/show.html.haml Shalom LEOLAM
2011-04-18 16:34:06 +04:00
Alexey Nayden
38cef4d887
Minor product fixes
2011-04-15 13:23:12 +04:00
Timothy N. Tsvetkov
c039fbc8bc
haha, added platform update
2011-04-14 23:43:42 +04:00
Timothy N. Tsvetkov
577cb2e126
added platform cloning and system_wide flag
2011-04-14 21:04:32 +04:00
Alexey Nayden
856b93d3d8
Product management. Step 2
2011-04-14 11:23:08 +04:00
Alexey Nayden
231771890e
Confilict resolve
2011-04-11 20:57:43 +04:00
Alexey Nayden
dce4e76da1
Product management. Step 1
2011-04-11 20:55:52 +04:00
Timothy N. Tsvetkov
1a6330956b
build list creation
2011-04-11 20:37:09 +04:00
Timothy N. Tsvetkov
3895defa45
defferent ip auth for build service and product builder
2011-04-11 17:04:03 +04:00
Timothy N. Tsvetkov
4da241672b
auth by ip
2011-04-11 16:56:22 +04:00
Timothy N. Tsvetkov
e3b12e4a1a
merge
2011-04-11 14:52:37 +04:00
Timothy N. Tsvetkov
82869f57a7
build list items and more statuses
2011-04-11 14:47:57 +04:00
Alexey Nayden
cd6e7ade15
Product Builder xml-rpc and Product model
2011-04-11 12:35:08 +04:00
Alexey Nayden
cbab2a7671
minor fix
2011-04-11 12:34:34 +04:00
Timothy N. Tsvetkov
62d0985fcb
more methods fot build lists, added is_circle build flag
2011-04-07 18:56:28 +04:00
Timothy N. Tsvetkov
4ac5931f44
fixes + build lists
2011-04-07 17:20:21 +04:00
Timothy N. Tsvetkov
6b26715e22
increased awesomness of blobs controller
2011-04-04 20:50:43 +04:00
Timothy N. Tsvetkov
8692995969
tag and branches selection
2011-04-04 20:00:24 +04:00
Timothy N. Tsvetkov
4f7c51b61f
commit pagination + fixes
2011-04-04 17:49:08 +04:00
Timothy N. Tsvetkov
6120547800
AwEsOmE blame + minor fixes
2011-04-04 15:28:33 +04:00
Timothy N. Tsvetkov
5135f048a5
some views for git
2011-04-01 04:36:34 +04:00
Timothy N. Tsvetkov
4ed5c11335
added flash notices on destroy
2011-03-31 06:00:21 +04:00
Timothy N. Tsvetkov
a65bf7a4f8
new views for project
2011-03-31 05:56:20 +04:00
Timothy N. Tsvetkov
81745019cf
new views for repositories
2011-03-31 05:15:17 +04:00
Timothy N. Tsvetkov
5df5e53f46
LOLZ
2011-03-31 04:59:12 +04:00
Timothy N. Tsvetkov
6de6c6cd5e
Hey, we should redirect after destory somewhere
2011-03-31 04:58:27 +04:00
Timothy N. Tsvetkov
28134c9c63
We should select all platforms for the select box if platform creation fails
2011-03-31 03:35:05 +04:00
Timothy N. Tsvetkov
309b037acf
Paul Irish BUY BUY oMG, Using AWESOME web-app-theme
2011-03-31 03:10:23 +04:00
Timothy N. Tsvetkov
3b51d53225
freeze + spec
2011-03-17 17:47:16 +03:00
Timothy N. Tsvetkov
215b4d235c
Merge branch 'master' of github.com:evilmartians/rosa-build
2011-03-17 15:35:51 +03:00
Timothy N. Tsvetkov
c18abc3801
translations for flash messages in platforms controller
2011-03-17 15:35:42 +03:00
Alexey Nayden
33577b82fc
Merge branch 'master' of github.com:evilmartians/rosa-build
2011-03-16 00:52:35 +03:00
Alexey Nayden
002dc417b5
Container/Arch/Rpm
2011-03-16 00:52:27 +03:00
Timothy N. Tsvetkov
8f5f1aa91d
creating git-repo when creating new project, showing empty repo
2011-03-15 14:24:45 +03:00
Alexey Nayden
7896c4e7d3
Container model
2011-03-12 16:35:00 +03:00
Timothy N. Tsvetkov
5bc5638934
friday fixes lets drink vodka for your money very well
2011-03-11 20:19:47 +03:00
Timothy N. Tsvetkov
7cce8520a9
Merge branch 'master' of github.com:evilmartians/rosa-build
2011-03-11 19:31:16 +03:00
Timothy N. Tsvetkov
9cb7540f19
gir tree fixes
2011-03-11 19:31:06 +03:00
Alexey Nayden
9609a682a6
Finishing migration to new hierarchy
2011-03-11 19:30:02 +03:00
Alexey Nayden
716cc97330
Inheritance bugfix
2011-03-11 19:15:06 +03:00
Alexey Nayden
80304ef7f2
Trying to add repositories to my hierarchy
2011-03-11 19:08:41 +03:00
Timothy N. Tsvetkov
a2ffc0b37d
Merge branch 'master' of github.com:evilmartians/rosa-build
2011-03-11 13:06:27 +03:00
Timothy N. Tsvetkov
20af306073
git fixes
2011-03-11 13:06:14 +03:00
Alexey Nayden
0ff80b3e16
User management
2011-03-11 00:48:15 +03:00
Timothy N. Tsvetkov
da7d23abd0
the second classic oops commit
2011-03-10 17:22:53 +03:00
Timothy N. Tsvetkov
a373af936b
sample view for the project
2011-03-10 17:20:09 +03:00
Alexey Nayden
eccb4e0a6c
Project/platform management
2011-03-10 16:38:50 +03:00
Timothy N. Tsvetkov
e9b9e044f9
fixes and repository, tree view
2011-03-10 16:19:23 +03:00
Timothy N. Tsvetkov
c148b48f74
merge
2011-03-10 15:41:06 +03:00
Timothy N. Tsvetkov
cf2d6866b4
simple, not tested, possibly not working, without views, git controllers
2011-03-10 15:39:24 +03:00
Alexey Nayden
0a7c0e4e9b
Platforms list + UI enchancements
2011-03-10 14:35:46 +03:00
Alexey Nayden
af3c9b52be
Hoptoad + blank platforms#index
2011-03-09 22:27:51 +03:00
Alexey Nayden
eae3c46912
Initial commit
2011-03-09 16:13:36 +03:00