Skip to content

Commit

Permalink
Merge branch 'pr/1352'
Browse files Browse the repository at this point in the history
  • Loading branch information
dwradcliffe committed Jul 1, 2016
2 parents 2a1cbc2 + ba21c7f commit f32321d
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,14 @@ gem 'elasticsearch-dsl', '~> 0.1.2'
gem 'xml-simple'
gem 'yajl-ruby', require: 'yajl'
gem 'compact_index', '~> 0.10.0'
gem 'sprockets-rails', '~> 3.1.0'

group :development, :test do
gem 'rubocop', require: false
gem 'toxiproxy', '~> 0.1.3'
end

group :development do
gem 'quiet_assets'
gem 'rails-erd'
end

Expand Down
8 changes: 3 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,6 @@ GEM
pkg-config (1.1.7)
powerpack (0.1.1)
psych (2.0.17)
quiet_assets (1.1.0)
railties (>= 3.1, < 5.0)
rack (1.6.4)
rack-test (0.6.3)
rack (>= 1.0)
Expand Down Expand Up @@ -252,10 +250,10 @@ GEM
shoulda-context (1.2.1)
shoulda-matchers (2.8.0)
activesupport (>= 3.0.0)
sprockets (3.6.0)
sprockets (3.6.3)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.0.4)
sprockets-rails (3.1.1)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
Expand Down Expand Up @@ -329,7 +327,6 @@ DEPENDENCIES
paul_revere (~> 2.0)
pg
psych (~> 2.0.12)
quiet_assets
rack
rack-test
rails (~> 4.2.6)
Expand All @@ -340,6 +337,7 @@ DEPENDENCIES
rubocop
shoryuken (~> 2.0.2)
shoulda
sprockets-rails (~> 3.1.0)
statsd-instrument (~> 2.0.6)
toxiproxy (~> 0.1.3)
uglifier (>= 1.0.3)
Expand Down
3 changes: 3 additions & 0 deletions config/environments/development.rb
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@
# Raises helpful error messages.
config.assets.raise_runtime_errors = true

# Do not log asset requests
config.assets.quiet = true

# Raises error for missing translations
# config.action_view.raise_on_missing_translations = true

Expand Down

0 comments on commit f32321d

Please sign in to comment.