Vokhmin Alexey V
|
90f6bca72d
|
Merge branch 'master' into 369-bootstrap
Conflicts:
Gemfile.lock
app/models/concerns/feed/git.rb
app/models/issue.rb
|
2014-11-08 01:09:32 +03:00 |
|
Vokhmin Alexey V
|
fd214e656b
|
#435: display statistics by commits
|
2014-10-17 23:14:42 +04:00 |
Alexander Machehin
|
2b9434f346
|
Merge branch 'master' into 369-bootstrap
Conflicts:
Gemfile
Gemfile.lock
app/assets/javascripts/angular-new/models/build_list.js.erb
app/assets/javascripts/extra/build_list.js
app/controllers/projects/build_lists_controller.rb
app/controllers/projects/projects_controller.rb
app/models/platform.rb
app/views/projects/base/_layout.html.haml
app/views/projects/build_lists/_new_form.html.haml
app/views/projects/build_lists/show.html.haml
app/views/projects/git/base/_fork.html.haml
app/views/projects/git/commits/_commits.html.haml
config/locales/en.yml
config/locales/ru.yml
|
2014-10-16 16:41:29 +06:00 |
|
Vokhmin Alexey V
|
32c03780ba
|
Fixed: undefined method project for "AR:Issue:":String
|
2014-06-18 22:32:17 +04:00 |
|
Alexander Machehin
|
91dc74e73f
|
[#369] add missing templates; fix activity feed; add truncation to activity text
|
2014-05-06 18:58:10 +06:00 |
|
Alexander Machehin
|
1aceaff1b8
|
fix wiki creating notification
|
2014-04-17 17:25:02 +06:00 |
|
Alexander Machehin
|
1a1838a363
|
[#369] add templates; add codemirror
|
2014-04-11 14:57:00 +06:00 |
|
Alexander Machehin
|
5cf413139d
|
[#369] increase truncate length activity commit messages
|
2014-04-08 19:08:22 +06:00 |
|
Alexander Machehin
|
3ad56a80ff
|
[#369] fix error with truncate method
|
2014-04-08 19:04:25 +06:00 |
|
Alexander Machehin
|
cb45fe6aed
|
[#369] truncate activity comment body
|
2014-04-08 18:59:59 +06:00 |
|
Alexander Machehin
|
54ce497e61
|
[#369] truncate activity commit messages
|
2014-04-08 18:59:16 +06:00 |
|
Vokhmin Alexey V
|
4087f4c94a
|
#345: rollback changes
|
2014-03-27 01:12:56 +04:00 |
|
Vokhmin Alexey V
|
a15353e460
|
#345: fixed: usage of name_with_owner
|
2014-03-27 00:02:28 +04:00 |
|
Vokhmin Alexey V
|
4d7809ec14
|
#345: rollback changes, added test_after_commit gem
|
2014-03-20 02:35:59 +04:00 |
|
Vokhmin Alexey V
|
50a301d2fa
|
#345: updated comments_controller_spec
|
2014-03-19 03:00:29 +04:00 |
|
Alexander Machehin
|
2ee3ea93bd
|
[#345] remove deprecated dynamic finder methods
|
2014-03-18 19:58:51 +06:00 |
|
Vokhmin Alexey V
|
c672aaa0ec
|
#345: fixed some specs, etc
|
2014-03-18 00:18:46 +04:00 |
|
Alexander Machehin
|
f05f0e1d72
|
[#345] fix activity concern
|
2014-03-11 19:44:30 +06:00 |
|
Alexander Machehin
|
ef63ddcaac
|
[#345] fix mistypes
|
2014-03-11 17:47:03 +06:00 |
|
Alexander Machehin
|
0a7d5d22da
|
[#345] move lib/modules/models to app/models/concerns; small refactoring
|
2014-03-11 14:58:36 +06:00 |
|
Alexander Machehin
|
a5f56bb835
|
[#345] remove observers; use new labmda syntax
|
2014-03-11 14:28:17 +06:00 |