Download as
Browse Code »

Commit eac93023f89c789d84ec52652e24db63480742c5

Authored by Diego Camarinha
2 parents 391fb93c 83a683b4
Exists in colab and in 4 other branches master, spb-master, spb-stable, stable

Merge pull request #167 from mezuro/updating 

Updating
Showing 4 changed files with 66 additions and 64 deletions   Show diff stats
1 -ruby-2.1.3 1 +ruby-2.1.5
1 language: ruby 1 language: ruby
2 rvm: 2 rvm:
3 - - 2.1.3 3 + - 2.1.5
4 4
5 before_script: 5 before_script:
6 - "cp config/database.yml.sample config/database.yml" 6 - "cp config/database.yml.sample config/database.yml"
1 source 'https://rubygems.org' 1 source 'https://rubygems.org'
2 2
3 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' 3 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
4 -gem 'rails', '4.1.6' 4 +gem 'rails', '4.1.8'
5 5
6 # Use sqlite3 as the database for Active Record 6 # Use sqlite3 as the database for Active Record
7 gem 'sqlite3' 7 gem 'sqlite3'
@@ -79,16 +79,16 @@ group :development, :test do @@ -79,16 +79,16 @@ group :development, :test do
79 gem 'rspec-rails', '~> 3.1.0' 79 gem 'rspec-rails', '~> 3.1.0'
80 80
81 # Fixtures made easy 81 # Fixtures made easy
82 - gem 'factory_girl_rails', '~> 4.4.1' 82 + gem 'factory_girl_rails', '~> 4.5.0'
83 83
84 # Deployment 84 # Deployment
85 - gem 'capistrano', "~>3.2.1", require: false 85 + gem 'capistrano', "~>3.3.3", require: false
86 gem 'capistrano-rails' 86 gem 'capistrano-rails'
87 gem 'capistrano-bundler' 87 gem 'capistrano-bundler'
88 gem 'capistrano-rvm', "~>0.1.0" 88 gem 'capistrano-rvm', "~>0.1.0"
89 89
90 # JavaScript unit tests 90 # JavaScript unit tests
91 - gem "konacha", "~> 3.2.0" 91 + gem "konacha", "~> 3.3.0"
92 92
93 # Test coverage history 93 # Test coverage history
94 gem 'coveralls', require: false 94 gem 'coveralls', require: false
1 GIT 1 GIT
2 remote: https://github.com/seyhunak/twitter-bootstrap-rails.git 2 remote: https://github.com/seyhunak/twitter-bootstrap-rails.git
3 - revision: 3edf24de985d946f16a2781644289cfdc51ba95b 3 + revision: 67f160dd2ff5cc7cd843a17866c3b6bc8e7f2794
4 specs: 4 specs:
5 twitter-bootstrap-rails (3.2.0) 5 twitter-bootstrap-rails (3.2.0)
6 actionpack (>= 3.1) 6 actionpack (>= 3.1)
@@ -11,34 +11,34 @@ GIT @@ -11,34 +11,34 @@ GIT
11 GEM 11 GEM
12 remote: https://rubygems.org/ 12 remote: https://rubygems.org/
13 specs: 13 specs:
14 - actionmailer (4.1.6)  
15 - actionpack (= 4.1.6)  
16 - actionview (= 4.1.6) 14 + actionmailer (4.1.8)
  15 + actionpack (= 4.1.8)
  16 + actionview (= 4.1.8)
17 mail (~> 2.5, >= 2.5.4) 17 mail (~> 2.5, >= 2.5.4)
18 - actionpack (4.1.6)  
19 - actionview (= 4.1.6)  
20 - activesupport (= 4.1.6) 18 + actionpack (4.1.8)
  19 + actionview (= 4.1.8)
  20 + activesupport (= 4.1.8)
21 rack (~> 1.5.2) 21 rack (~> 1.5.2)
22 rack-test (~> 0.6.2) 22 rack-test (~> 0.6.2)
23 - actionview (4.1.6)  
24 - activesupport (= 4.1.6) 23 + actionview (4.1.8)
  24 + activesupport (= 4.1.8)
25 builder (~> 3.1) 25 builder (~> 3.1)
26 erubis (~> 2.7.0) 26 erubis (~> 2.7.0)
27 - activemodel (4.1.6)  
28 - activesupport (= 4.1.6) 27 + activemodel (4.1.8)
  28 + activesupport (= 4.1.8)
29 builder (~> 3.1) 29 builder (~> 3.1)
30 - activerecord (4.1.6)  
31 - activemodel (= 4.1.6)  
32 - activesupport (= 4.1.6) 30 + activerecord (4.1.8)
  31 + activemodel (= 4.1.8)
  32 + activesupport (= 4.1.8)
33 arel (~> 5.0.0) 33 arel (~> 5.0.0)
34 - activesupport (4.1.6) 34 + activesupport (4.1.8)
35 i18n (~> 0.6, >= 0.6.9) 35 i18n (~> 0.6, >= 0.6.9)
36 json (~> 1.7, >= 1.7.7) 36 json (~> 1.7, >= 1.7.7)
37 minitest (~> 5.1) 37 minitest (~> 5.1)
38 thread_safe (~> 0.1) 38 thread_safe (~> 0.1)
39 tzinfo (~> 1.1) 39 tzinfo (~> 1.1)
40 arel (5.0.1.20140414130214) 40 arel (5.0.1.20140414130214)
41 - bcrypt (3.1.7) 41 + bcrypt (3.1.9)
42 better_errors (2.0.0) 42 better_errors (2.0.0)
43 coderay (>= 1.0.0) 43 coderay (>= 1.0.0)
44 erubis (>= 2.6.6) 44 erubis (>= 2.6.6)
@@ -46,7 +46,8 @@ GEM @@ -46,7 +46,8 @@ GEM
46 binding_of_caller (0.7.2) 46 binding_of_caller (0.7.2)
47 debug_inspector (>= 0.0.1) 47 debug_inspector (>= 0.0.1)
48 builder (3.2.2) 48 builder (3.2.2)
49 - capistrano (3.2.1) 49 + capistrano (3.3.3)
  50 + capistrano-stats (~> 1.0.3)
50 i18n 51 i18n
51 rake (>= 10.0.0) 52 rake (>= 10.0.0)
52 sshkit (~> 1.3) 53 sshkit (~> 1.3)
@@ -59,6 +60,7 @@ GEM @@ -59,6 +60,7 @@ GEM
59 capistrano-rvm (0.1.2) 60 capistrano-rvm (0.1.2)
60 capistrano (~> 3.0) 61 capistrano (~> 3.0)
61 sshkit (~> 1.2) 62 sshkit (~> 1.2)
  63 + capistrano-stats (1.0.3)
62 capybara (2.4.4) 64 capybara (2.4.4)
63 mime-types (>= 1.16) 65 mime-types (>= 1.16)
64 nokogiri (>= 1.3.3) 66 nokogiri (>= 1.3.3)
@@ -99,7 +101,7 @@ GEM @@ -99,7 +101,7 @@ GEM
99 dalli (2.7.2) 101 dalli (2.7.2)
100 database_cleaner (1.3.0) 102 database_cleaner (1.3.0)
101 debug_inspector (0.0.2) 103 debug_inspector (0.0.2)
102 - devise (3.4.0) 104 + devise (3.4.1)
103 bcrypt (~> 3.0) 105 bcrypt (~> 3.0)
104 orm_adapter (~> 0.1) 106 orm_adapter (~> 0.1)
105 railties (>= 3.2.6, < 5) 107 railties (>= 3.2.6, < 5)
@@ -113,10 +115,10 @@ GEM @@ -113,10 +115,10 @@ GEM
113 actionmailer (>= 3.0.4) 115 actionmailer (>= 3.0.4)
114 activesupport (>= 3.0.4) 116 activesupport (>= 3.0.4)
115 execjs (2.2.2) 117 execjs (2.2.2)
116 - factory_girl (4.4.0) 118 + factory_girl (4.5.0)
117 activesupport (>= 3.0.0) 119 activesupport (>= 3.0.0)
118 - factory_girl_rails (4.4.1)  
119 - factory_girl (~> 4.4.0) 120 + factory_girl_rails (4.5.0)
  121 + factory_girl (~> 4.5.0)
120 railties (>= 3.0.0) 122 railties (>= 3.0.0)
121 faraday (0.9.0) 123 faraday (0.9.0)
122 multipart-post (>= 1.2, < 3) 124 multipart-post (>= 1.2, < 3)
@@ -127,31 +129,31 @@ GEM @@ -127,31 +129,31 @@ GEM
127 google-analytics-rails (0.0.6) 129 google-analytics-rails (0.0.6)
128 hike (1.2.3) 130 hike (1.2.3)
129 i18n (0.6.11) 131 i18n (0.6.11)
130 - jbuilder (2.2.2) 132 + jbuilder (2.2.5)
131 activesupport (>= 3.0.0, < 5) 133 activesupport (>= 3.0.0, < 5)
132 multi_json (~> 1.2) 134 multi_json (~> 1.2)
133 jquery-rails (3.1.2) 135 jquery-rails (3.1.2)
134 railties (>= 3.0, < 5.0) 136 railties (>= 3.0, < 5.0)
135 thor (>= 0.14, < 2.0) 137 thor (>= 0.14, < 2.0)
136 - jquery-ui-rails (5.0.1) 138 + jquery-ui-rails (5.0.3)
137 railties (>= 3.2.16) 139 railties (>= 3.2.16)
138 json (1.8.1) 140 json (1.8.1)
139 kalibro_gatekeeper_client (1.0.0) 141 kalibro_gatekeeper_client (1.0.0)
140 activesupport (>= 2.2.1) 142 activesupport (>= 2.2.1)
141 faraday_middleware (~> 0.9.0) 143 faraday_middleware (~> 0.9.0)
142 - konacha (3.2.5) 144 + konacha (3.3.0)
143 actionpack (>= 3.1, < 5) 145 actionpack (>= 3.1, < 5)
144 capybara 146 capybara
145 colorize 147 colorize
146 railties (>= 3.1, < 5) 148 railties (>= 3.1, < 5)
147 sprockets 149 sprockets
148 libv8 (3.16.14.7) 150 libv8 (3.16.14.7)
149 - mail (2.6.1) 151 + mail (2.6.3)
150 mime-types (>= 1.16, < 3) 152 mime-types (>= 1.16, < 3)
151 metaclass (0.0.4) 153 metaclass (0.0.4)
152 - mime-types (2.4.1)  
153 - mini_portile (0.6.0)  
154 - minitest (5.4.2) 154 + mime-types (2.4.3)
  155 + mini_portile (0.6.1)
  156 + minitest (5.4.3)
155 mocha (1.1.0) 157 mocha (1.1.0)
156 metaclass (~> 0.0.1) 158 metaclass (~> 0.0.1)
157 multi_json (1.10.1) 159 multi_json (1.10.1)
@@ -160,9 +162,9 @@ GEM @@ -160,9 +162,9 @@ GEM
160 net-scp (1.2.1) 162 net-scp (1.2.1)
161 net-ssh (>= 2.6.5) 163 net-ssh (>= 2.6.5)
162 net-ssh (2.9.1) 164 net-ssh (2.9.1)
163 - netrc (0.7.8)  
164 - nokogiri (1.6.3.1)  
165 - mini_portile (= 0.6.0) 165 + netrc (0.9.0)
  166 + nokogiri (1.6.5)
  167 + mini_portile (~> 0.6.0)
166 orm_adapter (0.5.0) 168 orm_adapter (0.5.0)
167 pg (0.17.1) 169 pg (0.17.1)
168 poltergeist (1.5.1) 170 poltergeist (1.5.1)
@@ -173,26 +175,26 @@ GEM @@ -173,26 +175,26 @@ GEM
173 rack (1.5.2) 175 rack (1.5.2)
174 rack-test (0.6.2) 176 rack-test (0.6.2)
175 rack (>= 1.0) 177 rack (>= 1.0)
176 - rails (4.1.6)  
177 - actionmailer (= 4.1.6)  
178 - actionpack (= 4.1.6)  
179 - actionview (= 4.1.6)  
180 - activemodel (= 4.1.6)  
181 - activerecord (= 4.1.6)  
182 - activesupport (= 4.1.6) 178 + rails (4.1.8)
  179 + actionmailer (= 4.1.8)
  180 + actionpack (= 4.1.8)
  181 + actionview (= 4.1.8)
  182 + activemodel (= 4.1.8)
  183 + activerecord (= 4.1.8)
  184 + activesupport (= 4.1.8)
183 bundler (>= 1.3.0, < 2.0) 185 bundler (>= 1.3.0, < 2.0)
184 - railties (= 4.1.6) 186 + railties (= 4.1.8)
185 sprockets-rails (~> 2.0) 187 sprockets-rails (~> 2.0)
186 - railties (4.1.6)  
187 - actionpack (= 4.1.6)  
188 - activesupport (= 4.1.6) 188 + railties (4.1.8)
  189 + actionpack (= 4.1.8)
  190 + activesupport (= 4.1.8)
189 rake (>= 0.8.7) 191 rake (>= 0.8.7)
190 thor (>= 0.18.1, < 2.0) 192 thor (>= 0.18.1, < 2.0)
191 - rake (10.3.2)  
192 - rdoc (4.1.2) 193 + rake (10.4.2)
  194 + rdoc (4.2.0)
193 json (~> 1.4) 195 json (~> 1.4)
194 ref (1.0.5) 196 ref (1.0.5)
195 - responders (1.1.1) 197 + responders (1.1.2)
196 railties (>= 3.2, < 4.2) 198 railties (>= 3.2, < 4.2)
197 rest-client (1.7.2) 199 rest-client (1.7.2)
198 mime-types (>= 1.16, < 3.0) 200 mime-types (>= 1.16, < 3.0)
@@ -214,10 +216,10 @@ GEM @@ -214,10 +216,10 @@ GEM
214 rspec-support (~> 3.1.0) 216 rspec-support (~> 3.1.0)
215 rspec-support (3.1.2) 217 rspec-support (3.1.2)
216 sass (3.2.19) 218 sass (3.2.19)
217 - sass-rails (4.0.3) 219 + sass-rails (4.0.5)
218 railties (>= 4.0.0, < 5.0) 220 railties (>= 4.0.0, < 5.0)
219 - sass (~> 3.2.0)  
220 - sprockets (~> 2.8, <= 2.11.0) 221 + sass (~> 3.2.2)
  222 + sprockets (~> 2.8, < 3.0)
221 sprockets-rails (~> 2.0) 223 sprockets-rails (~> 2.0)
222 sdoc (0.4.1) 224 sdoc (0.4.1)
223 json (~> 1.7, >= 1.7.7) 225 json (~> 1.7, >= 1.7.7)
@@ -229,17 +231,17 @@ GEM @@ -229,17 +231,17 @@ GEM
229 multi_json (~> 1.0) 231 multi_json (~> 1.0)
230 simplecov-html (~> 0.8.0) 232 simplecov-html (~> 0.8.0)
231 simplecov-html (0.8.0) 233 simplecov-html (0.8.0)
232 - spring (1.1.3)  
233 - sprockets (2.11.0) 234 + spring (1.2.0)
  235 + sprockets (2.12.3)
234 hike (~> 1.2) 236 hike (~> 1.2)
235 multi_json (~> 1.0) 237 multi_json (~> 1.0)
236 rack (~> 1.0) 238 rack (~> 1.0)
237 tilt (~> 1.1, != 1.3.0) 239 tilt (~> 1.1, != 1.3.0)
238 - sprockets-rails (2.2.0) 240 + sprockets-rails (2.2.2)
239 actionpack (>= 3.0) 241 actionpack (>= 3.0)
240 activesupport (>= 3.0) 242 activesupport (>= 3.0)
241 sprockets (>= 2.8, < 4.0) 243 sprockets (>= 2.8, < 4.0)
242 - sqlite3 (1.3.9) 244 + sqlite3 (1.3.10)
243 sshkit (1.5.1) 245 sshkit (1.5.1)
244 colorize 246 colorize
245 net-scp (>= 1.1.2) 247 net-scp (>= 1.1.2)
@@ -253,7 +255,7 @@ GEM @@ -253,7 +255,7 @@ GEM
253 thread_safe (0.3.4) 255 thread_safe (0.3.4)
254 tilt (1.4.1) 256 tilt (1.4.1)
255 tins (1.3.3) 257 tins (1.3.3)
256 - turbolinks (2.4.0) 258 + turbolinks (2.5.3)
257 coffee-rails 259 coffee-rails
258 tzinfo (1.2.2) 260 tzinfo (1.2.2)
259 thread_safe (~> 0.1) 261 thread_safe (~> 0.1)
@@ -262,7 +264,7 @@ GEM @@ -262,7 +264,7 @@ GEM
262 json (>= 1.8.0) 264 json (>= 1.8.0)
263 warden (1.2.3) 265 warden (1.2.3)
264 rack (>= 1.0) 266 rack (>= 1.0)
265 - websocket-driver (0.3.5) 267 + websocket-driver (0.4.0)
266 xpath (2.0.0) 268 xpath (2.0.0)
267 nokogiri (~> 1.3) 269 nokogiri (~> 1.3)
268 270
@@ -272,7 +274,7 @@ PLATFORMS @@ -272,7 +274,7 @@ PLATFORMS
272 DEPENDENCIES 274 DEPENDENCIES
273 better_errors 275 better_errors
274 binding_of_caller 276 binding_of_caller
275 - capistrano (~> 3.2.1) 277 + capistrano (~> 3.3.3)
276 capistrano-bundler 278 capistrano-bundler
277 capistrano-rails 279 capistrano-rails
278 capistrano-rvm (~> 0.1.0) 280 capistrano-rvm (~> 0.1.0)
@@ -285,17 +287,17 @@ DEPENDENCIES @@ -285,17 +287,17 @@ DEPENDENCIES
285 database_cleaner 287 database_cleaner
286 devise (~> 3.4.0) 288 devise (~> 3.4.0)
287 exception_notification (~> 4.0.1) 289 exception_notification (~> 4.0.1)
288 - factory_girl_rails (~> 4.4.1) 290 + factory_girl_rails (~> 4.5.0)
289 google-analytics-rails (~> 0.0.6) 291 google-analytics-rails (~> 0.0.6)
290 jbuilder (~> 2.2.2) 292 jbuilder (~> 2.2.2)
291 jquery-rails 293 jquery-rails
292 jquery-ui-rails (~> 5.0.0) 294 jquery-ui-rails (~> 5.0.0)
293 kalibro_gatekeeper_client (~> 1.0.0) 295 kalibro_gatekeeper_client (~> 1.0.0)
294 - konacha (~> 3.2.0) 296 + konacha (~> 3.3.0)
295 mocha 297 mocha
296 pg (~> 0.17.0) 298 pg (~> 0.17.0)
297 poltergeist (~> 1.5.0) 299 poltergeist (~> 1.5.0)
298 - rails (= 4.1.6) 300 + rails (= 4.1.8)
299 rspec-rails (~> 3.1.0) 301 rspec-rails (~> 3.1.0)
300 sass-rails (~> 4.0.1) 302 sass-rails (~> 4.0.1)
301 sdoc 303 sdoc