Commit 5f20abf1dc6e12411a4edbb640732b6ec3167868
1 parent
b8bc9b1d
Exists in
staging
and in
4 other branches
mergin with master
Showing
1 changed file
with
2 additions
and
6 deletions
Show diff stats
Gemfile.lock
| @@ -8,7 +8,6 @@ GIT | @@ -8,7 +8,6 @@ GIT | ||
| 8 | 8 | ||
| 9 | GEM | 9 | GEM |
| 10 | remote: https://rubygems.org/ | 10 | remote: https://rubygems.org/ |
| 11 | - remote: https://rubygems.org/ | ||
| 12 | specs: | 11 | specs: |
| 13 | RedCloth (4.2.9) | 12 | RedCloth (4.2.9) |
| 14 | actionmailer (3.2.22) | 13 | actionmailer (3.2.22) |
| @@ -40,7 +39,6 @@ GEM | @@ -40,7 +39,6 @@ GEM | ||
| 40 | multi_json (~> 1.0) | 39 | multi_json (~> 1.0) |
| 41 | acts-as-taggable-on (3.4.4) | 40 | acts-as-taggable-on (3.4.4) |
| 42 | activerecord (>= 3.2, < 5) | 41 | activerecord (>= 3.2, < 5) |
| 43 | - ambry (0.3.1) | ||
| 44 | api-pagination (4.1.1) | 42 | api-pagination (4.1.1) |
| 45 | arel (3.0.3) | 43 | arel (3.0.3) |
| 46 | axiom-types (0.1.1) | 44 | axiom-types (0.1.1) |
| @@ -123,8 +121,6 @@ GEM | @@ -123,8 +121,6 @@ GEM | ||
| 123 | mail (2.5.4) | 121 | mail (2.5.4) |
| 124 | mime-types (~> 1.16) | 122 | mime-types (~> 1.16) |
| 125 | treetop (~> 1.4.8) | 123 | treetop (~> 1.4.8) |
| 126 | - merit (2.3.2) | ||
| 127 | - ambry (~> 0.3.0) | ||
| 128 | metaclass (0.0.4) | 124 | metaclass (0.0.4) |
| 129 | mime-types (1.25.1) | 125 | mime-types (1.25.1) |
| 130 | mini_portile (0.6.2) | 126 | mini_portile (0.6.2) |
| @@ -196,7 +192,7 @@ GEM | @@ -196,7 +192,7 @@ GEM | ||
| 196 | ruby-feedparser (0.9.3) | 192 | ruby-feedparser (0.9.3) |
| 197 | magic | 193 | magic |
| 198 | rubyzip (1.1.7) | 194 | rubyzip (1.1.7) |
| 199 | - sass (3.4.19) | 195 | + sass (3.1.21) |
| 200 | sass-rails (3.2.6) | 196 | sass-rails (3.2.6) |
| 201 | railties (~> 3.2.0) | 197 | railties (~> 3.2.0) |
| 202 | sass (>= 3.1.10) | 198 | sass (>= 3.1.10) |
| @@ -269,7 +265,6 @@ DEPENDENCIES | @@ -269,7 +265,6 @@ DEPENDENCIES | ||
| 269 | kramdown | 265 | kramdown |
| 270 | liquid (~> 3.0.3) | 266 | liquid (~> 3.0.3) |
| 271 | locale (~> 2.0.5) | 267 | locale (~> 2.0.5) |
| 272 | - merit (~> 2.3.1) | ||
| 273 | minitest (~> 3.2.0) | 268 | minitest (~> 3.2.0) |
| 274 | mocha (~> 1.1.0) | 269 | mocha (~> 1.1.0) |
| 275 | nokogiri (~> 1.6.0) | 270 | nokogiri (~> 1.6.0) |
| @@ -285,6 +280,7 @@ DEPENDENCIES | @@ -285,6 +280,7 @@ DEPENDENCIES | ||
| 285 | rspec-rails (~> 2.14.1) | 280 | rspec-rails (~> 2.14.1) |
| 286 | ruby-feedparser (~> 0.7) | 281 | ruby-feedparser (~> 0.7) |
| 287 | rubyzip | 282 | rubyzip |
| 283 | + sass (~> 3.1.19) | ||
| 288 | sass-rails | 284 | sass-rails |
| 289 | selenium-webdriver (~> 2.47.0) | 285 | selenium-webdriver (~> 2.47.0) |
| 290 | swagger-ui_rails | 286 | swagger-ui_rails |