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
|
08d51391e7
|
Updated puma && newrelic_rpm gems
|
2013-12-10 00:15:59 +04:00 |
|
Vokhmin Alexey V
|
e055d0080b
|
#29: removed hack for encoding
|
2013-03-18 15:36:16 +04:00 |
Pavel Chipiga
|
13780a1b53
|
Add magic encodings. Refs #95
|
2012-01-30 22:39:34 +02:00 |
Alexey Nayden
|
eae3c46912
|
Initial commit
|
2011-03-09 16:13:36 +03:00 |