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
|
0ef707fd98
|
Use errbit instead of rollbar
|
2013-11-21 21:59:29 +04:00 |
|
Vokhmin Alexey V
|
b2a1fe1533
|
#272: use Rollbar and logentries
|
2013-09-27 15:49:11 +04:00 |
|
Vokhmin Alexey V
|
e055d0080b
|
#29: removed hack for encoding
|
2013-03-18 15:36:16 +04:00 |
|
Vokhmin Alexey V
|
a1afa82898
|
#906: refactoring of keys structure
|
2013-03-04 15:07:18 +04:00 |
|
Vokhmin Alexey V
|
5b436ee8d1
|
#906: add airbrake.rb
|
2013-03-04 15:01:10 +04:00 |