suite
This commit is contained in:
parent
89bd30a5d3
commit
777006e61d
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.1'
|
gem 'rails', '4.0.5'
|
||||||
|
|
||||||
|
|
||||||
#gem 'bcrypt', '~> 3.1.7'
|
#gem 'bcrypt', '~> 3.1.7'
|
||||||
@ -46,7 +46,7 @@ gem 'kaminari-bootstrap'
|
|||||||
gem "htmlentities"
|
gem "htmlentities"
|
||||||
|
|
||||||
gem 'carrierwave'
|
gem 'carrierwave'
|
||||||
gem 'rmagick'
|
gem 'rmagick', "2.16.0"
|
||||||
|
|
||||||
group :doc do
|
group :doc do
|
||||||
# bundle exec rake doc:rails generates the API under doc/api.
|
# bundle exec rake doc:rails generates the API under doc/api.
|
||||||
|
59
Gemfile.lock
59
Gemfile.lock
@ -8,26 +8,26 @@ GIT
|
|||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
actionmailer (4.0.1)
|
actionmailer (4.0.5)
|
||||||
actionpack (= 4.0.1)
|
actionpack (= 4.0.5)
|
||||||
mail (~> 2.5.4)
|
mail (~> 2.5.4)
|
||||||
actionpack (4.0.1)
|
actionpack (4.0.5)
|
||||||
activesupport (= 4.0.1)
|
activesupport (= 4.0.5)
|
||||||
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.1)
|
activemodel (4.0.5)
|
||||||
activesupport (= 4.0.1)
|
activesupport (= 4.0.5)
|
||||||
builder (~> 3.1.0)
|
builder (~> 3.1.0)
|
||||||
activerecord (4.0.1)
|
activerecord (4.0.5)
|
||||||
activemodel (= 4.0.1)
|
activemodel (= 4.0.5)
|
||||||
activerecord-deprecated_finders (~> 1.0.2)
|
activerecord-deprecated_finders (~> 1.0.2)
|
||||||
activesupport (= 4.0.1)
|
activesupport (= 4.0.5)
|
||||||
arel (~> 4.0.0)
|
arel (~> 4.0.0)
|
||||||
activerecord-deprecated_finders (1.0.4)
|
activerecord-deprecated_finders (1.0.4)
|
||||||
activesupport (4.0.1)
|
activesupport (4.0.5)
|
||||||
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)
|
||||||
@ -56,7 +56,7 @@ GEM
|
|||||||
coffee-script-source
|
coffee-script-source
|
||||||
execjs
|
execjs
|
||||||
coffee-script-source (1.6.3)
|
coffee-script-source (1.6.3)
|
||||||
commonjs (0.2.6)
|
commonjs (0.2.7)
|
||||||
concurrent-ruby (1.1.5)
|
concurrent-ruby (1.1.5)
|
||||||
erubis (2.7.0)
|
erubis (2.7.0)
|
||||||
execjs (1.4.0)
|
execjs (1.4.0)
|
||||||
@ -86,11 +86,12 @@ GEM
|
|||||||
kaminari (>= 0.13.0)
|
kaminari (>= 0.13.0)
|
||||||
rails
|
rails
|
||||||
kgio (2.11.2)
|
kgio (2.11.2)
|
||||||
less (2.3.2)
|
less (2.6.0)
|
||||||
commonjs (~> 0.2.6)
|
commonjs (~> 0.2.7)
|
||||||
less-rails (2.3.3)
|
less-rails (4.0.0)
|
||||||
actionpack (>= 3.1)
|
actionpack (>= 4)
|
||||||
less (~> 2.3.1)
|
less (~> 2.6.0)
|
||||||
|
sprockets (>= 2)
|
||||||
libv8 (3.16.14.19)
|
libv8 (3.16.14.19)
|
||||||
mail (2.5.5)
|
mail (2.5.5)
|
||||||
mime-types (~> 1.16)
|
mime-types (~> 1.16)
|
||||||
@ -113,17 +114,17 @@ GEM
|
|||||||
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.1)
|
rails (4.0.5)
|
||||||
actionmailer (= 4.0.1)
|
actionmailer (= 4.0.5)
|
||||||
actionpack (= 4.0.1)
|
actionpack (= 4.0.5)
|
||||||
activerecord (= 4.0.1)
|
activerecord (= 4.0.5)
|
||||||
activesupport (= 4.0.1)
|
activesupport (= 4.0.5)
|
||||||
bundler (>= 1.3.0, < 2.0)
|
bundler (>= 1.3.0, < 2.0)
|
||||||
railties (= 4.0.1)
|
railties (= 4.0.5)
|
||||||
sprockets-rails (~> 2.0.0)
|
sprockets-rails (~> 2.0.0)
|
||||||
railties (4.0.1)
|
railties (4.0.5)
|
||||||
actionpack (= 4.0.1)
|
actionpack (= 4.0.5)
|
||||||
activesupport (= 4.0.1)
|
activesupport (= 4.0.5)
|
||||||
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)
|
||||||
@ -131,7 +132,7 @@ GEM
|
|||||||
rdoc (3.12.2)
|
rdoc (3.12.2)
|
||||||
json (~> 1.4)
|
json (~> 1.4)
|
||||||
ref (2.0.0)
|
ref (2.0.0)
|
||||||
rmagick (3.1.0)
|
rmagick (2.16.0)
|
||||||
rvm-capistrano (1.4.1)
|
rvm-capistrano (1.4.1)
|
||||||
capistrano (>= 2.0.0)
|
capistrano (>= 2.0.0)
|
||||||
sdoc (0.3.20)
|
sdoc (0.3.20)
|
||||||
@ -188,8 +189,8 @@ DEPENDENCIES
|
|||||||
less-rails
|
less-rails
|
||||||
mysql2
|
mysql2
|
||||||
nokogiri
|
nokogiri
|
||||||
rails (= 4.0.1)
|
rails (= 4.0.5)
|
||||||
rmagick
|
rmagick (= 2.16.0)
|
||||||
rvm-capistrano
|
rvm-capistrano
|
||||||
sdoc
|
sdoc
|
||||||
therubyracer
|
therubyracer
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
set :rvm_ruby_string, 'ruby-2.3.0'
|
set :rvm_ruby_string, 'ruby-2.1.2'
|
||||||
set :application, 'blog_eft_app'
|
set :application, 'blog_eft_app'
|
||||||
set :domain, 'quartz-www02.sysnove.net'
|
set :domain, 'quartz-www02.sysnove.net'
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
APP_RUBY=2.3.0
|
APP_RUBY=2.1.2
|
||||||
ENV=production
|
ENV=production
|
||||||
APP_ROOT=/srv/www/web/blog_eft_app/current/
|
APP_ROOT=/srv/www/web/blog_eft_app/current/
|
||||||
GEM_HOME=/srv/www/web/.rvm/gems/ruby-$APP_RUBY
|
GEM_HOME=/srv/www/web/.rvm/gems/ruby-$APP_RUBY
|
||||||
|
Loading…
x
Reference in New Issue
Block a user