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
4ba268dd67
Merge pull request #109 from warpc/18-commit_comments
...
18 commit comments
2012-01-18 05:49:57 -08:00
f8be867aaf
Replace annotated tags to lightweight. Improve specs. Restore lost migrations. Refs #103
2012-01-17 19:37:41 +02:00
62d0419bdd
Merge pull request #106 from warpc/103-bl_publish_new_params
...
Сохранение сборочного коммита, добавление неподписанного тега на сохраненный коммит после публикации
2012-01-17 04:34:15 -08:00
b5170e2f2a
Write specs for tag based build. Refs #103
2012-01-17 14:25:54 +02:00
bf4e4f02ed
Right merge branch 'master' into 18-commit_comments
...
Conflicts:
app/controllers/comments_controller.rb
app/views/comments/edit.html.haml
app/views/issues/show.html.haml
db/schema.rb
2012-01-17 15:52:46 +06:00
ee58a8e789
[refs #54 ] Fix comments failed specs
2012-01-17 12:20:06 +04:00
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
68744b1676
Fix broken tests in #94 from pull request #92
2012-01-17 01:07:48 +04:00
69debdd83e
fix tests for shared elements
2012-01-16 19:43:23 +06:00
52696791f2
[refs #54 , #94 ] Merge master into issues
2012-01-16 13:42:44 +04:00
674d5f8e56
[refs #18 ] model tests
2012-01-14 18:36:00 +06: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
794c55a030
Merge branch 'master' of github.com:warpc/rosa-build into 18-commit_comments
2012-01-13 22:01:30 +06:00
2b1fe79adc
[refs #18 ] controller tests
2012-01-13 22:00:28 +06: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
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
a44530980e
[refs #54 ] Remove some unnessacary comments
2011-12-30 18:44: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
402133aff6
[refs #54 ] Add some subscribe specs and factory
2011-12-29 21:03:53 +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
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
Alexander Machehin
Pasha
Pavel Chipiga
santaux
Vladimir Sharshov