fe46e53ad8
[issue #195 ] Many changes.
...
* Base presenter moved to lib
* Added diff display
* Changes in some views
TODO Add translations.
TODO Change commit page layout.
TODO Change representation of commit on commit page.
TODO Fix bug with tree/branch select.
2012-02-29 06:02:07 +04:00
895b095058
Merge branch '3.2-master' into 194-tracker
...
Conflicts:
app/assets/stylesheets/custom.scss
app/assets/stylesheets/main.scss
2012-02-28 22:31:00 +06:00
e9ae923b60
[refs #195 ] Merge 3.2-master into 195-new_design_for_projects
2012-02-28 20:10:31 +04:00
529d8d3708
Merge pull request #192 from warpc/123-activity-feed
...
[Refs #123 ] activity feed (commits notifcation not work)
2012-02-28 07:46:55 -08:00
06795a56be
[refs #195 ] Add sections action ability for projects
2012-02-28 19:44:16 +04:00
2f39b050ae
Merge branch 'master' into 3.2-master
...
Conflicts:
config/deploy.rb
2012-02-28 17:44:11 +02:00
0abea8ff55
[refs #194 ] fix issues count
2012-02-28 20:28:11 +06:00
bc4a157703
Merge branch '3.2-master' into 194-tracker
...
Conflicts:
app/assets/stylesheets/application.scss
app/views/issues/_form.html.haml
app/views/platforms/show.html.haml
2012-02-28 20:13:08 +06:00
0d75a37451
[refs #194 ] show page beta version
2012-02-28 20:05:18 +06:00
7d56267e03
[ Fix #224 ] Alphabetic order category list
2012-02-28 14:35:17 +04:00
70963d0943
Merge branch 'master' into 3.2-master
2012-02-27 22:34:21 +02:00
159ef26b38
Merge branch 'master' into 3.2-master
...
Conflicts:
app/views/wiki/_compare.html.haml
app/views/wiki/_diff_data.html.haml
db/schema.rb
2012-02-27 22:32:57 +02:00
ddda2b92ab
[Refs #221 ] Delete product build lists (only in web)
2012-02-28 00:00:33 +04:00
1005fbd64f
Add link to product container. Refs #217
2012-02-27 18:21:56 +02:00
27c85d32df
[refs #194 ] create page; index pagination; some bugs
2012-02-27 22:10:12 +06:00
e1f7817624
Add local admin ability to build product. Fix template links. Refactor. Refs #217
2012-02-27 15:49:24 +02:00
72fec3b314
[refs #195 ] Add owner choose on project create
2012-02-27 13:03:28 +04:00
dde81b5554
[refs #123 ] fix activity feed for commit comments; remove reply notification
2012-02-25 00:25:35 +06:00
46a5ab1c76
Merge branch 'master' into 123-activity-feed
...
Conflicts:
config/deploy.rb
db/schema.rb
2012-02-24 20:44:36 +04:00
3c8f1c062b
Fix ActivityFeed for user, remove info about password [Refs #207 ]
2012-02-24 20:33:00 +04:00
3685eafe57
Remove unused code [Refs #207 ]
2012-02-24 19:35:29 +04:00
51e2c85b0a
Fix build_for settings. Refs #207
2012-02-24 19:28:01 +04:00
165a8dd6f4
Build only main repo. Refs #207
2012-02-24 19:28:01 +04:00
15f78e30a0
Redo platform build_all with sleep and errors rescue. Refs #207
2012-02-24 19:28:00 +04:00
07093c0d1d
Create directory for platform before clone. Fix created directory permissions. Increase timeout during XML RPC clone. Switch off cascade XML RPC requests during platform destroy. Refs #207
2012-02-24 19:28:00 +04:00
9015b971aa
Redo clone logic. Split clone process for repositories. Optimize and refactor. Refs #207
2012-02-24 19:28:00 +04:00
069c226110
Place platform destroy to background. Redo clone process to 2 phases - base_clone and relations_clone. Place relations clone and XML RPC to background. Remove unneeded validations. Refactor xml_rpc_clone. Refs #207
2012-02-24 19:28:00 +04:00
600df031f5
Refactor platform clone controller and routes. Refactor and fix clone process for platform, repository, product. Place XML RPC clone request to DJ. Refs #207
2012-02-24 19:27:59 +04:00
5e58ec9e59
Delegate all repo abilities to platform. Remove repository owner and relations. Fix templates and specs. Refactor and code cleanup. Refs #205
2012-02-24 19:27:58 +04:00
30f47a1748
[refs #134 ] lost env!
2012-02-24 19:27:57 +04:00
a809a4c116
[refs #134 ] fixed bug with new project
2012-02-24 19:27:57 +04:00
41861185c0
[refs #134 ] fixed git hook
2012-02-24 19:27:56 +04:00
bab3a90155
Apply approved and rejected filters for register requests. Tune abilities. Link to user profile if user have already registered. Refs #174
2012-02-24 19:27:55 +04:00
bda978a306
Fix bug with group autocomplete. Do not delete during rsync
2012-02-24 17:27:49 +02:00
28e2494e14
[refs #123 ] Remove stubs controller
2012-02-24 15:26:50 +04:00
dde34cdffb
Fix build_for settings. Refs #207
2012-02-23 22:20:44 +02:00
86c717dee5
Build only main repo. Refs #207
2012-02-23 21:06:28 +02:00
66fc31e404
Redo platform build_all with sleep and errors rescue. Refs #207
2012-02-23 20:32:56 +02:00
9e5e7cd5e4
[refs #194 ] labels manage
2012-02-23 20:48:46 +06:00
b192ebdcea
Create directory for platform before clone. Fix created directory permissions. Increase timeout during XML RPC clone. Switch off cascade XML RPC requests during platform destroy. Refs #207
2012-02-23 00:57:43 +02:00
9eb191da7b
Redo clone logic. Split clone process for repositories. Optimize and refactor. Refs #207
2012-02-22 22:24:29 +02:00
8f4c207545
Place platform destroy to background. Redo clone process to 2 phases - base_clone and relations_clone. Place relations clone and XML RPC to background. Remove unneeded validations. Refactor xml_rpc_clone. Refs #207
2012-02-22 14:35:40 +02:00
5b29de93af
Refactor platform clone controller and routes. Refactor and fix clone process for platform, repository, product. Place XML RPC clone request to DJ. Refs #207
2012-02-21 23:27:11 +02:00
ecb29d1762
[refs #194 ] tags -> labels
2012-02-22 02:28:04 +06:00
85f3d956f5
[issue #195 ] Merge branch '203-feed_message' into 195-new_design_for_projects
...
Conflicts:
app/views/layouts/application.html.haml
2012-02-21 19:42:30 +04:00
ed60751dfa
Delegate all repo abilities to platform. Remove repository owner and relations. Fix templates and specs. Refactor and code cleanup. Refs #205
2012-02-21 01:13:05 +02:00
0ce76207af
[refs #194 ] Add issue tags
2012-02-21 00:41:40 +06:00
76beb6a277
[refs #194 ] add creator to issue
2012-02-19 23:28:43 +06:00
edc8774387
[issue #203 ] Some layout changes & presenters.
...
* Fixed bugs in layout
* Fixed typos
* Fixed bugs in JS
* Added universal partial _feed_message.html.haml
* Added presenters
* Added CommitAsMessage presenter, that prepares Grit::Commit
to be shown as message.
2012-02-19 02:47:57 +04:00
a5375c369c
[refs #134 ] lost env!
2012-02-16 22:29:41 +06:00
4888993c3f
[refs #134 ] fixed bug with new project
2012-02-16 21:08:08 +06:00
20836e8864
[refs #134 ] fixed git hook
2012-02-15 17:12:49 +06:00
da0d791f74
[refs #96 ] fixed commentable & subscribeable ids
2012-02-15 02:28:01 +06:00
2c493cdbb7
Apply approved and rejected filters for register requests. Tune abilities. Link to user profile if user have already registered. Refs #174
2012-02-14 20:15:52 +02:00
101fa63514
Small ActivityFeed refactoring
2012-02-14 20:46:08 +04:00
08ffd8c25d
[refs #123 ] Add wiki to ActivityFeed
2012-02-14 20:09:41 +04:00
b7b69a86d8
Minor gems update. Sync with newest styles, javascripts, images. Refactor assets. Merge and fix wiki assets, temporary disable buggy ones. Change subscribeable_id type from string to decimal to avoid bugs. Auto convert commit subscribe subscribeable_id from hex to decimal. Refactor commentable. Fix bugs and some specs. Refactor application.yml. Refs #96
2012-02-14 18:05:41 +02:00
5039907431
Merge branch 'master' into 123-activity-feed
2012-02-14 14:30:27 +04:00
7d74b0af13
Merge branch 'master' into 96-upgrade_rails
...
Conflicts:
Gemfile
Gemfile.lock
app/models/group.rb
app/views/layouts/application.html.haml
db/schema.rb
public/stylesheets/git/style.css
2012-02-14 02:14:03 +02:00
99c314fb11
[issue #133 ] Merge branch 'master' into 133-editing_from_web
...
Conflicts:
db/schema.rb
2012-02-13 21:48:40 +04:00
1356ffa437
[refs #178 ] Fix project create error with group owner
2012-02-13 14:23:20 +04:00
9271c15a5f
[refs #123 ] Add new commits support
2012-02-10 21:33:05 +04:00
704c544cbc
Add more register_requests fields, change design. Apply invitation mail sending. Refactor. Refs #174
2012-02-10 18:33:16 +02:00
e535ca2b64
Fix validations. Refs #174
2012-02-10 01:33:06 +02:00
d0fe7f55d5
[issue #174 ] added static pages and some changes
2012-02-10 02:57:43 +04:00
edef21068d
[issue #174 ] Fixed bug with RegisterRequest
2012-02-10 01:44:47 +04:00
ce39cdd04f
[issue #174 ] A half of work to create invitations system
2012-02-09 21:46:23 +04:00
e23a02d357
[issue #133 ] Some fixes in Git::Repository#update_file
2012-02-09 04:03:40 +04:00
7223b7deb9
Upgrade rails, devise, delayed_jobs and other gems. Fix dependencies. Apply assets pipeline, add to deploy. Refactor and cleanup Gemfile. Fix after upgrade bugs. Redo commentable_id from string to decimal. Refactor and code cleanup. Apply basic new design. Refactor main template. Automate menus. Improve translations. Refs #96
2012-02-09 01:46:25 +02:00
d44a274c77
[issue #133 ] Fixed bug and added comments
2012-02-09 00:56:18 +04:00
74d401d087
[issue #133 ] Writed draft of web editing.
2012-02-08 21:51:30 +04:00
c47db56270
[refs #168 ] can read repos in the open platform
2012-02-07 19:55:45 +06:00
325667dde0
[refs #168 ] removed wrong ability
2012-02-07 17:31:00 +06:00
a1fcc62768
Merge pull request #167 from warpc/143-fix-destroy-group
...
[Fixs #143 ] Group dooes not destroy personal platfrom when deleting
2012-02-07 00:02:13 -08:00
36f609ec7d
[refs #143 ] fix destroy
2012-02-07 01:47:39 +06:00
96d3b35bdf
[refs #123 ] Merge master into 123-activity-feed
2012-02-06 19:46:32 +04:00
4e3d6b4056
Show xml-rpc error code in error message
2012-02-06 19:07:08 +04:00
c367fc818b
Merge branch 'master' of github.com:warpc/rosa-build
2012-02-06 19:05:50 +04:00
fde67a2c22
[refs #134 ] add post receive hook to repos
2012-02-06 15:31:22 +06:00
85c0d8b827
Change git branch for mass rebuild
2012-02-03 18:32:04 +04:00
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
0006bf3b63
Returned before_initialize to Group.
2012-02-02 01:20:10 +04:00
cb7a9fcc21
fix group autocomplete
2012-02-02 02:42:23 +06:00
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
d0717c8f9e
[issue #64 ] Merge branch 'master' into 64-project_wiki
...
Conflicts:
Gemfile.lock
db/schema.rb
2012-02-01 22:39:04 +04:00
0559f1b678
[refs #127 ] Filter request refactor
2012-02-01 20:00:19 +04:00
34b105675a
Add 1 more mime type to product
2012-01-31 23:29:25 +02:00
fde298cc85
Rollback to redhillonrails_core instead of schema_plus to avoid some bugs. Add platform reference to project_imports, change indexes and validators. Adjust sync algoritm to use platform_id. Improve rsync params. Refs #112 , #138
2012-01-31 20:48:37 +02:00
f15cb90b87
Merge branch 'master' into 114-comment_notifications
...
Conflicts:
config/locales/ru.yml
2012-01-31 21:42:37 +06:00
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
13780a1b53
Add magic encodings. Refs #95
2012-01-30 22:39:34 +02:00
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
5f40030e30
[issue #64 ] Fixed bug with cloning wiki repository
2012-01-30 18:17:00 +04:00
119c378149
[refs #114 ] change subsrcibe status to boolean
2012-01-30 17:59:57 +06:00
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
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
8962e85b2d
[refs #114 ] fix reverting
2012-01-30 12:38:31 +06:00
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
ea7cbe1908
Revert "[refs #114 ] fix emails uniqueness"
...
This reverts commit bc9649561f5b8ac58f9b27d31d66365f16d0cce0.
Conflicts:
app/models/subscribe.rb
app/models/user_email.rb
2012-01-30 12:15:33 +06:00
2e2e7e43d3
[refs #114 ] some refactoring
2012-01-30 02:18:14 +06:00
39a4479fa3
[refs #114 ] fix emails uniqueness
2012-01-29 22:27:46 +06:00
43a4aecc66
Change indexes to composite, unique, case insensitive. Redo sync logging. Verbose params for tasks. Refs #112
2012-01-28 04:05:31 +02:00
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
e966e523e9
Merge pull request #132 from warpc/112-sync_projects
...
Auto sync for mandriva repo
* Apply rsync for mandriva repo
* Parse and import changes from official repo
* Fix attachment types
* Redo srpm upload wrapper to use it without paperclip
* Add cron task through whenever
2012-01-27 08:46:58 -08:00
74f891fc83
Apply rsync for mandriva repo. Parse and import changes from official repo. Fix attachment types. Redo srpm upload wrapper to use it without paperclip. Add cron task through whenever. Refs #112
2012-01-27 17:35:18 +02:00
e01fe571b4
[refs #123 ] Add activity feed en translation fixes
2012-01-27 18:59:28 +04:00
a5d6889999
[refs #128 ] Add devise confirmable and reconfirmable options
2012-01-27 18:58:38 +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
45c175942b
Temporary change arch for mass rebuild
2012-01-27 05:00:44 +04:00
2d1e36fb1a
[issue #64 ] Changed own_projects validation.
2012-01-27 04:16:07 +04:00
ba84d5f216
[issue #64 ] Added validation of own_projects count.
2012-01-27 03:37:19 +04:00
1498e937f6
[issue #64 ] Added own_projects counters to User & Group
2012-01-27 02:33:18 +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
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
4cca8f7bb1
[refs #114 ] some refactoring
2012-01-25 23:33:26 +06:00
dd1493d677
[refs #123 ] Add activity feed page. Remove some unnessary code. Some logic fixes.
2012-01-25 17:05:39 +04:00
990a46018c
[refs #123 ] Add base logic for activity feed
2012-01-25 12:31:49 +04:00
60c1153d49
Save with validation. Refs #31
2012-01-24 23:29:23 +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
6df1640485
[refs #114 ] fix logics
2012-01-24 18:18:39 +06:00
7e1a26000e
Fix for "undefined method `<<' for nil:NilClass"
2012-01-24 01:12:42 +04:00
9127b6b689
[refs #114 ] changed logics
2012-01-24 01:42:54 +06:00
c3f415e90c
Add new build status for Item
2012-01-23 22:11:53 +04:00
e1a4dd5ab5
Fix branch name for mass rebuild
...
Fix error in include_repos
2012-01-23 21:07:09 +04:00
733adaf111
Update build_for for new requirements
2012-01-23 20:19:10 +04:00
651c5637ed
[refs #114 ] fix committer notification
2012-01-22 23:49:41 +06:00
f0d7ed0d89
[refs #114 ] fix notification for committer
2012-01-22 22:17:08 +06:00
ab081d3c46
[refs #114 ] only new comment notification
2012-01-22 22:15:25 +06:00
36a895385c
[refs #114 ] changed rules
2012-01-22 01:13:33 +06:00
21d422c313
[refs #114 ] refactoring subscribe
2012-01-21 19:32:22 +06:00
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
George Vinogradov
Alexander Machehin
konstantin.grabar
Vladimir Sharshov
Pavel Chipiga
Pasha
George Vinogradov