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