diff --git a/Gemfile.lock b/Gemfile.lock index ddebf92..e896ae5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,7 +8,6 @@ GIT GEM remote: https://rubygems.org/ - remote: https://rubygems.org/ specs: RedCloth (4.2.9) actionmailer (3.2.22) @@ -40,7 +39,6 @@ GEM multi_json (~> 1.0) acts-as-taggable-on (3.4.4) activerecord (>= 3.2, < 5) - ambry (0.3.1) api-pagination (4.1.1) arel (3.0.3) axiom-types (0.1.1) @@ -123,8 +121,6 @@ GEM mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) - merit (2.3.2) - ambry (~> 0.3.0) metaclass (0.0.4) mime-types (1.25.1) mini_portile (0.6.2) @@ -196,7 +192,7 @@ GEM ruby-feedparser (0.9.3) magic rubyzip (1.1.7) - sass (3.4.19) + sass (3.1.21) sass-rails (3.2.6) railties (~> 3.2.0) sass (>= 3.1.10) @@ -269,7 +265,6 @@ DEPENDENCIES kramdown liquid (~> 3.0.3) locale (~> 2.0.5) - merit (~> 2.3.1) minitest (~> 3.2.0) mocha (~> 1.1.0) nokogiri (~> 1.6.0) @@ -285,6 +280,7 @@ DEPENDENCIES rspec-rails (~> 2.14.1) ruby-feedparser (~> 0.7) rubyzip + sass (~> 3.1.19) sass-rails selenium-webdriver (~> 2.47.0) swagger-ui_rails -- libgit2 0.21.2