Download as
Browse Code »

Commit 7d020790a08bf9affc2117c478e89a00eecac92d

Authored by Eduardo Silva
2 parents 71214863 f6c1bea6
Exists in colab and in 4 other branches master, spb-master, spb-stable, stable

Merge pull request #285 from mezuro/gem_updates 

Gem updates
Showing 2 changed files with 32 additions and 26 deletions   Show diff stats
Gemfile
  Diff comments   View file @7d02079
... ... @@ -123,16 +123,17 @@ group :development, :test do
123 123  
124 124 # Use sqlite3 as the database for Active Record
125 125 gem 'sqlite3'
  126 +
  127 + # Automatized gem update
  128 + gem 'gisdatigo'
126 129 end
127 130  
128 131 # Acceptance tests
129 132 group :cucumber do
130 133 gem 'cucumber-rails', '~> 1.4.0'
131 134 # cleans the database
132   - # Version must be grater than 1.4.1. See:
133   - # https://github.com/DatabaseCleaner/database_cleaner/issues/317
134   - gem 'database_cleaner', '~> 1.4.1'
135   - gem 'poltergeist', '~> 1.6.0'
  135 + gem 'database_cleaner', '~> 1.5.0'
  136 + gem 'poltergeist', '~> 1.7.0'
136 137 end
137 138  
138 139  
... ...
Gemfile.lock
  Diff comments   View file @7d02079
... ... @@ -68,7 +68,7 @@ GEM
68 68 chart-js-rails (0.0.9)
69 69 railties (> 3.1)
70 70 cliver (0.3.2)
71   - codeclimate-test-reporter (0.4.7)
  71 + codeclimate-test-reporter (0.4.8)
72 72 simplecov (>= 0.7.1, < 1.0.0)
73 73 coderay (1.1.0)
74 74 coffee-rails (4.1.0)
... ... @@ -95,7 +95,7 @@ GEM
95 95 rails (>= 3, < 5)
96 96 daemons (1.2.3)
97 97 dalli (2.7.4)
98   - database_cleaner (1.4.1)
  98 + database_cleaner (1.5.0)
99 99 debug_inspector (0.0.2)
100 100 devise (3.5.2)
101 101 bcrypt (~> 3.0)
... ... @@ -125,6 +125,10 @@ GEM
125 125 faraday (>= 0.7.4, < 0.10)
126 126 gherkin (2.12.2)
127 127 multi_json (~> 1.3)
  128 + gisdatigo (0.0.1)
  129 + git (~> 1.2.9.1)
  130 + rails (~> 4.2.0)
  131 + git (1.2.9.1)
128 132 globalid (0.3.6)
129 133 activesupport (>= 4.1.0)
130 134 google-analytics-rails (0.0.6)
... ... @@ -135,23 +139,23 @@ GEM
135 139 i18n_generators (2.0.0)
136 140 mechanize
137 141 rails (>= 3.0.0)
138   - jbuilder (2.3.1)
  142 + jbuilder (2.3.2)
139 143 activesupport (>= 3.0.0, < 5)
140 144 multi_json (~> 1.2)
141   - jquery-rails (4.0.4)
  145 + jquery-rails (4.0.5)
142 146 rails-dom-testing (~> 1.0)
143 147 railties (>= 4.2.0)
144 148 thor (>= 0.14, < 2.0)
145 149 jquery-ui-rails (5.0.5)
146 150 railties (>= 3.2.16)
147   - js-routes (1.1.0)
  151 + js-routes (1.1.2)
148 152 railties (>= 3.2)
149 153 sprockets-rails
150 154 json (1.8.3)
151 155 kalibro_client (1.4.1)
152 156 activesupport (>= 2.2.1)
153 157 faraday_middleware (~> 0.10.0)
154   - konacha (3.5.1)
  158 + konacha (3.7.0)
155 159 actionpack (>= 3.1, < 5)
156 160 capybara
157 161 colorize
... ... @@ -180,9 +184,9 @@ GEM
180 184 ntlm-http (~> 0.1, >= 0.1.1)
181 185 webrobots (>= 0.0.9, < 0.2)
182 186 metaclass (0.0.4)
183   - mime-types (2.6.1)
  187 + mime-types (2.6.2)
184 188 mini_portile (0.6.2)
185   - minitest (5.8.0)
  189 + minitest (5.8.1)
186 190 mocha (1.1.0)
187 191 metaclass (~> 0.0.1)
188 192 multi_json (1.11.2)
... ... @@ -192,13 +196,13 @@ GEM
192 196 net-http-persistent (2.9.4)
193 197 net-scp (1.2.1)
194 198 net-ssh (>= 2.6.5)
195   - net-ssh (2.9.2)
  199 + net-ssh (3.0.1)
196 200 nokogiri (1.6.6.2)
197 201 mini_portile (~> 0.6.0)
198 202 ntlm-http (0.1.1)
199 203 orm_adapter (0.5.0)
200   - pg (0.18.2)
201   - poltergeist (1.6.0)
  204 + pg (0.18.3)
  205 + poltergeist (1.7.0)
202 206 capybara (~> 2.1)
203 207 cliver (~> 0.3.1)
204 208 multi_json (~> 1.0)
... ... @@ -256,12 +260,12 @@ GEM
256 260 rspec-support (~> 3.3.0)
257 261 rspec-support (3.3.0)
258 262 sass (3.4.18)
259   - sass-rails (5.0.3)
  263 + sass-rails (5.0.4)
260 264 railties (>= 4.0.0, < 5.0)
261 265 sass (~> 3.1)
262 266 sprockets (>= 2.8, < 4.0)
263 267 sprockets-rails (>= 2.0, < 4.0)
264   - tilt (~> 1.1)
  268 + tilt (>= 1.1, < 3)
265 269 sdoc (0.4.1)
266 270 json (~> 1.7, >= 1.7.7)
267 271 rdoc (~> 4.0)
... ... @@ -274,10 +278,10 @@ GEM
274 278 simplecov-html (0.10.0)
275 279 sinon-rails (1.15.0)
276 280 railties (>= 3.1)
277   - spring (1.3.6)
278   - sprockets (3.3.3)
279   - rack (~> 1.0)
280   - sprockets-rails (2.3.2)
  281 + spring (1.4.0)
  282 + sprockets (3.3.5)
  283 + rack (> 1, < 3)
  284 + sprockets-rails (2.3.3)
281 285 actionpack (>= 3.0)
282 286 activesupport (>= 3.0)
283 287 sprockets (>= 2.8, < 4.0)
... ... @@ -289,13 +293,13 @@ GEM
289 293 therubyracer (0.12.2)
290 294 libv8 (~> 3.16.14.0)
291 295 ref
292   - thin (1.6.3)
  296 + thin (1.6.4)
293 297 daemons (~> 1.0, >= 1.0.9)
294   - eventmachine (~> 1.0)
  298 + eventmachine (~> 1.0, >= 1.0.4)
295 299 rack (~> 1.0)
296 300 thor (0.19.1)
297 301 thread_safe (0.3.5)
298   - tilt (1.4.1)
  302 + tilt (2.0.1)
299 303 turbolinks (2.5.3)
300 304 coffee-rails
301 305 tzinfo (1.2.2)
... ... @@ -337,10 +341,11 @@ DEPENDENCIES
337 341 colorpicker (~> 0.0.5)
338 342 cucumber-rails (~> 1.4.0)
339 343 dalli (~> 2.7.0)
340   - database_cleaner (~> 1.4.1)
  344 + database_cleaner (~> 1.5.0)
341 345 devise (~> 3.5.1)
342 346 exception_notification (~> 4.1.1)
343 347 factory_girl_rails (~> 4.5.0)
  348 + gisdatigo
344 349 google-analytics-rails (~> 0.0.6)
345 350 http_accept_language
346 351 i18n_generators
... ... @@ -353,7 +358,7 @@ DEPENDENCIES
353 358 less-rails (~> 2.7.0)
354 359 mocha
355 360 pg (~> 0.18.1)
356   - poltergeist (~> 1.6.0)
  361 + poltergeist (~> 1.7.0)
357 362 rails (= 4.2.4)
358 363 rails-html-sanitizer (~> 1.0)
359 364 railsstrap (~> 3.3.4)
... ...