bundle update
This commit is contained in:
parent
7556c753d0
commit
a12dbde671
1 changed files with 53 additions and 52 deletions
105
Gemfile.lock
105
Gemfile.lock
|
@ -61,26 +61,26 @@ PATH
|
||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
actionmailer (4.0.3)
|
actionmailer (4.0.4)
|
||||||
actionpack (= 4.0.3)
|
actionpack (= 4.0.4)
|
||||||
mail (~> 2.5.4)
|
mail (~> 2.5.4)
|
||||||
actionpack (4.0.3)
|
actionpack (4.0.4)
|
||||||
activesupport (= 4.0.3)
|
activesupport (= 4.0.4)
|
||||||
builder (~> 3.1.0)
|
builder (~> 3.1.0)
|
||||||
erubis (~> 2.7.0)
|
erubis (~> 2.7.0)
|
||||||
rack (~> 1.5.2)
|
rack (~> 1.5.2)
|
||||||
rack-test (~> 0.6.2)
|
rack-test (~> 0.6.2)
|
||||||
activemodel (4.0.3)
|
activemodel (4.0.4)
|
||||||
activesupport (= 4.0.3)
|
activesupport (= 4.0.4)
|
||||||
builder (~> 3.1.0)
|
builder (~> 3.1.0)
|
||||||
activerecord (4.0.3)
|
activerecord (4.0.4)
|
||||||
activemodel (= 4.0.3)
|
activemodel (= 4.0.4)
|
||||||
activerecord-deprecated_finders (~> 1.0.2)
|
activerecord-deprecated_finders (~> 1.0.2)
|
||||||
activesupport (= 4.0.3)
|
activesupport (= 4.0.4)
|
||||||
arel (~> 4.0.0)
|
arel (~> 4.0.0)
|
||||||
activerecord-deprecated_finders (1.0.3)
|
activerecord-deprecated_finders (1.0.3)
|
||||||
activesupport (4.0.3)
|
activesupport (4.0.4)
|
||||||
i18n (~> 0.6, >= 0.6.4)
|
i18n (~> 0.6, >= 0.6.9)
|
||||||
minitest (~> 4.2)
|
minitest (~> 4.2)
|
||||||
multi_json (~> 1.3)
|
multi_json (~> 1.3)
|
||||||
thread_safe (~> 0.1)
|
thread_safe (~> 0.1)
|
||||||
|
@ -88,7 +88,7 @@ GEM
|
||||||
acts_as_tree (1.5.0)
|
acts_as_tree (1.5.0)
|
||||||
activerecord (>= 3.0.0)
|
activerecord (>= 3.0.0)
|
||||||
arel (4.0.2)
|
arel (4.0.2)
|
||||||
atomic (1.1.14)
|
atomic (1.1.15)
|
||||||
better_errors (1.1.0)
|
better_errors (1.1.0)
|
||||||
coderay (>= 1.0.0)
|
coderay (>= 1.0.0)
|
||||||
erubis (>= 2.6.6)
|
erubis (>= 2.6.6)
|
||||||
|
@ -127,9 +127,9 @@ GEM
|
||||||
coffee-script-source
|
coffee-script-source
|
||||||
execjs
|
execjs
|
||||||
coffee-script-source (1.7.0)
|
coffee-script-source (1.7.0)
|
||||||
colorize (0.6.0)
|
colorize (0.7.0)
|
||||||
commonjs (0.2.7)
|
commonjs (0.2.7)
|
||||||
connection_pool (1.2.0)
|
connection_pool (2.0.0)
|
||||||
content_for_in_controllers (0.0.2)
|
content_for_in_controllers (0.0.2)
|
||||||
coveralls (0.7.0)
|
coveralls (0.7.0)
|
||||||
multi_json (~> 1.3)
|
multi_json (~> 1.3)
|
||||||
|
@ -145,7 +145,7 @@ GEM
|
||||||
nokogiri (~> 1.6.0)
|
nokogiri (~> 1.6.0)
|
||||||
rails (>= 3.1)
|
rails (>= 3.1)
|
||||||
diff-lcs (1.2.5)
|
diff-lcs (1.2.5)
|
||||||
diffy (3.0.1)
|
diffy (3.0.2)
|
||||||
docile (1.1.3)
|
docile (1.1.3)
|
||||||
erubis (2.7.0)
|
erubis (2.7.0)
|
||||||
eventmachine (1.0.3)
|
eventmachine (1.0.3)
|
||||||
|
@ -156,10 +156,10 @@ GEM
|
||||||
expression_parser (0.9.0)
|
expression_parser (0.9.0)
|
||||||
factory_girl (4.4.0)
|
factory_girl (4.4.0)
|
||||||
activesupport (>= 3.0.0)
|
activesupport (>= 3.0.0)
|
||||||
factory_girl_rails (4.4.0)
|
factory_girl_rails (4.4.1)
|
||||||
factory_girl (~> 4.4.0)
|
factory_girl (~> 4.4.0)
|
||||||
railties (>= 3.0.0)
|
railties (>= 3.0.0)
|
||||||
faker (1.2.0)
|
faker (1.3.0)
|
||||||
i18n (~> 0.5)
|
i18n (~> 0.5)
|
||||||
ffi (1.9.3)
|
ffi (1.9.3)
|
||||||
haml (4.0.5)
|
haml (4.0.5)
|
||||||
|
@ -179,7 +179,7 @@ GEM
|
||||||
inherited_resources (1.4.1)
|
inherited_resources (1.4.1)
|
||||||
has_scope (~> 0.6.0.rc)
|
has_scope (~> 0.6.0.rc)
|
||||||
responders (~> 1.0.0.rc)
|
responders (~> 1.0.0.rc)
|
||||||
iso (0.2.0)
|
iso (0.2.1)
|
||||||
i18n
|
i18n
|
||||||
jquery-rails (3.1.0)
|
jquery-rails (3.1.0)
|
||||||
railties (>= 3.0, < 5.0)
|
railties (>= 3.0, < 5.0)
|
||||||
|
@ -188,11 +188,11 @@ GEM
|
||||||
kaminari (0.15.1)
|
kaminari (0.15.1)
|
||||||
actionpack (>= 3.0.0)
|
actionpack (>= 3.0.0)
|
||||||
activesupport (>= 3.0.0)
|
activesupport (>= 3.0.0)
|
||||||
less (2.4.0)
|
less (2.5.0)
|
||||||
commonjs (~> 0.2.7)
|
commonjs (~> 0.2.7)
|
||||||
less-rails (2.4.2)
|
less-rails (2.5.0)
|
||||||
actionpack (>= 3.1)
|
actionpack (>= 3.1)
|
||||||
less (~> 2.4.0)
|
less (~> 2.5.0)
|
||||||
libv8 (3.16.14.3)
|
libv8 (3.16.14.3)
|
||||||
mail (2.5.4)
|
mail (2.5.4)
|
||||||
mime-types (~> 1.16)
|
mime-types (~> 1.16)
|
||||||
|
@ -211,7 +211,7 @@ GEM
|
||||||
mini_portile (0.5.2)
|
mini_portile (0.5.2)
|
||||||
minitest (4.7.5)
|
minitest (4.7.5)
|
||||||
mono_logger (1.1.0)
|
mono_logger (1.1.0)
|
||||||
multi_json (1.8.4)
|
multi_json (1.9.0)
|
||||||
mysql2 (0.3.15)
|
mysql2 (0.3.15)
|
||||||
net-scp (1.1.2)
|
net-scp (1.1.2)
|
||||||
net-ssh (>= 2.6.5)
|
net-ssh (>= 2.6.5)
|
||||||
|
@ -225,7 +225,7 @@ GEM
|
||||||
prawn (0.15.0)
|
prawn (0.15.0)
|
||||||
pdf-core (~> 0.1.3)
|
pdf-core (~> 0.1.3)
|
||||||
ttfunk (~> 1.1.0)
|
ttfunk (~> 1.1.0)
|
||||||
protected_attributes (1.0.5)
|
protected_attributes (1.0.7)
|
||||||
activemodel (>= 4.0.1, < 5.0)
|
activemodel (>= 4.0.1, < 5.0)
|
||||||
quiet_assets (1.0.2)
|
quiet_assets (1.0.2)
|
||||||
railties (>= 3.1, < 5.0)
|
railties (>= 3.1, < 5.0)
|
||||||
|
@ -234,13 +234,13 @@ GEM
|
||||||
rack
|
rack
|
||||||
rack-test (0.6.2)
|
rack-test (0.6.2)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
rails (4.0.3)
|
rails (4.0.4)
|
||||||
actionmailer (= 4.0.3)
|
actionmailer (= 4.0.4)
|
||||||
actionpack (= 4.0.3)
|
actionpack (= 4.0.4)
|
||||||
activerecord (= 4.0.3)
|
activerecord (= 4.0.4)
|
||||||
activesupport (= 4.0.3)
|
activesupport (= 4.0.4)
|
||||||
bundler (>= 1.3.0, < 2.0)
|
bundler (>= 1.3.0, < 2.0)
|
||||||
railties (= 4.0.3)
|
railties (= 4.0.4)
|
||||||
sprockets-rails (~> 2.0.0)
|
sprockets-rails (~> 2.0.0)
|
||||||
rails-assets-listjs (0.2.0.beta.4)
|
rails-assets-listjs (0.2.0.beta.4)
|
||||||
railties (>= 3.1)
|
railties (>= 3.1)
|
||||||
|
@ -249,9 +249,9 @@ GEM
|
||||||
rails (~> 4.0)
|
rails (~> 4.0)
|
||||||
rails-settings-cached (0.3.1)
|
rails-settings-cached (0.3.1)
|
||||||
rails (>= 4.0.0.beta1)
|
rails (>= 4.0.0.beta1)
|
||||||
railties (4.0.3)
|
railties (4.0.4)
|
||||||
actionpack (= 4.0.3)
|
actionpack (= 4.0.4)
|
||||||
activesupport (= 4.0.3)
|
activesupport (= 4.0.4)
|
||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
thor (>= 0.18.1, < 2.0)
|
thor (>= 0.18.1, < 2.0)
|
||||||
rake (10.1.1)
|
rake (10.1.1)
|
||||||
|
@ -265,10 +265,10 @@ GEM
|
||||||
ref (1.0.5)
|
ref (1.0.5)
|
||||||
responders (1.0.0)
|
responders (1.0.0)
|
||||||
railties (>= 3.2, < 5)
|
railties (>= 3.2, < 5)
|
||||||
resque (1.25.1)
|
resque (1.25.2)
|
||||||
mono_logger (~> 1.0)
|
mono_logger (~> 1.0)
|
||||||
multi_json (~> 1.0)
|
multi_json (~> 1.0)
|
||||||
redis-namespace (~> 1.2)
|
redis-namespace (~> 1.3)
|
||||||
sinatra (>= 0.9.2)
|
sinatra (>= 0.9.2)
|
||||||
vegas (~> 0.1.2)
|
vegas (~> 0.1.2)
|
||||||
rest-client (1.6.7)
|
rest-client (1.6.7)
|
||||||
|
@ -278,10 +278,10 @@ GEM
|
||||||
rspec-core (~> 2.14.0)
|
rspec-core (~> 2.14.0)
|
||||||
rspec-expectations (~> 2.14.0)
|
rspec-expectations (~> 2.14.0)
|
||||||
rspec-mocks (~> 2.14.0)
|
rspec-mocks (~> 2.14.0)
|
||||||
rspec-core (2.14.7)
|
rspec-core (2.14.8)
|
||||||
rspec-expectations (2.14.5)
|
rspec-expectations (2.14.5)
|
||||||
diff-lcs (>= 1.1.3, < 2.0)
|
diff-lcs (>= 1.1.3, < 2.0)
|
||||||
rspec-mocks (2.14.5)
|
rspec-mocks (2.14.6)
|
||||||
rspec-rails (2.14.1)
|
rspec-rails (2.14.1)
|
||||||
actionpack (>= 3.0)
|
actionpack (>= 3.0)
|
||||||
activemodel (>= 3.0)
|
activemodel (>= 3.0)
|
||||||
|
@ -293,21 +293,22 @@ GEM
|
||||||
rspec-rerun (0.1.3)
|
rspec-rerun (0.1.3)
|
||||||
rspec (>= 2.11.0)
|
rspec (>= 2.11.0)
|
||||||
ruby-prof (0.14.2)
|
ruby-prof (0.14.2)
|
||||||
ruby-units (1.4.4)
|
ruby-units (1.4.5)
|
||||||
rubyzip (1.1.0)
|
rubyzip (1.1.0)
|
||||||
sass (3.2.14)
|
sass (3.2.15)
|
||||||
sass-rails (4.0.1)
|
sass-rails (4.0.2)
|
||||||
railties (>= 4.0.0, < 5.0)
|
railties (>= 4.0.0, < 5.0)
|
||||||
sass (>= 3.1.10)
|
sass (~> 3.2.0)
|
||||||
|
sprockets (~> 2.8, <= 2.11.0)
|
||||||
sprockets-rails (~> 2.0.0)
|
sprockets-rails (~> 2.0.0)
|
||||||
select2-rails (3.5.2)
|
select2-rails (3.5.4)
|
||||||
thor (~> 0.14)
|
thor (~> 0.14)
|
||||||
selenium-webdriver (2.39.0)
|
selenium-webdriver (2.40.0)
|
||||||
childprocess (>= 0.2.5)
|
childprocess (>= 0.5.0)
|
||||||
multi_json (~> 1.0)
|
multi_json (~> 1.0)
|
||||||
rubyzip (~> 1.0)
|
rubyzip (~> 1.0)
|
||||||
websocket (~> 1.0.4)
|
websocket (~> 1.0.4)
|
||||||
simple-navigation (3.11.0)
|
simple-navigation (3.12.2)
|
||||||
activesupport (>= 2.3.2)
|
activesupport (>= 2.3.2)
|
||||||
simple-navigation-bootstrap (1.0.0)
|
simple-navigation-bootstrap (1.0.0)
|
||||||
railties (>= 3.1)
|
railties (>= 3.1)
|
||||||
|
@ -327,7 +328,7 @@ GEM
|
||||||
skinny (0.2.3)
|
skinny (0.2.3)
|
||||||
eventmachine (~> 1.0.0)
|
eventmachine (~> 1.0.0)
|
||||||
thin (~> 1.5.0)
|
thin (~> 1.5.0)
|
||||||
sprockets (2.10.1)
|
sprockets (2.11.0)
|
||||||
hike (~> 1.2)
|
hike (~> 1.2)
|
||||||
multi_json (~> 1.0)
|
multi_json (~> 1.0)
|
||||||
rack (~> 1.0)
|
rack (~> 1.0)
|
||||||
|
@ -336,7 +337,7 @@ GEM
|
||||||
actionpack (>= 3.0)
|
actionpack (>= 3.0)
|
||||||
activesupport (>= 3.0)
|
activesupport (>= 3.0)
|
||||||
sprockets (~> 2.8)
|
sprockets (~> 2.8)
|
||||||
sqlite3 (1.3.8)
|
sqlite3 (1.3.9)
|
||||||
sqlite3-ruby (1.3.3)
|
sqlite3-ruby (1.3.3)
|
||||||
sqlite3 (>= 1.3.3)
|
sqlite3 (>= 1.3.3)
|
||||||
sshkit (1.3.0)
|
sshkit (1.3.0)
|
||||||
|
@ -353,28 +354,28 @@ GEM
|
||||||
eventmachine (>= 0.12.6)
|
eventmachine (>= 0.12.6)
|
||||||
rack (>= 1.0.0)
|
rack (>= 1.0.0)
|
||||||
thor (0.18.1)
|
thor (0.18.1)
|
||||||
thread_safe (0.1.3)
|
thread_safe (0.2.0)
|
||||||
atomic
|
atomic (>= 1.1.7, < 2)
|
||||||
tilt (1.4.1)
|
tilt (1.4.1)
|
||||||
tins (1.0.0)
|
tins (1.0.0)
|
||||||
treetop (1.4.15)
|
treetop (1.4.15)
|
||||||
polyglot
|
polyglot
|
||||||
polyglot (>= 0.3.1)
|
polyglot (>= 0.3.1)
|
||||||
ttfunk (1.1.0)
|
ttfunk (1.1.1)
|
||||||
twitter-bootstrap-rails (2.2.8)
|
twitter-bootstrap-rails (2.2.8)
|
||||||
actionpack (>= 3.1)
|
actionpack (>= 3.1)
|
||||||
execjs
|
execjs
|
||||||
rails (>= 3.1)
|
rails (>= 3.1)
|
||||||
railties (>= 3.1)
|
railties (>= 3.1)
|
||||||
tzinfo (0.3.38)
|
tzinfo (0.3.39)
|
||||||
uglifier (2.4.0)
|
uglifier (2.5.0)
|
||||||
execjs (>= 0.3.0)
|
execjs (>= 0.3.0)
|
||||||
json (>= 1.8.0)
|
json (>= 1.8.0)
|
||||||
uniform_notifier (1.4.0)
|
uniform_notifier (1.4.0)
|
||||||
vegas (0.1.11)
|
vegas (0.1.11)
|
||||||
rack (>= 1.0.0)
|
rack (>= 1.0.0)
|
||||||
websocket (1.0.7)
|
websocket (1.0.7)
|
||||||
whenever (0.9.0)
|
whenever (0.9.2)
|
||||||
activesupport (>= 2.3.4)
|
activesupport (>= 2.3.4)
|
||||||
chronic (>= 0.6.3)
|
chronic (>= 0.6.3)
|
||||||
wikicloth (0.8.1)
|
wikicloth (0.8.1)
|
||||||
|
|
Loading…
Reference in a new issue