Skip to content
This repository has been archived by the owner on Mar 27, 2023. It is now read-only.

Commit

Permalink
Remove teaspoon, update sprockets
Browse files Browse the repository at this point in the history
  • Loading branch information
Vincent Martinez committed Mar 1, 2017
1 parent a772e7e commit f716628
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 21 deletions.
6 changes: 1 addition & 5 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,7 @@ gem 'airbrake', '~> 5.7.1'
gem 'envyable', require: 'envyable/rails-now'
gem 'webpack-rails'
gem 'bootstrap-sass', '~> 3.3.5'
# Sprockets 3 breaks Teaspoon.
# see https://github.com/modeset/teaspoon/issues/443
gem 'sprockets-rails', '< 3.0'
gem 'sprockets-rails'
gem 'compass-rails', '~> 3.0.2' # was using git master branch before
gem 'sass-rails', '~> 5.0.6'
gem 'uglifier', '>= 1.3.0'
Expand All @@ -80,8 +78,6 @@ group :development, :test do
gem 'factory_girl_rails'
gem 'faker'
gem 'vcr'
gem 'teaspoon'
gem 'teaspoon-mocha'
gem 'magic_lamp'
gem 'spring-commands-rspec'
end
Expand Down
26 changes: 10 additions & 16 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ GEM
cocaine (~> 0.5.5)
mime-types
mimemagic (~> 0.3.0)
parser (2.3.1.2)
parser (2.4.0.0)
ast (~> 2.2)
pg (0.18.4)
phony (2.15.40)
Expand Down Expand Up @@ -394,7 +394,7 @@ GEM
activesupport (= 4.2.8)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (2.1.0)
rainbow (2.2.1)
rake (11.3.0)
ransack (1.8.2)
actionpack (>= 3.0)
Expand Down Expand Up @@ -437,8 +437,8 @@ GEM
rspec-mocks (~> 3.4.0)
rspec-support (~> 3.4.0)
rspec-support (3.4.1)
rubocop (0.41.2)
parser (>= 2.3.1.1, < 3.0)
rubocop (0.47.1)
parser (>= 2.3.3.1, < 3.0)
powerpack (~> 0.1)
rainbow (>= 1.99.1, < 3.0)
ruby-progressbar (~> 1.7)
Expand Down Expand Up @@ -480,16 +480,12 @@ GEM
sprockets (3.7.1)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (2.3.3)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
sprockets-rails (3.2.0)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
summernote-rails (0.8.1.1)
railties (>= 3.1)
teaspoon (1.1.5)
railties (>= 3.2.5, < 6)
teaspoon-mocha (2.3.3)
teaspoon (>= 1.0.0)
temple (0.7.7)
term-ansicolor (1.4.0)
tins (~> 1.0)
Expand All @@ -507,7 +503,7 @@ GEM
thread_safe (~> 0.1)
uglifier (3.0.0)
execjs (>= 0.3.0, < 3)
unicode-display_width (1.1.0)
unicode-display_width (1.1.3)
unicode_utils (1.4.0)
vcr (3.0.3)
warden (1.2.6)
Expand Down Expand Up @@ -617,10 +613,8 @@ DEPENDENCIES
slim-rails (~> 3.1.1)
spring
spring-commands-rspec
sprockets-rails (< 3.0)
sprockets-rails
summernote-rails
teaspoon
teaspoon-mocha
terminal-notifier-guard
timecop
twilio-ruby
Expand Down

0 comments on commit f716628

Please sign in to comment.