suite
This commit is contained in:
parent
b0c71d412e
commit
fe0562e86c
4
Gemfile
4
Gemfile
@ -1,7 +1,7 @@
|
|||||||
source 'https://rubygems.org'
|
source 'https://rubygems.org'
|
||||||
|
|
||||||
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
|
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
|
||||||
gem 'rails', '4.0.13'
|
gem 'rails', '4.0.6'
|
||||||
|
|
||||||
|
|
||||||
gem 'bcrypt-ruby', '~> 3.0.0'
|
gem 'bcrypt-ruby', '~> 3.0.0'
|
||||||
@ -28,7 +28,7 @@ gem 'turbolinks'
|
|||||||
gem 'jbuilder', '~> 1.0.1'
|
gem 'jbuilder', '~> 1.0.1'
|
||||||
|
|
||||||
gem "therubyracer", group: :production
|
gem "therubyracer", group: :production
|
||||||
gem 'less-rails', '2.6.0'
|
gem 'less-rails', '2.3.3'
|
||||||
gem "twitter-bootstrap-rails"
|
gem "twitter-bootstrap-rails"
|
||||||
|
|
||||||
gem 'haml-rails'
|
gem 'haml-rails'
|
||||||
|
71
Gemfile.lock
71
Gemfile.lock
@ -8,25 +8,25 @@ GIT
|
|||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
actionmailer (4.0.13)
|
actionmailer (4.0.6)
|
||||||
actionpack (= 4.0.13)
|
actionpack (= 4.0.6)
|
||||||
mail (~> 2.5, >= 2.5.4)
|
mail (~> 2.5.4)
|
||||||
actionpack (4.0.13)
|
actionpack (4.0.6)
|
||||||
activesupport (= 4.0.13)
|
activesupport (= 4.0.6)
|
||||||
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.13)
|
activemodel (4.0.6)
|
||||||
activesupport (= 4.0.13)
|
activesupport (= 4.0.6)
|
||||||
builder (~> 3.1.0)
|
builder (~> 3.1.0)
|
||||||
activerecord (4.0.13)
|
activerecord (4.0.6)
|
||||||
activemodel (= 4.0.13)
|
activemodel (= 4.0.6)
|
||||||
activerecord-deprecated_finders (~> 1.0.2)
|
activerecord-deprecated_finders (~> 1.0.2)
|
||||||
activesupport (= 4.0.13)
|
activesupport (= 4.0.6)
|
||||||
arel (~> 4.0.0)
|
arel (~> 4.0.0)
|
||||||
activerecord-deprecated_finders (1.0.4)
|
activerecord-deprecated_finders (1.0.4)
|
||||||
activesupport (4.0.13)
|
activesupport (4.0.6)
|
||||||
i18n (~> 0.6, >= 0.6.9)
|
i18n (~> 0.6, >= 0.6.9)
|
||||||
minitest (~> 4.2)
|
minitest (~> 4.2)
|
||||||
multi_json (~> 1.3)
|
multi_json (~> 1.3)
|
||||||
@ -83,15 +83,16 @@ GEM
|
|||||||
kaminari (>= 0.13.0)
|
kaminari (>= 0.13.0)
|
||||||
rails
|
rails
|
||||||
kgio (2.11.2)
|
kgio (2.11.2)
|
||||||
less (2.6.0)
|
less (2.3.3)
|
||||||
commonjs (~> 0.2.7)
|
commonjs (~> 0.2.6)
|
||||||
less-rails (2.6.0)
|
less-rails (2.3.3)
|
||||||
actionpack (>= 3.1)
|
actionpack (>= 3.1)
|
||||||
less (~> 2.6.0)
|
less (~> 2.3.1)
|
||||||
libv8 (3.11.8.17)
|
libv8 (3.11.8.17)
|
||||||
mail (2.7.1)
|
mail (2.5.5)
|
||||||
mini_mime (>= 0.1.1)
|
mime-types (~> 1.16)
|
||||||
mini_mime (1.0.2)
|
treetop (~> 1.4.8)
|
||||||
|
mime-types (1.25.1)
|
||||||
mini_portile (0.5.1)
|
mini_portile (0.5.1)
|
||||||
minitest (4.7.5)
|
minitest (4.7.5)
|
||||||
multi_json (1.13.1)
|
multi_json (1.13.1)
|
||||||
@ -105,20 +106,21 @@ GEM
|
|||||||
net-ssh (>= 2.6.5)
|
net-ssh (>= 2.6.5)
|
||||||
nokogiri (1.6.0)
|
nokogiri (1.6.0)
|
||||||
mini_portile (~> 0.5.0)
|
mini_portile (~> 0.5.0)
|
||||||
|
polyglot (0.3.5)
|
||||||
rack (1.5.5)
|
rack (1.5.5)
|
||||||
rack-test (0.6.3)
|
rack-test (0.6.3)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
rails (4.0.13)
|
rails (4.0.6)
|
||||||
actionmailer (= 4.0.13)
|
actionmailer (= 4.0.6)
|
||||||
actionpack (= 4.0.13)
|
actionpack (= 4.0.6)
|
||||||
activerecord (= 4.0.13)
|
activerecord (= 4.0.6)
|
||||||
activesupport (= 4.0.13)
|
activesupport (= 4.0.6)
|
||||||
bundler (>= 1.3.0, < 2.0)
|
bundler (>= 1.3.0, < 2.0)
|
||||||
railties (= 4.0.13)
|
railties (= 4.0.6)
|
||||||
sprockets-rails (~> 2.0)
|
sprockets-rails (~> 2.0)
|
||||||
railties (4.0.13)
|
railties (4.0.6)
|
||||||
actionpack (= 4.0.13)
|
actionpack (= 4.0.6)
|
||||||
activesupport (= 4.0.13)
|
activesupport (= 4.0.6)
|
||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
thor (>= 0.18.1, < 2.0)
|
thor (>= 0.18.1, < 2.0)
|
||||||
raindrops (0.19.0)
|
raindrops (0.19.0)
|
||||||
@ -132,13 +134,22 @@ GEM
|
|||||||
sdoc (0.3.20)
|
sdoc (0.3.20)
|
||||||
json (>= 1.1.3)
|
json (>= 1.1.3)
|
||||||
rdoc (~> 3.10)
|
rdoc (~> 3.10)
|
||||||
sprockets-rails (2.0.0)
|
sprockets (3.7.2)
|
||||||
|
concurrent-ruby (~> 1.0)
|
||||||
|
rack (> 1, < 3)
|
||||||
|
sprockets-rails (2.3.3)
|
||||||
|
actionpack (>= 3.0)
|
||||||
|
activesupport (>= 3.0)
|
||||||
|
sprockets (>= 2.8, < 4.0)
|
||||||
therubyracer (0.11.4)
|
therubyracer (0.11.4)
|
||||||
libv8 (~> 3.11.8.12)
|
libv8 (~> 3.11.8.12)
|
||||||
ref
|
ref
|
||||||
thor (0.20.3)
|
thor (0.20.3)
|
||||||
thread_safe (0.3.6)
|
thread_safe (0.3.6)
|
||||||
tilt (2.0.9)
|
tilt (2.0.9)
|
||||||
|
treetop (1.4.15)
|
||||||
|
polyglot
|
||||||
|
polyglot (>= 0.3.1)
|
||||||
turbolinks (1.3.0)
|
turbolinks (1.3.0)
|
||||||
coffee-rails
|
coffee-rails
|
||||||
twitter-bootstrap-rails (2.2.7)
|
twitter-bootstrap-rails (2.2.7)
|
||||||
@ -170,10 +181,10 @@ DEPENDENCIES
|
|||||||
jbuilder (~> 1.0.1)
|
jbuilder (~> 1.0.1)
|
||||||
jquery-rails
|
jquery-rails
|
||||||
kaminari-bootstrap
|
kaminari-bootstrap
|
||||||
less-rails (= 2.6.0)
|
less-rails (= 2.3.3)
|
||||||
mysql2
|
mysql2
|
||||||
nokogiri
|
nokogiri
|
||||||
rails (= 4.0.13)
|
rails (= 4.0.6)
|
||||||
rmagick
|
rmagick
|
||||||
rvm-capistrano
|
rvm-capistrano
|
||||||
sdoc
|
sdoc
|
||||||
|
Loading…
x
Reference in New Issue
Block a user