Merge branch 'ruby-2.1.3'

.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 2.1.1
+  - 2.1.3
 bundler_args: --without development
 env:
   - SPEC_GROUP=controllers

Gemfile

@@ -91,8 +91,6 @@ gem 'codemirror-rails', '~> 4.5'
 group :production do
   gem "airbrake", '~> 3.1'
   #gem 'bluepill', '~> 0.0.60', require: false
-  # gem 'le'
-  gem 'logglier'
   gem 'puma'
 end
 

Gemfile.lock

@@ -228,7 +228,6 @@ GEM
       rack
       rest-client
       ya2yaml
-    logglier (0.2.11)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
@@ -549,7 +548,6 @@ DEPENDENCIES
   jquery-rails (~> 2.3)
   js-routes
   localeapp
-  logglier
   mailcatcher
   meta-tags (~> 2.0)
   meta_request

config/application.yml.sample

@@ -16,7 +16,6 @@ common: &common
     key_pair_secret_key: 'key_pair_secret_key'
     node_instruction_secret_key: 'node_instruction_secret_key'
     airbrake_api_key: 'airbrake_api_key'
-    logentries_key: 'logentries_key'
     secret_token: 'secret_token'
     secret_key_base: 'secret_key_base'
     devise:

config/initializers/logentries.rb

@@ -1,8 +0,0 @@
-# require 'le'
-
-# key = APP_CONFIG['keys']['logentries_key']
-# if Rails.env.development?
-#   Rails.logger = Le.new key, debug: true
-# else
-#   Rails.logger = Le.new key
-# end

config/initializers/logglier.rb

@@ -1,5 +0,0 @@
-# require 'logglier'
-
-# if Rails.env.production?
-#   Rails.logger = Logglier.new("https://logs-01.loggly.com/inputs/#{APP_CONFIG['keys']['logglier_key']}/tag/ruby/", threaded: true)
-# end