aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile.lock
diff options
context:
space:
mode:
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock184
1 files changed, 108 insertions, 76 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index fdd11cf..c91e419 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,46 +1,59 @@
GEM
remote: https://rubygems.org/
specs:
- actionmailer (4.1.5)
- actionpack (= 4.1.5)
- actionview (= 4.1.5)
- mail (~> 2.5.4)
- actionpack (4.1.5)
- actionview (= 4.1.5)
- activesupport (= 4.1.5)
- rack (~> 1.5.2)
+ actionmailer (4.2.0.beta1)
+ actionpack (= 4.2.0.beta1)
+ actionview (= 4.2.0.beta1)
+ mail (~> 2.5, >= 2.5.4)
+ rails-dom-testing (~> 1.0, >= 1.0.2)
+ actionpack (4.2.0.beta1)
+ actionview (= 4.2.0.beta1)
+ activesupport (= 4.2.0.beta1)
+ rack (~> 1.6.0.beta)
rack-test (~> 0.6.2)
- actionview (4.1.5)
- activesupport (= 4.1.5)
+ rails-deprecated_sanitizer (~> 1.0, >= 1.0.2)
+ rails-dom-testing (~> 1.0, >= 1.0.2)
+ actionview (4.2.0.beta1)
+ activesupport (= 4.2.0.beta1)
builder (~> 3.1)
erubis (~> 2.7.0)
- activemodel (4.1.5)
- activesupport (= 4.1.5)
+ rails-deprecated_sanitizer (~> 1.0, >= 1.0.2)
+ rails-dom-testing (~> 1.0, >= 1.0.2)
+ activejob (4.2.0.beta1)
+ globalid (>= 0.2.3)
+ activemodel (4.2.0.beta1)
+ activesupport (= 4.2.0.beta1)
builder (~> 3.1)
- activerecord (4.1.5)
- activemodel (= 4.1.5)
- activesupport (= 4.1.5)
- arel (~> 5.0.0)
+ activerecord (4.2.0.beta1)
+ activemodel (= 4.2.0.beta1)
+ activesupport (= 4.2.0.beta1)
+ arel (>= 6.0.0.beta1, < 6.1)
activerecord-import (0.5.0)
activerecord (>= 3.0)
- activesupport (4.1.5)
- i18n (~> 0.6, >= 0.6.9)
+ activesupport (4.2.0.beta1)
+ i18n (>= 0.7.0.beta1, < 0.8)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.1)
tzinfo (~> 1.1)
addressable (2.3.6)
- arel (5.0.1.20140414130214)
+ arel (6.0.0.beta1)
axiom-types (0.1.1)
descendants_tracker (~> 0.0.4)
ice_nine (~> 0.11.0)
thread_safe (~> 0.3, >= 0.3.1)
- bootstrap-sass (3.2.0.1)
+ binding_of_caller (0.7.3.pre1)
+ debug_inspector (>= 0.0.1)
+ bootstrap-sass (3.2.0.2)
sass (~> 3.2)
buftok (0.2.0)
builder (3.2.2)
- celluloid (0.15.2)
- timers (~> 1.1.0)
+ byebug (3.4.0)
+ columnize (~> 0.8)
+ debugger-linecache (~> 1.2)
+ slop (~> 3.6)
+ celluloid (0.16.0)
+ timers (~> 4.0.0)
coderay (1.1.0)
coercible (1.0.0)
descendants_tracker (~> 0.0.1)
@@ -51,6 +64,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.8.0)
+ columnize (0.8.9)
cool.io (1.1.1)
iobuffer (>= 1.0.0)
coveralls (0.7.1)
@@ -62,6 +76,8 @@ GEM
crack (0.4.2)
safe_yaml (~> 1.0.0)
dalli (2.7.2)
+ debug_inspector (0.0.2)
+ debugger-linecache (1.2.0)
descendants_tracker (0.0.4)
thread_safe (~> 0.3, >= 0.3.1)
diff-lcs (1.2.5)
@@ -81,6 +97,8 @@ GEM
multipart-post (>= 1.2, < 3)
ffi (1.9.3)
formatador (0.2.5)
+ globalid (0.3.0)
+ activesupport (>= 4.1.0)
grape (0.9.0)
activesupport
builder
@@ -102,7 +120,7 @@ GEM
lumberjack (~> 1.0)
pry (>= 0.9.12)
thor (>= 0.18.1)
- guard-rspec (4.2.10)
+ guard-rspec (4.3.1)
guard (~> 2.1)
rspec (>= 2.14, < 4.0)
haml (4.0.5)
@@ -114,10 +132,11 @@ GEM
railties (>= 4.0.1)
hashie (3.3.1)
hike (1.2.3)
+ hitimes (1.2.2)
http (0.6.2)
http_parser.rb (~> 0.6.0)
http_parser.rb (0.6.0)
- i18n (0.6.11)
+ i18n (0.7.0.beta1)
ice_nine (0.11.0)
iobuffer (1.1.2)
jquery-rails (3.1.2)
@@ -130,13 +149,13 @@ GEM
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
lumberjack (1.0.9)
- mail (2.5.4)
- mime-types (~> 1.16)
- treetop (~> 1.4.8)
+ mail (2.6.1)
+ mime-types (>= 1.16, < 3)
memoizable (0.4.2)
thread_safe (~> 0.3, >= 0.3.1)
method_source (0.8.2)
- mime-types (1.25.1)
+ mime-types (2.3)
+ mini_portile (0.6.0)
minitest (5.4.1)
msgpack (0.5.8)
msgpack-rpc (0.5.2)
@@ -148,6 +167,8 @@ GEM
mysql2 (0.3.16)
naught (1.0.0)
netrc (0.7.7)
+ nokogiri (1.6.3.1)
+ mini_portile (= 0.6.0)
oauth (0.4.7)
omniauth (1.2.2)
hashie (>= 1.2, < 4)
@@ -158,7 +179,6 @@ GEM
omniauth-twitter (1.0.1)
multi_json (~> 1.3)
omniauth-oauth (~> 1.0)
- polyglot (0.3.5)
pry (0.10.1)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
@@ -169,26 +189,33 @@ GEM
railties (>= 3.1, < 5.0)
rabl (0.11.0)
activesupport (>= 2.3.14)
- rack (1.5.2)
+ rack (1.6.0.beta)
rack-accept (0.4.5)
rack (>= 0.4)
rack-mount (0.8.3)
rack (>= 1.0.0)
rack-test (0.6.2)
rack (>= 1.0)
- rails (4.1.5)
- actionmailer (= 4.1.5)
- actionpack (= 4.1.5)
- actionview (= 4.1.5)
- activemodel (= 4.1.5)
- activerecord (= 4.1.5)
- activesupport (= 4.1.5)
+ rails (4.2.0.beta1)
+ actionmailer (= 4.2.0.beta1)
+ actionpack (= 4.2.0.beta1)
+ actionview (= 4.2.0.beta1)
+ activejob (= 4.2.0.beta1)
+ activemodel (= 4.2.0.beta1)
+ activerecord (= 4.2.0.beta1)
+ activesupport (= 4.2.0.beta1)
bundler (>= 1.3.0, < 2.0)
- railties (= 4.1.5)
- sprockets-rails (~> 2.0)
- railties (4.1.5)
- actionpack (= 4.1.5)
- activesupport (= 4.1.5)
+ railties (= 4.2.0.beta1)
+ sprockets-rails (~> 3.0.0.beta1)
+ rails-deprecated_sanitizer (1.0.2)
+ activesupport (>= 4.2.0.alpha)
+ rails-dom-testing (1.0.2)
+ activesupport
+ nokogiri (~> 1.6.0)
+ rails-deprecated_sanitizer (>= 1.0.1)
+ railties (4.2.0.beta1)
+ actionpack (= 4.2.0.beta1)
+ activesupport (= 4.2.0.beta1)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
raindrops (0.13.0)
@@ -199,33 +226,33 @@ GEM
rest-client (1.7.2)
mime-types (>= 1.16, < 3.0)
netrc (~> 0.7)
- rspec (3.0.0)
- rspec-core (~> 3.0.0)
- rspec-expectations (~> 3.0.0)
- rspec-mocks (~> 3.0.0)
- rspec-core (3.0.4)
- rspec-support (~> 3.0.0)
- rspec-expectations (3.0.4)
+ rspec (3.1.0)
+ rspec-core (~> 3.1.0)
+ rspec-expectations (~> 3.1.0)
+ rspec-mocks (~> 3.1.0)
+ rspec-core (3.1.2)
+ rspec-support (~> 3.1.0)
+ rspec-expectations (3.1.0)
diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.0.0)
- rspec-mocks (3.0.4)
- rspec-support (~> 3.0.0)
- rspec-rails (3.0.2)
+ rspec-support (~> 3.1.0)
+ rspec-mocks (3.1.0)
+ rspec-support (~> 3.1.0)
+ rspec-rails (3.1.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
- rspec-core (~> 3.0.0)
- rspec-expectations (~> 3.0.0)
- rspec-mocks (~> 3.0.0)
- rspec-support (~> 3.0.0)
- rspec-support (3.0.4)
+ rspec-core (~> 3.1.0)
+ rspec-expectations (~> 3.1.0)
+ rspec-mocks (~> 3.1.0)
+ rspec-support (~> 3.1.0)
+ rspec-support (3.1.0)
safe_yaml (1.0.3)
- sass (3.2.19)
- sass-rails (4.0.3)
+ sass (3.4.4)
+ sass-rails (5.0.0.beta1)
railties (>= 4.0.0, < 5.0)
- sass (~> 3.2.0)
- sprockets (~> 2.8, <= 2.11.0)
- sprockets-rails (~> 2.0)
+ sass (~> 3.2)
+ sprockets (~> 2.12)
+ sprockets-rails (>= 2.0, < 4.0)
settingslogic (2.0.9)
simple_oauth (0.2.0)
simplecov (0.9.0)
@@ -237,25 +264,23 @@ GEM
spring (1.1.3)
spring-commands-rspec (1.0.2)
spring (>= 0.9.1)
- sprockets (2.11.0)
+ sprockets (2.12.2)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- sprockets-rails (2.1.4)
- actionpack (>= 3.0)
- activesupport (>= 3.0)
+ sprockets-rails (3.0.0.beta1)
+ actionpack (>= 4.0)
+ activesupport (>= 4.0)
sprockets (~> 2.8)
term-ansicolor (1.3.0)
tins (~> 1.0)
thor (0.19.1)
thread_safe (0.3.4)
tilt (1.4.1)
- timers (1.1.0)
+ timers (4.0.1)
+ hitimes
tins (1.3.2)
- treetop (1.4.15)
- polyglot
- polyglot (>= 0.3.1)
turbolinks (2.3.0)
coffee-rails
twitter (5.11.0)
@@ -292,6 +317,11 @@ GEM
coercible (~> 1.0)
descendants_tracker (~> 0.0, >= 0.0.3)
equalizer (~> 0.0, >= 0.0.9)
+ web-console (2.0.0.beta3)
+ activemodel (~> 4.0)
+ binding_of_caller (= 0.7.3.pre1)
+ railties (~> 4.0)
+ sprockets-rails (>= 2.0, < 4.0)
webmock (1.18.0)
addressable (>= 2.3.6)
crack (>= 0.3.2)
@@ -304,13 +334,14 @@ PLATFORMS
DEPENDENCIES
activerecord-import
bootstrap-sass
+ byebug
coveralls
dalli
em-work_queue
factory_girl_rails
grape
grape-rabl
- guard-rspec (~> 4.2.9)
+ guard-rspec
haml-rails
jquery-rails
msgpack
@@ -319,10 +350,10 @@ DEPENDENCIES
omniauth-twitter
pry-rails
quiet_assets
- rails (~> 4.1.5)
- rspec (~> 3.0.0)
- rspec-rails (~> 3.0.0)
- sass-rails (~> 4.0.3)
+ rails (~> 4.2.0.beta1)
+ rspec
+ rspec-rails
+ sass-rails (~> 5.0.0.beta1)
settingslogic
simplecov
spring
@@ -334,6 +365,7 @@ DEPENDENCIES
uglifier
unicorn
unicorn-worker-killer
+ web-console (~> 2.0.0.beta2)
webmock
yajl-ruby
yard