Commit e1bf6441 authored by Maxwell Salzberg's avatar Maxwell Salzberg
Browse files

update new js files

parent 76bbe7be
......@@ -34,8 +34,6 @@ GIT
rack-fiber_pool
sinatra
<<<<<<< HEAD
=======
GIT
remote: git://github.com/pivotal/jasmine-gem.git
revision: 34c1529c3f7b78ebd81ac16006f141fc6b7cf013
......@@ -46,15 +44,6 @@ GIT
rspec (>= 1.3.1)
selenium-webdriver (>= 0.1.3)
GIT
remote: git://github.com/socialcast/resque-ensure-connected.git
revision: 8ac0f9e4658495097fb333a93db81d54ba9a5311
specs:
resque-ensure-connected (0.2.0)
activerecord (>= 2.3.5)
resque (>= 1.10.0)
>>>>>>> Fix Jasmine tests - first pass
GEM
remote: http://rubygems.org/
specs:
......@@ -161,13 +150,13 @@ GEM
eventmachine (>= 1.0.0.beta.1)
erubis (2.7.0)
eventmachine (1.0.0.beta.4)
excon (0.12.0)
excon (0.13.2)
execjs (1.3.0)
multi_json (~> 1.0)
factory_girl (2.6.4)
activesupport (>= 2.3.9)
factory_girl_rails (1.7.0)
factory_girl (~> 2.6.0)
factory_girl (3.0.0)
activesupport (>= 3.0.0)
factory_girl_rails (3.0.0)
factory_girl (~> 3.0.0)
railties (>= 3.0.0)
faraday (0.7.6)
addressable (~> 2.2)
......@@ -181,9 +170,9 @@ GEM
fixture_builder (0.3.1)
activerecord (>= 2)
activesupport (>= 2)
fog (1.3.0)
fog (1.3.1)
builder
excon (~> 0.12.0)
excon (~> 0.13.0)
formatador (~> 0.2.0)
mime-types
multi_json (~> 1.0)
......@@ -202,7 +191,7 @@ GEM
rspec-instafail (~> 0.1.8)
ruby-progressbar (~> 0.0.10)
gem_plugin (0.2.3)
gherkin (2.9.1)
gherkin (2.9.3)
json (>= 1.4.6)
haml (3.1.4)
handlebars_assets (0.4.1)
......@@ -230,29 +219,16 @@ GEM
actionpack (~> 3.0)
i18n-inflector (~> 2.6)
railties (~> 3.0)
<<<<<<< HEAD
jasmine (1.1.2)
jasmine-core (>= 1.1.0)
rack (>= 1.1)
rspec (>= 1.3.1)
selenium-webdriver (>= 0.1.3)
jasmine-core (1.1.0)
<<<<<<< HEAD
json (1.6.6)
=======
=======
jasmine-core (1.2.0.rc1)
>>>>>>> Fix Jasmine tests - first pass
jquery-rails (1.0.19)
railties (~> 3.0)
thor (~> 0.14)
json (1.6.5)
>>>>>>> stylesheets are basically now being served from sprockets
json (1.6.6)
jsonpath (0.5.0)
multi_json
jwt (0.1.4)
json (>= 1.2.4)
kgio (2.7.3)
kgio (2.7.4)
launchy (2.0.3)
linecache (0.46)
rbx-require-relative (> 0.0.4)
......@@ -269,7 +245,7 @@ GEM
mobile-fu (1.0.0)
rack-mobile-detect
rails
mock_redis (0.4.0)
mock_redis (0.4.1)
mongrel (1.1.5)
cgi_multipart_eof_fix (>= 2.4)
daemons (>= 1.0.3)
......@@ -313,7 +289,7 @@ GEM
omniauth-oauth (~> 1.0)
omniauth-twitter (0.0.8)
omniauth-oauth (~> 1.0)
orm_adapter (0.0.6)
orm_adapter (0.0.7)
parallel (0.5.16)
parallel_tests (0.7.2)
parallel
......@@ -454,10 +430,10 @@ GEM
typhoeus (0.3.3)
mime-types
tzinfo (0.3.32)
uglifier (1.2.3)
uglifier (1.2.4)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
unicorn (4.2.0)
unicorn (4.2.1)
kgio (~> 2.6)
rack
raindrops (~> 0.7)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment