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
06ab99a1d0
[refs #114 ] add js
2012-01-27 18:20:07 +06:00
e71a9e84cb
[refs #114 ] emails control
2012-01-27 02:11:07 +06: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
61be317b21
[refs #114 ] i18n
2012-01-25 01:00:51 +06:00
6582a9afa5
[refs #114 ] fix tests
2012-01-24 18:15:56 +06:00
651c5637ed
[refs #114 ] fix committer notification
2012-01-22 23:49:41 +06:00
36a895385c
[refs #114 ] changed rules
2012-01-22 01:13:33 +06:00
d8df6c6279
[refs #114 ] committer subscribe + some tests
2012-01-21 00:22:25 +06:00
3a00a66b86
[refs #114 ] polish controller tests
2012-01-20 22:48:21 +06:00
371abac031
[refs #114 ] fix controller tests
2012-01-20 21:17:05 +06:00
876351edb5
[refs #114 ] Fixed tests
2012-01-20 12:27:13 +06:00
800b02f544
[refs #18 ] Add project subsribe, tests
2012-01-20 00:20:03 +06:00
dba11f4662
[refs #114 ] FIXME subscribers
2012-01-19 01:12:52 +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
ee58a8e789
[refs #54 ] Fix comments failed specs
2012-01-17 12:20:06 +04:00
69debdd83e
fix tests for shared elements
2012-01-16 19:43:23 +06:00
674d5f8e56
[refs #18 ] model tests
2012-01-14 18:36:00 +06:00
2b8aca5f09
[refs #54 ] Add settings notifier
2012-01-11 17:58:13 +04:00
dda40d9e9d
[refs #54 ] Mailer specs for comments and issues
2012-01-11 11:12:23 +04:00
60a7f3e87f
[refs #54 ] Fix comments specs
2012-01-10 15:24:43 +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
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
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
3b300f2ca4
[issue #79 ] Removed comments
2011-12-23 21:17:02 +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
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
d20d43eb2b
[refs #54 ] Base logic and templates for issues and comments to them
2011-12-19 19:30:14 +04:00
4d42fb67e1
Fix collaborators controller broken tests
...
Fix members controller broken tests
Add platforms controllers test
Fix mistake in cancan model test
2011-12-15 00:49:33 +04:00
2c88c76876
[refs #8 ] Refactore some shared examples. Stubed rsync and sudo calls. Fix some specs.
2011-12-12 11:51:39 +04:00
3e41e6fb42
Issue #4 fixed duplication of Relations when creating personal
...
repository
2011-12-08 18:03:56 +04:00
02a813a474
Upgrade rails, devise and other gems. Refactor controllers. Fix application.yml config - remove unused keys and setup correct values for tests. Add product build lists status_build callback auth. Allow platform and project unixname uppercase. Write tests and fix bugs for ProductBuildList controller. Fix all unresolved test problems. Refs #2262
2011-11-26 02:54:40 +02:00
796ff75857
Great models refactoring. Refactor some cancan abilities and controllers authorization. Move some common parts to modules. Fix lots bugs. Remove unused files and code. Drop ACL tables. Add more can? helpers. Refs #2249
2011-11-24 23:48:58 +02:00
97e4a7d26d
[refs #2249 ] Finished CanCan models tests. Add new factories
2011-11-23 22:12:55 +04:00
fc3c6a05c9
[refs #2249 ] CanCan tests
2011-11-22 23:21:31 +04:00
140eaf6265
[refs #2249 ] Remove old roles managment system
2011-11-21 21:43:37 +04: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
30564e8e17
[refs #2161 ] Add auto build lists functional
2011-10-29 23:09:50 +04:00
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
Alexander Machehin
konstantin.grabar
Pavel Chipiga
George Vinogradov
Vladimir Sharshov