Download as
Browse Code »

Commit 0851f743b8caffffd0928b55fbcad55731f77e55

Authored by Diego Camarinha
2 parents f2ff5f3f 4d0a46b6
Exists in colab and in 4 other branches master, spb-master, spb-stable, stable

Merge pull request #181 from mezuro/gem_updates 

Gem updates
Showing 1 changed file with 20 additions and 21 deletions   Show diff stats
Gemfile.lock
  Diff comments   View file @0851f74
1 1 GIT
2 2 remote: https://github.com/seyhunak/twitter-bootstrap-rails.git
3   - revision: 62854e5129e1a5a24589b3a3849235ca4b794e6f
  3 + revision: cd805c7217703e60ff82576525a3ba03a3c2bc35
4 4 specs:
5 5 twitter-bootstrap-rails (3.2.1)
6 6 actionpack (>= 3.1)
... ... @@ -93,17 +93,17 @@ GEM
93 93 coffee-script (2.3.0)
94 94 coffee-script-source
95 95 execjs
96   - coffee-script-source (1.9.0)
  96 + coffee-script-source (1.9.1)
97 97 colorize (0.7.5)
98 98 colorpicker (0.0.5)
99 99 columnize (0.9.0)
100 100 commonjs (0.2.7)
101   - cucumber (1.3.18)
  101 + cucumber (1.3.19)
102 102 builder (>= 2.1.2)
103 103 diff-lcs (>= 1.1.3)
104 104 gherkin (~> 2.12)
105 105 multi_json (>= 1.7.5, < 2.0)
106   - multi_test (>= 0.1.1)
  106 + multi_test (>= 0.1.2)
107 107 cucumber-rails (1.4.2)
108 108 capybara (>= 1.1.2, < 3)
109 109 cucumber (>= 1.3.8, < 2)
... ... @@ -139,12 +139,12 @@ GEM
139 139 faraday (>= 0.7.4, < 0.10)
140 140 gherkin (2.12.2)
141 141 multi_json (~> 1.3)
142   - globalid (0.3.2)
  142 + globalid (0.3.3)
143 143 activesupport (>= 4.1.0)
144 144 google-analytics-rails (0.0.6)
145 145 hike (1.2.3)
146 146 i18n (0.7.0)
147   - jbuilder (2.2.6)
  147 + jbuilder (2.2.8)
148 148 activesupport (>= 3.0.0, < 5)
149 149 multi_json (~> 1.2)
150 150 jquery-rails (4.0.3)
... ... @@ -223,28 +223,27 @@ GEM
223 223 thor (>= 0.18.1, < 2.0)
224 224 rake (10.4.2)
225 225 rdoc (4.2.0)
226   - json (~> 1.4)
227 226 ref (1.0.5)
228 227 responders (2.1.0)
229 228 railties (>= 4.2.0, < 5)
230   - rspec-core (3.2.0)
  229 + rspec-core (3.2.1)
231 230 rspec-support (~> 3.2.0)
232 231 rspec-expectations (3.2.0)
233 232 diff-lcs (>= 1.2.0, < 2.0)
234 233 rspec-support (~> 3.2.0)
235   - rspec-mocks (3.2.0)
  234 + rspec-mocks (3.2.1)
236 235 diff-lcs (>= 1.2.0, < 2.0)
237 236 rspec-support (~> 3.2.0)
238   - rspec-rails (3.2.0)
239   - actionpack (>= 3.0, <= 4.2)
240   - activesupport (>= 3.0, <= 4.2)
241   - railties (>= 3.0, <= 4.2)
  237 + rspec-rails (3.2.1)
  238 + actionpack (>= 3.0, < 4.3)
  239 + activesupport (>= 3.0, < 4.3)
  240 + railties (>= 3.0, < 4.3)
242 241 rspec-core (~> 3.2.0)
243 242 rspec-expectations (~> 3.2.0)
244 243 rspec-mocks (~> 3.2.0)
245 244 rspec-support (~> 3.2.0)
246   - rspec-support (3.2.1)
247   - sass (3.4.11)
  245 + rspec-support (3.2.2)
  246 + sass (3.4.12)
248 247 sass-rails (5.0.1)
249 248 railties (>= 4.0.0, < 5.0)
250 249 sass (~> 3.1)
... ... @@ -256,13 +255,13 @@ GEM
256 255 rdoc (~> 4.0)
257 256 shoulda-matchers (2.8.0)
258 257 activesupport (>= 3.0.0)
259   - simplecov (0.9.1)
  258 + simplecov (0.9.2)
260 259 docile (~> 1.1.0)
261 260 multi_json (~> 1.0)
262   - simplecov-html (~> 0.8.0)
263   - simplecov-html (0.8.0)
  261 + simplecov-html (~> 0.9.0)
  262 + simplecov-html (0.9.0)
264 263 slop (3.6.0)
265   - spring (1.3.1)
  264 + spring (1.3.2)
266 265 sprockets (2.12.3)
267 266 hike (~> 1.2)
268 267 multi_json (~> 1.0)
... ... @@ -297,9 +296,9 @@ GEM
297 296 binding_of_caller (>= 0.7.2)
298 297 railties (~> 4.0)
299 298 sprockets-rails (>= 2.0, < 4.0)
300   - websocket-driver (0.5.1)
  299 + websocket-driver (0.5.3)
301 300 websocket-extensions (>= 0.1.0)
302   - websocket-extensions (0.1.1)
  301 + websocket-extensions (0.1.2)
303 302 xpath (2.0.0)
304 303 nokogiri (~> 1.3)
305 304  
... ...