Reverted Gemfile.lock to that from dev-angular. Must have accidentally committed it.

pull/1306/head
Richard 11 years ago
parent 9deaf2f55c
commit f97f57e217
  1. 15
      Gemfile.lock

@ -81,9 +81,6 @@ GEM
arel (3.0.3) arel (3.0.3)
awesome_nested_set (2.1.6) awesome_nested_set (2.1.6)
activerecord (>= 3.0.0) activerecord (>= 3.0.0)
better_errors (1.1.0)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
binding_of_caller (0.7.2) binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1) debug_inspector (>= 0.0.1)
bourbon (4.0.0) bourbon (4.0.0)
@ -113,13 +110,6 @@ GEM
codeclimate-test-reporter (0.1.1) codeclimate-test-reporter (0.1.1)
simplecov (>= 0.7.1, < 1.0.0) simplecov (>= 0.7.1, < 1.0.0)
coderay (1.0.9) coderay (1.0.9)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
railties (~> 3.2.0)
coffee-script (2.2.0)
coffee-script-source
execjs
coffee-script-source (1.6.2)
color-tools (1.3.0) color-tools (1.3.0)
columnize (0.8.9) columnize (0.8.9)
compass (1.0.0.alpha.19) compass (1.0.0.alpha.19)
@ -327,8 +317,6 @@ GEM
multi_json (~> 1.0) multi_json (~> 1.0)
rubyzip rubyzip
websocket (~> 1.0.4) websocket (~> 1.0.4)
sextant (0.2.4)
rails (>= 3.2)
shoulda (3.5.0) shoulda (3.5.0)
shoulda-context (~> 1.0, >= 1.0.1) shoulda-context (~> 1.0, >= 1.0.1)
shoulda-matchers (>= 1.4.1, < 3.0) shoulda-matchers (>= 1.4.1, < 3.0)
@ -392,14 +380,12 @@ DEPENDENCIES
activerecord-tableless (~> 1.0) activerecord-tableless (~> 1.0)
acts_as_list (~> 0.2.0) acts_as_list (~> 0.2.0)
awesome_nested_set awesome_nested_set
better_errors
bourbon (~> 4.0) bourbon (~> 4.0)
capybara capybara
capybara-screenshot capybara-screenshot
cocaine cocaine
codeclimate-test-reporter codeclimate-test-reporter
coderay (~> 1.0.5) coderay (~> 1.0.5)
coffee-rails (~> 3.2.1)
color-tools (~> 1.3.0) color-tools (~> 1.3.0)
compass (= 1.0.0.alpha.19) compass (= 1.0.0.alpha.19)
compass-rails! compass-rails!
@ -456,7 +442,6 @@ DEPENDENCIES
sass (~> 3.3.6) sass (~> 3.3.6)
sass-rails! sass-rails!
selenium-webdriver selenium-webdriver
sextant
shoulda shoulda
shoulda-matchers shoulda-matchers
simplecov (= 0.8.0.pre) simplecov (= 0.8.0.pre)

Loading…
Cancel
Save