Browse Source

update deps

pull/1/head
Nicolae Claudius 11 years ago
parent
commit
d506c0b46b
  1. 29
      Gemfile
  2. 258
      Gemfile.lock

29
Gemfile

@ -1,7 +1,7 @@
source 'http://rubygems.org'
# Core
gem 'rails', '4.0.2'
gem 'rails', '4.1.1'
gem 'mysql2', '~> 0.3.13'
# Auth
@ -18,28 +18,29 @@ gem 'userstamp', '~> 2.0.2', github: 'kimkong/userstamp'
gem 'nilify_blanks', '~> 1.0.2'
gem 'active-model-email-validator', '~> 1.0.2'
gem 'concerned_with', '~> 0.1.0'
gem 'faker','~> 1.2.0'
gem 'factory_girl_rails', '~> 4.3.0'
gem 'faker','~> 1.3.0'
gem 'factory_girl_rails', '~> 4.4.1'
gem 'validates_hostname', '~> 1.0.0', github: 'KimNorgaard/validates_hostname'
gem 'paper_trail', '~> 3.0.0'
# Interface
gem 'mail_form', '~> 1.5.0'
gem 'simple_form', '~> 3.0.0'
gem 'simple_form', '~> 3.1.0.rc1'
gem 'navigasmic', '~> 0.5.6', github: 'jejacks0n/navigasmic',
tag: 'v0.5.6', ref: '1ffe437f279657c6fb87bb4b0215eb723df4ea7a'
gem 'active_scaffold', '~> 3.4.0.rc',
github: 'clyfe/active_scaffold',
branch: 'fix-always-use-build_associated'
path: '/home/clyfe/dev/active_scaffold'
#github: 'clyfe/active_scaffold',
#branch: 'fix-always-use-build_associated'
# Config
gem 'rails_config', '~> 0.3.3'
gem 'rails-settings-cached', '~> 0.3.1'
gem 'rails_config', '~> 0.4.2'
gem 'rails-settings-cached', '~> 0.4.0'
# Other
gem 'acts_as_nested_interval', '~> 0.1.0'
gem 'seedbank', '~> 0.3.0'
gem 'unicorn', '~> 4.6.3'
gem 'unicorn', '~> 4.8.3'
gem 'dalli', '~> 2.7.0'
gem 'json', '~> 1.8.0'
gem 'rails_admin', '~> 0.6.1'
@ -51,13 +52,13 @@ gem 'oily_png', '~> 1.1.0'
gem 'therubyracer', '~> 0.12.0'
gem 'sass-rails', '~> 4.0.0'
gem 'compass-rails', '~> 1.1.0'
gem 'bootstrap-sass', '~> 3.1.0.1'
gem 'font-awesome-rails', '~> 4.0.3.1'
gem 'bootstrap-sass', '~> 3.1.1.0'
gem 'font-awesome-rails', '~> 4.1.0.0'
gem 'webshims-rails', '~> 1.12.2'
gem 'detect_timezone_rails', '~> 0.0.3'
gem 'coffee-rails', '~> 4.0.0'
gem 'jquery-rails', '~> 3.1.0'
gem 'jquery-ui-rails', '~> 4.1.0'
gem 'jquery-ui-rails', '~> 4.2.0'
gem 'turbolinks', '~> 2.2.1'
group :development do
@ -65,7 +66,7 @@ group :development do
gem 'better_errors', '1.1.0'
gem 'binding_of_caller', '0.7.2'
gem 'debase', '~> 0.0.7'
gem 'bullet', '~> 4.7.1'
gem 'bullet', '~> 4.9.0'
gem 'letter_opener', '~> 1.2.0'
end
@ -75,5 +76,5 @@ end
group :test do
gem 'capybara', '~> 2.2.0'
gem 'database_rewinder', '~> 0.0.1'
gem 'database_rewinder', '~> 0.2.0'
end

258
Gemfile.lock

@ -1,16 +1,13 @@
GIT
remote: git://github.com/KimNorgaard/validates_hostname.git
revision: 6421e9bd8261a2fe010c627191a0dbe30352469f
revision: ab8249e60a2c98ea97769784665b88fb1fa7e937
specs:
validates_hostname (1.0.0)
GIT
remote: git://github.com/clyfe/active_scaffold.git
revision: b82fdc8f7252ca88b1f44b72a0ff75e511fa967d
branch: fix-always-use-build_associated
specs:
active_scaffold (3.4.0.rc)
rails (>= 3.2.6, < 5)
validates_hostname (1.0.4)
activerecord
rails
rspec
rspec-rails
sqlite3-ruby
GIT
remote: git://github.com/jejacks0n/navigasmic.git
@ -26,58 +23,65 @@ GIT
specs:
userstamp (2.0.2)
PATH
remote: vendor/cache/active_scaffold
specs:
active_scaffold (3.4.0.rc)
rails (>= 3.2.6, < 5)
GEM
remote: http://rubygems.org/
specs:
actionmailer (4.0.2)
actionpack (= 4.0.2)
actionmailer (4.1.1)
actionpack (= 4.1.1)
actionview (= 4.1.1)
mail (~> 2.5.4)
actionpack (4.0.2)
activesupport (= 4.0.2)
builder (~> 3.1.0)
erubis (~> 2.7.0)
actionpack (4.1.1)
actionview (= 4.1.1)
activesupport (= 4.1.1)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
actionview (4.1.1)
activesupport (= 4.1.1)
builder (~> 3.1)
erubis (~> 2.7.0)
active-model-email-validator (1.0.2)
activemodel
mail
activemodel (4.0.2)
activesupport (= 4.0.2)
builder (~> 3.1.0)
activerecord (4.0.2)
activemodel (= 4.0.2)
activerecord-deprecated_finders (~> 1.0.2)
activesupport (= 4.0.2)
arel (~> 4.0.0)
activerecord-deprecated_finders (1.0.3)
activesupport (4.0.2)
i18n (~> 0.6, >= 0.6.4)
minitest (~> 4.2)
multi_json (~> 1.3)
activemodel (4.1.1)
activesupport (= 4.1.1)
builder (~> 3.1)
activerecord (4.1.1)
activemodel (= 4.1.1)
activesupport (= 4.1.1)
arel (~> 5.0.0)
activesupport (4.1.1)
i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.1)
tzinfo (~> 0.3.37)
acts_as_nested_interval (0.1.0)
tzinfo (~> 1.1)
acts_as_nested_interval (0.1.1)
rails (>= 3.2.1, < 5)
addressable (2.3.5)
arel (4.0.1)
atomic (1.1.14)
addressable (2.3.6)
arel (5.0.1.20140414130214)
aws-ses (0.5.0)
builder
mail (> 2.2.5)
mime-types
xml-simple
bcrypt-ruby (3.1.2)
bcrypt (3.1.7)
better_errors (1.1.0)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
bootstrap-sass (3.1.0.1)
bootstrap-sass (3.1.1.1)
sass (~> 3.2)
builder (3.1.4)
bullet (4.7.1)
builder (3.2.2)
bullet (4.9.0)
activesupport
uniform_notifier (>= 1.4.0)
uniform_notifier (~> 1.6.0)
cancan (1.6.7)
capybara (2.2.1)
mime-types (>= 1.16)
@ -85,7 +89,7 @@ GEM
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
chunky_png (1.2.9)
chunky_png (1.3.1)
coderay (1.1.0)
coffee-rails (4.0.1)
coffee-script (>= 2.2.0)
@ -94,23 +98,24 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.7.0)
compass (0.12.2)
compass (0.12.6)
chunky_png (~> 1.2)
fssm (>= 0.2.7)
sass (~> 3.1)
compass-rails (1.1.3)
sass (~> 3.2.19)
compass-rails (1.1.7)
compass (>= 0.12.2)
sprockets (<= 2.11.0)
concerned_with (0.1.0)
dalli (2.7.0)
database_rewinder (0.0.2)
dalli (2.7.2)
database_rewinder (0.2.0)
debase (0.0.9)
debugger-ruby_core_source
debug_inspector (0.0.2)
debugger-ruby_core_source (1.3.1)
debugger-ruby_core_source (1.3.5)
detect_timezone_rails (0.0.5)
railties (>= 3.1)
devise (3.2.2)
bcrypt-ruby (~> 3.0)
devise (3.2.4)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5)
thread_safe (~> 0.1)
@ -118,35 +123,34 @@ GEM
diff-lcs (1.2.5)
erubis (2.7.0)
execjs (2.0.2)
factory_girl (4.3.0)
factory_girl (4.4.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.3.0)
factory_girl (~> 4.3.0)
factory_girl_rails (4.4.1)
factory_girl (~> 4.4.0)
railties (>= 3.0.0)
faker (1.2.0)
faker (1.3.0)
i18n (~> 0.5)
faraday (0.9.0)
multipart-post (>= 1.2, < 3)
font-awesome-rails (4.0.3.1)
font-awesome-rails (4.1.0.0)
railties (>= 3.2, < 5.0)
fssm (0.2.10)
haml (4.0.5)
tilt
hashie (2.0.5)
hashie (2.1.1)
hike (1.2.3)
i18n (0.6.9)
jquery-rails (3.1.0)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
jquery-ui-rails (4.1.1)
railties (>= 3.1.0)
jquery-ui-rails (4.2.1)
railties (>= 3.2.16)
json (1.8.1)
jwt (0.1.11)
multi_json (>= 1.5)
jwt (1.0.0)
kaminari (0.15.1)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
kgio (2.9.0)
kgio (2.9.2)
launchy (2.4.2)
addressable (~> 2.3)
letter_opener (1.2.0)
@ -159,44 +163,44 @@ GEM
actionmailer (>= 3.2, < 5)
activemodel (>= 3.2, < 5)
mime-types (1.25.1)
mini_portile (0.5.2)
minitest (4.7.5)
multi_json (1.8.4)
mini_portile (0.6.0)
minitest (5.3.4)
multi_json (1.10.1)
multi_xml (0.5.5)
multipart-post (2.0.0)
mysql2 (0.3.15)
mysql2 (0.3.16)
nested_form (0.3.2)
nilify_blanks (1.0.3)
activerecord (>= 3.0.0)
activesupport (>= 3.0.0)
nokogiri (1.6.1)
mini_portile (~> 0.5.0)
oauth2 (0.9.3)
nokogiri (1.6.2.1)
mini_portile (= 0.6.0)
oauth2 (0.9.4)
faraday (>= 0.8, < 0.10)
jwt (~> 0.1.8)
jwt (~> 1.0)
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (~> 1.2)
oily_png (1.1.0)
chunky_png (~> 1.2.7)
oily_png (1.1.1)
chunky_png (~> 1.3.0)
omniauth (1.2.1)
hashie (>= 1.2, < 3)
rack (~> 1.0)
omniauth-google-oauth2 (0.2.2)
omniauth-google-oauth2 (0.2.4)
omniauth (~> 1.0)
omniauth-oauth2
omniauth-oauth2 (~> 1.1)
omniauth-oauth2 (1.1.2)
faraday (>= 0.8, < 0.10)
multi_json (~> 1.3)
oauth2 (~> 0.9.3)
omniauth (~> 1.2)
orm_adapter (0.5.0)
paper_trail (3.0.0)
paper_trail (3.0.2)
activerecord (>= 3.0, < 5.0)
activesupport (>= 3.0, < 5.0)
polyamorous (0.6.4)
activerecord (>= 3.0)
polyglot (0.3.3)
polyglot (0.3.4)
quiet_assets (1.0.2)
railties (>= 3.1, < 5.0)
rack (1.5.2)
@ -205,17 +209,19 @@ GEM
rack (~> 1.3)
rack-test (0.6.2)
rack (>= 1.0)
rails (4.0.2)
actionmailer (= 4.0.2)
actionpack (= 4.0.2)
activerecord (= 4.0.2)
activesupport (= 4.0.2)
rails (4.1.1)
actionmailer (= 4.1.1)
actionpack (= 4.1.1)
actionview (= 4.1.1)
activemodel (= 4.1.1)
activerecord (= 4.1.1)
activesupport (= 4.1.1)
bundler (>= 1.3.0, < 2.0)
railties (= 4.0.2)
sprockets-rails (~> 2.0.0)
rails-settings-cached (0.3.2)
railties (= 4.1.1)
sprockets-rails (~> 2.0)
rails-settings-cached (0.4.1)
rails (>= 4.0.0)
rails_admin (0.6.1)
rails_admin (0.6.2)
builder (~> 3.1)
coffee-rails (~> 4.0)
font-awesome-rails (>= 3.0)
@ -229,22 +235,26 @@ GEM
remotipart (~> 1.0)
safe_yaml (~> 1.0)
sass-rails (~> 4.0)
rails_config (0.3.3)
rails_config (0.4.2)
activesupport (>= 3.0)
railties (4.0.2)
actionpack (= 4.0.2)
activesupport (= 4.0.2)
railties (4.1.1)
actionpack (= 4.1.1)
activesupport (= 4.1.1)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
raindrops (0.12.0)
rake (10.1.1)
raindrops (0.13.0)
rake (10.3.2)
ref (1.0.5)
remotipart (1.2.1)
rspec-core (2.14.7)
rspec (2.14.1)
rspec-core (~> 2.14.0)
rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0)
rspec-core (2.14.8)
rspec-expectations (2.14.5)
diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.14.5)
rspec-rails (2.14.1)
rspec-mocks (2.14.6)
rspec-rails (2.14.2)
actionpack (>= 3.0)
activemodel (>= 3.0)
activesupport (>= 3.0)
@ -252,56 +262,60 @@ GEM
rspec-core (~> 2.14.0)
rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0)
safe_yaml (1.0.1)
sass (3.2.14)
sass-rails (4.0.1)
safe_yaml (1.0.3)
sass (3.2.19)
sass-rails (4.0.3)
railties (>= 4.0.0, < 5.0)
sass (>= 3.1.10)
sprockets-rails (~> 2.0.0)
sass (~> 3.2.0)
sprockets (~> 2.8, <= 2.11.0)
sprockets-rails (~> 2.0)
seedbank (0.3.0)
sentient_model (1.0.4)
bundler (>= 1.0)
simple_form (3.0.1)
actionpack (>= 4.0.0, < 4.1)
activemodel (>= 4.0.0, < 4.1)
sprockets (2.10.1)
simple_form (3.1.0.rc1)
actionpack (~> 4.0)
activemodel (~> 4.0)
sprockets (2.11.0)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.0.1)
sprockets-rails (2.1.3)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (~> 2.8)
sqlite3 (1.3.9)
sqlite3-ruby (1.3.3)
sqlite3 (>= 1.3.3)
squeel (1.1.1)
activerecord (>= 3.0)
activesupport (>= 3.0)
polyamorous (~> 0.6.0)
switch_user (0.9.4)
switch_user (0.9.5)
therubyracer (0.12.1)
libv8 (~> 3.16.14.0)
ref
thor (0.18.1)
thread_safe (0.1.3)
atomic
thor (0.19.1)
thread_safe (0.3.3)
tilt (1.4.1)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
turbolinks (2.2.1)
turbolinks (2.2.2)
coffee-rails
tzinfo (0.3.38)
tzinfo (1.1.0)
thread_safe (~> 0.1)
uglifier (2.4.0)
execjs (>= 0.3.0)
json (>= 1.8.0)
unicorn (4.6.3)
unicorn (4.8.3)
kgio (~> 2.6)
rack
raindrops (~> 0.7)
uniform_notifier (1.4.0)
uniform_notifier (1.6.1)
warden (1.2.3)
rack (>= 1.0)
webshims-rails (1.12.2)
webshims-rails (1.12.7)
rails (> 3.1.0)
xml-simple (1.1.3)
xpath (2.0.0)
@ -317,23 +331,23 @@ DEPENDENCIES
aws-ses (~> 0.5.0)
better_errors (= 1.1.0)
binding_of_caller (= 0.7.2)
bootstrap-sass (~> 3.1.0.1)
bullet (~> 4.7.1)
bootstrap-sass (~> 3.1.1.0)
bullet (~> 4.9.0)
cancan (= 1.6.7)
capybara (~> 2.2.0)
coffee-rails (~> 4.0.0)
compass-rails (~> 1.1.0)
concerned_with (~> 0.1.0)
dalli (~> 2.7.0)
database_rewinder (~> 0.0.1)
database_rewinder (~> 0.2.0)
debase (~> 0.0.7)
detect_timezone_rails (~> 0.0.3)
devise (~> 3.2.2)
factory_girl_rails (~> 4.3.0)
faker (~> 1.2.0)
font-awesome-rails (~> 4.0.3.1)
factory_girl_rails (~> 4.4.1)
faker (~> 1.3.0)
font-awesome-rails (~> 4.1.0.0)
jquery-rails (~> 3.1.0)
jquery-ui-rails (~> 4.1.0)
jquery-ui-rails (~> 4.2.0)
json (~> 1.8.0)
letter_opener (~> 1.2.0)
mail_form (~> 1.5.0)
@ -345,21 +359,21 @@ DEPENDENCIES
omniauth-google-oauth2 (~> 0.2.2)
paper_trail (~> 3.0.0)
quiet_assets (~> 1.0.1)
rails (= 4.0.2)
rails-settings-cached (~> 0.3.1)
rails (= 4.1.1)
rails-settings-cached (~> 0.4.0)
rails_admin (~> 0.6.1)
rails_config (~> 0.3.3)
rails_config (~> 0.4.2)
rspec-rails (~> 2.14.0)
sass-rails (~> 4.0.0)
seedbank (~> 0.3.0)
sentient_model (~> 1.0.4)
simple_form (~> 3.0.0)
simple_form (~> 3.1.0.rc1)
squeel (~> 1.1.0)
switch_user (~> 0.9.3)
therubyracer (~> 0.12.0)
turbolinks (~> 2.2.1)
uglifier (~> 2.4.0)
unicorn (~> 4.6.3)
unicorn (~> 4.8.3)
userstamp (~> 2.0.2)!
validates_hostname (~> 1.0.0)!
webshims-rails (~> 1.12.2)

Loading…
Cancel
Save