Alexander Machehin
|
eb8326bf30
|
[#345] fix SystemStackError: stack level too deep
|
2014-03-21 15:38:40 +06:00 |
Alexander Machehin
|
f99211da9a
|
[#345] remove deprecations with association conditions
|
2014-03-11 18:40:02 +06:00 |
Alexander Machehin
|
ef63ddcaac
|
[#345] fix mistypes
|
2014-03-11 17:47:03 +06:00 |
Alexander Machehin
|
a5f56bb835
|
[#345] remove observers; use new labmda syntax
|
2014-03-11 14:28:17 +06:00 |
Alexander Machehin
|
0e39aae1bf
|
[#343] use new ruby hash syntax
|
2014-01-21 10:51:49 +06:00 |
Alexander Machehin
|
0cb585ef71
|
Merge branch 'master' into 29-migrate-to-ruby-2.1
Conflicts:
Gemfile
Gemfile.lock
app/controllers/activity_feeds_controller.rb
app/models/activity_feed_observer.rb
config/environments/development.rb
config/initializers/a_app_config.rb
config/initializers/airbrake.rb
lib/modules/models/git.rb
spec/controllers/activity_feeds_controller_spec.rb
spec/helpers/activity_feeds_helper_spec.rb
|
2014-01-10 08:31:31 +06:00 |
Vokhmin Alexey V
|
eeed2a49b7
|
#200: moved observer of Issue to lib
|
2013-06-27 17:06:42 +04:00 |
Alexander Machehin
|
94d7865f14
|
[#19] remove unneeded code
|
2013-04-10 02:21:02 +06:00 |
Vokhmin Alexey V
|
9e7eb7af94
|
#29: merge master into branch
|
2013-04-03 16:10:22 +04:00 |
Alexander Machehin
|
1812857d1e
|
[#19] fix issue & pull request links'
|
2013-03-30 00:06:48 +06:00 |
Vokhmin Alexey V
|
f8fb48a85b
|
#26: remove unnecessary stiles, JS, update PullRequests controller
|
2013-03-19 16:11:02 +04:00 |
Vokhmin Alexey V
|
e055d0080b
|
#29: removed hack for encoding
|
2013-03-18 15:36:16 +04:00 |
Vokhmin Alexey V
|
b8b238e876
|
#977: add "table_name" into all scopes
|
2013-02-28 19:27:50 +04:00 |
Alexander Machehin
|
519886fecd
|
[refs #777] fix for group owned project
|
2012-12-14 00:18:22 +06:00 |
Vokhmin Alexey V
|
5f0e683711
|
#90: moved code
|
2012-09-26 19:41:00 +04:00 |
Vokhmin Alexey V
|
efe8b1ffdb
|
#90: small refactoring
|
2012-09-26 18:20:46 +04:00 |
Vokhmin Alexey V
|
07b27b934f
|
#90: updated #index page for pull-requests
|
2012-09-26 15:46:23 +04:00 |
Alexander Machehin
|
a7f926bbdf
|
[refs #90] forgot dependent destroy
|
2012-08-08 00:07:26 +06:00 |
Alexander Machehin
|
ae4c8a6a5e
|
[refs #90] fixed lost data after merge
|
2012-06-28 16:44:55 +06:00 |
Alexander Machehin
|
682f33a9bf
|
[refs #90] view merged status
|
2012-06-13 23:52:11 +06:00 |
Alexander Machehin
|
4b8def5bd0
|
[refs #90] add pulls to tracker
|
2012-06-04 23:00:19 +06:00 |
Alexander Machehin
|
60aba754ae
|
[refs #90] pull title/body update
|
2012-05-31 22:57:52 +06:00 |
Alexander Machehin
|
11c67fb07d
|
Revert "[refs #90] issue status -> state" & changed state -> status
This reverts commit 7470ee76e4783a0fbbd98607406d7b770a2980d1.
Conflicts:
app/controllers/projects/issues_controller.rb
db/migrate/20120412173938_create_pull_requests.rb
db/schema.rb
|
2012-05-29 16:50:25 +06:00 |
Alexander Machehin
|
36b4ce2d99
|
Merge branch 'master' into 90-pull
Conflicts:
Gemfile
Gemfile.lock
app/controllers/projects/issues_controller.rb
app/models/project.rb
config/locales/menu.en.yml
config/routes.rb
db/schema.rb
|
2012-05-03 23:19:43 +06: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 |
Pavel Chipiga
|
b957600eda
|
Merge branch 'master' into 263-refactoring
Conflicts:
app/models/project.rb
app/views/projects/_repo_block.html.haml
db/schema.rb
spec/controllers/issues_controller_spec.rb
spec/controllers/projects_controller_spec.rb
|
2012-05-01 15:54:13 +03: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
|
628fed40ea
|
[refs #90] issue status -> state
|
2012-04-23 23:34:11 +06:00 |
Alexander Machehin
|
58776a6e9e
|
[refs #90] fixing pull methods
|
2012-04-23 23:34:10 +06:00 |
Pavel Chipiga
|
701da7e1f9
|
Disable bluepill. Update gems. Github project style URLs. Fix project load. Fix abilities. Fic urls generation. Fix some specs. Refs #263
|
2012-04-19 22:45:50 +03:00 |
Alexander Machehin
|
2dedbd92d0
|
[refs #194] assignee & user
|
2012-04-14 01:44:04 +06:00 |
Vladimir Sharshov
|
dc6e380647
|
Merge pull request #296 from warpc/194-issue_page
[refs #194] fixed remove executor from issue
|
2012-03-14 04:18:29 -07:00 |
Alexander Machehin
|
4b8e9682b5
|
[refs #194] some refactor
|
2012-03-14 16:53:23 +06:00 |
Alexander Machehin
|
5ffd976086
|
[refs #194] fixed remove executor from issue
|
2012-03-14 16:39:59 +06:00 |
Alexander Machehin
|
5b932879e2
|
[refs #265] fixed subscribe dublicates
|
2012-03-13 19:56:58 +06:00 |
Alexander Machehin
|
b9de81f4df
|
[refs #194] managing labels in the issue
|
2012-03-06 21:21:13 +06:00 |
Alexander Machehin
|
9e6d06f1c9
|
[refs #194] manage issue executer
|
2012-03-06 00:28:55 +06:00 |
Pavel Chipiga
|
a831a4aa63
|
Merge branch '3.2-master' of github.com:warpc/rosa-build into 3.2-master
|
2012-03-03 01:43:14 +02:00 |
Pavel Chipiga
|
56a12dc9ea
|
Merge branch 'master' into 3.2-master
Conflicts:
app/models/comment.rb
app/models/issue.rb
config/locales/en.yml
|
2012-03-03 01:38:43 +02:00 |
Alexander Machehin
|
7cd3e40efc
|
[refs #194] fix accessible list
|
2012-03-03 01:23:45 +06:00 |
Alexander Machehin
|
0abea8ff55
|
[refs #194] fix issues count
|
2012-02-28 20:28:11 +06:00 |
Alexander Machehin
|
0d75a37451
|
[refs #194] show page beta version
|
2012-02-28 20:05:18 +06:00 |
Alexander Machehin
|
27c85d32df
|
[refs #194] create page; index pagination; some bugs
|
2012-02-27 22:10:12 +06:00 |
Alexander Machehin
|
ecb29d1762
|
[refs #194] tags -> labels
|
2012-02-22 02:28:04 +06:00 |
Alexander Machehin
|
0ce76207af
|
[refs #194] Add issue tags
|
2012-02-21 00:41:40 +06:00 |
Alexander Machehin
|
76beb6a277
|
[refs #194] add creator to issue
|
2012-02-19 23:28:43 +06:00 |
konstantin.grabar
|
08ffd8c25d
|
[refs #123] Add wiki to ActivityFeed
|
2012-02-14 20:09:41 +04:00 |
Pavel Chipiga
|
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 |
konstantin.grabar
|
96d3b35bdf
|
[refs #123] Merge master into 123-activity-feed
|
2012-02-06 19:46:32 +04:00 |
Alexander Machehin
|
f15cb90b87
|
Merge branch 'master' into 114-comment_notifications
Conflicts:
config/locales/ru.yml
|
2012-01-31 21:42:37 +06:00 |