Alexander Machehin
|
944c6fc0e2
|
Merge branch 'master' into 90-pull
Conflicts:
app/assets/stylesheets/design/custom.scss
app/controllers/projects/git/commits_controller.rb
app/helpers/git_helper.rb
app/models/project.rb
app/views/projects/git/commits/_commit_diff.html.haml
db/schema.rb
lib/ext/core/string.rb
|
2012-07-27 18:37:25 +06:00 |
Pavel Chipiga
|
611b22baa5
|
Update gems, fix conflicts. Raise 404 error instead of redirect. Refactor git controllers. Refactor git methods, move to modules. Cleanup git helpers, refactor and remove unused variables from views, refactor git templates. Refactor project load. Refactor git routes and links, refactor constraints. Fix branches with slashes and dots. Apply github linguist and libmagic for binary file detection. Other refactor and code cleanup. Fix specs and deprecations. Refs #263
|
2012-07-17 11:02:56 +03:00 |
Alexander Machehin
|
fcffff4178
|
Merge branch 'master' into 90-pull
Conflicts:
app/assets/stylesheets/design/custom.scss
config/locales/title.en.yml
config/locales/title.ru.yml
config/routes.rb
db/schema.rb
|
2012-05-17 22:58:29 +06:00 |
konstantin.grabar
|
da70a11aab
|
[refs #438] Repair arch factory and rename rsync stub method
|
2012-05-16 19:29:28 +04:00 |
Alexander Machehin
|
9e5db741d3
|
Merge branch 'master' into 90-pull
Conflicts:
app/models/project.rb
db/schema.rb
|
2012-05-02 23:08:24 +06:00 |
George Vinogradov
|
de093d7065
|
[issue #425] Changed object to actor in Relation and to eventable in
EventLog
|
2012-04-26 05:38:33 +04:00 |
Alexander Machehin
|
fda1a847f5
|
[refs #90] some tests and questions
|
2012-04-23 23:34:10 +06:00 |
Pavel Chipiga
|
20e5936d0c
|
Fix and refactor build lists, comments and other specs. Refactor comments controller, models and views. Code cleanup. Refs #263
|
2012-04-05 00:43:06 +03:00 |
Pavel Chipiga
|
583918fa68
|
Upgrade gems. Upgrade FactoryGirl syntax. Move code out from vendor/plugins, redo plugins structure. Fix all deprecations. Great refactor for lib and initializers folders. Add magic encodings. Code cleanup. Fix some specs. Refs #263
|
2012-03-29 23:34:22 +03:00 |
Alexander Machehin
|
a0b7f243d6
|
[refs #263] changed and fixed comment tests; some refactoring
|
2012-03-27 21:09:04 +06:00 |
konstantin.grabar
|
16c9e6aa24
|
[refs #263] Fix most of the failed tests
|
2012-03-22 19:48:28 +04:00 |
Pavel Chipiga
|
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 |
Pavel Chipiga
|
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 |
Alexander Machehin
|
da0d791f74
|
[refs #96] fixed commentable & subscribeable ids
|
2012-02-15 02:28:01 +06:00 |
Alexander Machehin
|
aa9652409c
|
[refs #114] clean
|
2012-02-01 01:15:53 +06:00 |
Alexander Machehin
|
f15cb90b87
|
Merge branch 'master' into 114-comment_notifications
Conflicts:
config/locales/ru.yml
|
2012-01-31 21:42:37 +06:00 |
Pavel Chipiga
|
13780a1b53
|
Add magic encodings. Refs #95
|
2012-01-30 22:39:34 +02:00 |
Alexander Machehin
|
119c378149
|
[refs #114] change subsrcibe status to boolean
|
2012-01-30 17:59:57 +06:00 |
Alexander Machehin
|
8962e85b2d
|
[refs #114] fix reverting
|
2012-01-30 12:38:31 +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
|
2e2e7e43d3
|
[refs #114] some refactoring
|
2012-01-30 02:18:14 +06:00 |
Alexander Machehin
|
e71a9e84cb
|
[refs #114] emails control
|
2012-01-27 02:11:07 +06:00 |
Alexander Machehin
|
4cca8f7bb1
|
[refs #114] some refactoring
|
2012-01-25 23:33:26 +06:00 |
Alexander Machehin
|
61be317b21
|
[refs #114] i18n
|
2012-01-25 01:00:51 +06:00 |
Alexander Machehin
|
6582a9afa5
|
[refs #114] fix tests
|
2012-01-24 18:15:56 +06:00 |
Alexander Machehin
|
651c5637ed
|
[refs #114] fix committer notification
|
2012-01-22 23:49:41 +06:00 |
Alexander Machehin
|
36a895385c
|
[refs #114] changed rules
|
2012-01-22 01:13:33 +06:00 |
Alexander Machehin
|
d8df6c6279
|
[refs #114] committer subscribe + some tests
|
2012-01-21 00:22:25 +06:00 |
Alexander Machehin
|
3a00a66b86
|
[refs #114] polish controller tests
|
2012-01-20 22:48:21 +06:00 |
Alexander Machehin
|
371abac031
|
[refs #114] fix controller tests
|
2012-01-20 21:17:05 +06:00 |
Alexander Machehin
|
876351edb5
|
[refs #114] Fixed tests
|
2012-01-20 12:27:13 +06:00 |
Alexander Machehin
|
800b02f544
|
[refs #18] Add project subsribe, tests
|
2012-01-20 00:20:03 +06:00 |
Alexander Machehin
|
dba11f4662
|
[refs #114] FIXME subscribers
|
2012-01-19 01:12:52 +06:00 |
Alexander Machehin
|
69debdd83e
|
fix tests for shared elements
|
2012-01-16 19:43:23 +06:00 |
Alexander Machehin
|
674d5f8e56
|
[refs #18] model tests
|
2012-01-14 18:36:00 +06:00 |