Download as
Browse Code »

Commit 5f20abf1dc6e12411a4edbb640732b6ec3167868

Authored by Leandro Santos
1 parent b8bc9b1d
Exists in staging and in 4 other branches captcha_serpro_plugin, login-captcha, production, production-vendorized

mergin with master

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