Compare commits
2 Commits
5c95ddf339
...
41de696a45
Author | SHA1 | Date | |
---|---|---|---|
|
41de696a45 | ||
|
6fc86783ba |
2
Gemfile
2
Gemfile
@ -27,7 +27,7 @@ gem 'turbolinks'
|
|||||||
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
|
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
|
||||||
gem 'jbuilder', '~> 1.0.1'
|
gem 'jbuilder', '~> 1.0.1'
|
||||||
|
|
||||||
gem "therubyracer"
|
gem "therubyracer", group: :production
|
||||||
#gem "less-rails"
|
#gem "less-rails"
|
||||||
gem "sass-rails", "~> 4.0.3"
|
gem "sass-rails", "~> 4.0.3"
|
||||||
gem "twitter-bootstrap-rails"
|
gem "twitter-bootstrap-rails"
|
||||||
|
160
Gemfile.lock
160
Gemfile.lock
@ -1,5 +1,5 @@
|
|||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: http://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
actionmailer (4.0.9)
|
actionmailer (4.0.9)
|
||||||
actionpack (= 4.0.9)
|
actionpack (= 4.0.9)
|
||||||
@ -18,88 +18,103 @@ GEM
|
|||||||
activerecord-deprecated_finders (~> 1.0.2)
|
activerecord-deprecated_finders (~> 1.0.2)
|
||||||
activesupport (= 4.0.9)
|
activesupport (= 4.0.9)
|
||||||
arel (~> 4.0.0)
|
arel (~> 4.0.0)
|
||||||
activerecord-deprecated_finders (1.0.3)
|
activerecord-deprecated_finders (1.0.4)
|
||||||
activesupport (4.0.9)
|
activesupport (4.0.9)
|
||||||
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)
|
||||||
thread_safe (~> 0.1)
|
thread_safe (~> 0.1)
|
||||||
tzinfo (~> 0.3.37)
|
tzinfo (~> 0.3.37)
|
||||||
acts_as_tree (2.0.0)
|
acts_as_tree (2.9.1)
|
||||||
activerecord (>= 3.0.0)
|
activerecord (>= 3.0.0)
|
||||||
arel (4.0.2)
|
arel (4.0.2)
|
||||||
bcrypt (3.1.7)
|
bcrypt (3.1.16)
|
||||||
bcrypt-ruby (3.1.5)
|
bcrypt-ruby (3.1.5)
|
||||||
bcrypt (>= 3.1.3)
|
bcrypt (>= 3.1.3)
|
||||||
bootstrap3-kaminari-views (0.0.1)
|
bootstrap3-kaminari-views (0.0.1)
|
||||||
kaminari
|
kaminari
|
||||||
rails (~> 4.0.0)
|
rails (~> 4.0.0)
|
||||||
builder (3.1.4)
|
builder (3.1.4)
|
||||||
capistrano (2.15.5)
|
capistrano (2.15.9)
|
||||||
highline
|
highline
|
||||||
net-scp (>= 1.0.0)
|
net-scp (>= 1.0.0)
|
||||||
net-sftp (>= 2.0.0)
|
net-sftp (>= 2.0.0)
|
||||||
net-ssh (>= 2.0.14)
|
net-ssh (>= 2.0.14)
|
||||||
net-ssh-gateway (>= 1.1.0)
|
net-ssh-gateway (>= 1.1.0)
|
||||||
carrierwave (0.10.0)
|
carrierwave (1.3.2)
|
||||||
activemodel (>= 3.2.0)
|
activemodel (>= 4.0.0)
|
||||||
activesupport (>= 3.2.0)
|
activesupport (>= 4.0.0)
|
||||||
json (>= 1.7)
|
|
||||||
mime-types (>= 1.16)
|
mime-types (>= 1.16)
|
||||||
|
ssrf_filter (~> 1.0)
|
||||||
coffee-rails (4.0.1)
|
coffee-rails (4.0.1)
|
||||||
coffee-script (>= 2.2.0)
|
coffee-script (>= 2.2.0)
|
||||||
railties (>= 4.0.0, < 5.0)
|
railties (>= 4.0.0, < 5.0)
|
||||||
coffee-script (2.3.0)
|
coffee-script (2.4.1)
|
||||||
coffee-script-source
|
coffee-script-source
|
||||||
execjs
|
execjs
|
||||||
coffee-script-source (1.7.1)
|
coffee-script-source (1.12.2)
|
||||||
|
commonjs (0.2.7)
|
||||||
|
concurrent-ruby (1.1.8)
|
||||||
erubis (2.7.0)
|
erubis (2.7.0)
|
||||||
execjs (2.2.1)
|
execjs (2.8.1)
|
||||||
formtastic (2.3.0)
|
formtastic (3.1.5)
|
||||||
actionpack (>= 3.0)
|
actionpack (>= 3.2.13)
|
||||||
formtastic-bootstrap (3.0.0)
|
formtastic-bootstrap (3.1.1)
|
||||||
formtastic (>= 2.2)
|
formtastic (>= 3.0)
|
||||||
haml (4.0.5)
|
haml (5.2.1)
|
||||||
|
temple (>= 0.8.0)
|
||||||
tilt
|
tilt
|
||||||
haml-rails (0.5.3)
|
haml-rails (1.0.0)
|
||||||
actionpack (>= 4.0.1)
|
actionpack (>= 4.0.1)
|
||||||
activesupport (>= 4.0.1)
|
activesupport (>= 4.0.1)
|
||||||
haml (>= 3.1, < 5.0)
|
haml (>= 4.0.6, < 6.0)
|
||||||
|
html2haml (>= 1.0.1)
|
||||||
railties (>= 4.0.1)
|
railties (>= 4.0.1)
|
||||||
highline (1.6.21)
|
highline (2.0.3)
|
||||||
hike (1.2.3)
|
hike (1.2.3)
|
||||||
i18n (0.6.11)
|
html2haml (2.2.0)
|
||||||
|
erubis (~> 2.7.0)
|
||||||
|
haml (>= 4.0, < 6)
|
||||||
|
nokogiri (>= 1.6.0)
|
||||||
|
ruby_parser (~> 3.5)
|
||||||
|
i18n (0.9.5)
|
||||||
|
concurrent-ruby (~> 1.0)
|
||||||
jbuilder (1.0.2)
|
jbuilder (1.0.2)
|
||||||
activesupport (>= 3.0.0)
|
activesupport (>= 3.0.0)
|
||||||
jquery-rails (3.1.1)
|
jquery-rails (3.1.5)
|
||||||
railties (>= 3.0, < 5.0)
|
railties (>= 3.0, < 5.0)
|
||||||
thor (>= 0.14, < 2.0)
|
thor (>= 0.14, < 2.0)
|
||||||
json (1.8.1)
|
kaminari (0.17.0)
|
||||||
kaminari (0.16.1)
|
|
||||||
actionpack (>= 3.0.0)
|
actionpack (>= 3.0.0)
|
||||||
activesupport (>= 3.0.0)
|
activesupport (>= 3.0.0)
|
||||||
kgio (2.9.2)
|
kgio (2.11.3)
|
||||||
libv8 (3.16.14.3)
|
less (2.6.0)
|
||||||
mail (2.5.4)
|
commonjs (~> 0.2.7)
|
||||||
|
less-rails (4.0.0)
|
||||||
|
actionpack (>= 4)
|
||||||
|
less (~> 2.6.0)
|
||||||
|
sprockets (>= 2)
|
||||||
|
libv8 (3.16.14.19)
|
||||||
|
mail (2.5.5)
|
||||||
mime-types (~> 1.16)
|
mime-types (~> 1.16)
|
||||||
treetop (~> 1.4.8)
|
treetop (~> 1.4.8)
|
||||||
mime-types (1.25.1)
|
mime-types (1.25.1)
|
||||||
mini_portile (0.6.0)
|
mini_portile2 (2.4.0)
|
||||||
minitest (4.7.5)
|
minitest (4.7.5)
|
||||||
multi_json (1.10.1)
|
multi_json (1.15.0)
|
||||||
mysql2 (0.3.16)
|
mysql2 (0.4.10)
|
||||||
net-scp (1.2.1)
|
net-scp (3.0.0)
|
||||||
net-ssh (>= 2.6.5)
|
net-ssh (>= 2.6.5, < 7.0.0)
|
||||||
net-sftp (2.1.2)
|
net-sftp (2.1.2)
|
||||||
net-ssh (>= 2.6.5)
|
net-ssh (>= 2.6.5)
|
||||||
net-ssh (2.7.0)
|
net-ssh (2.7.0)
|
||||||
net-ssh-gateway (1.2.0)
|
net-ssh-gateway (1.3.0)
|
||||||
net-ssh (>= 2.6.5)
|
net-ssh (>= 2.6.5)
|
||||||
nokogiri (1.6.3.1)
|
nokogiri (1.10.10)
|
||||||
mini_portile (= 0.6.0)
|
mini_portile2 (~> 2.4.0)
|
||||||
polyglot (0.3.5)
|
polyglot (0.3.5)
|
||||||
rack (1.5.2)
|
rack (1.5.5)
|
||||||
rack-test (0.6.2)
|
rack-test (0.6.3)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
rails (4.0.9)
|
rails (4.0.9)
|
||||||
actionmailer (= 4.0.9)
|
actionmailer (= 4.0.9)
|
||||||
@ -114,56 +129,58 @@ GEM
|
|||||||
activesupport (= 4.0.9)
|
activesupport (= 4.0.9)
|
||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
thor (>= 0.18.1, < 2.0)
|
thor (>= 0.18.1, < 2.0)
|
||||||
raindrops (0.13.0)
|
raindrops (0.19.1)
|
||||||
rake (10.3.2)
|
rake (13.0.3)
|
||||||
rdoc (4.1.1)
|
rdoc (6.3.1)
|
||||||
json (~> 1.4)
|
ref (2.0.0)
|
||||||
ref (1.0.5)
|
rmagick (4.2.2)
|
||||||
rmagick (2.13.4)
|
ruby_parser (3.15.1)
|
||||||
rvm-capistrano (1.5.3)
|
sexp_processor (~> 4.9)
|
||||||
|
rvm-capistrano (1.5.6)
|
||||||
capistrano (~> 2.15.4)
|
capistrano (~> 2.15.4)
|
||||||
sass (3.2.19)
|
sass (3.2.19)
|
||||||
sass-rails (4.0.3)
|
sass-rails (4.0.5)
|
||||||
railties (>= 4.0.0, < 5.0)
|
railties (>= 4.0.0, < 5.0)
|
||||||
sass (~> 3.2.0)
|
sass (~> 3.2.2)
|
||||||
sprockets (~> 2.8, <= 2.11.0)
|
sprockets (~> 2.8, < 3.0)
|
||||||
sprockets-rails (~> 2.0)
|
sprockets-rails (~> 2.0)
|
||||||
sdoc (0.4.1)
|
sdoc (2.1.0)
|
||||||
json (~> 1.7, >= 1.7.7)
|
rdoc (>= 5.0)
|
||||||
rdoc (~> 4.0)
|
sexp_processor (4.15.2)
|
||||||
sprockets (2.11.0)
|
sprockets (2.12.5)
|
||||||
hike (~> 1.2)
|
hike (~> 1.2)
|
||||||
multi_json (~> 1.0)
|
multi_json (~> 1.0)
|
||||||
rack (~> 1.0)
|
rack (~> 1.0)
|
||||||
tilt (~> 1.1, != 1.3.0)
|
tilt (~> 1.1, != 1.3.0)
|
||||||
sprockets-rails (2.1.3)
|
sprockets-rails (2.3.3)
|
||||||
actionpack (>= 3.0)
|
actionpack (>= 3.0)
|
||||||
activesupport (>= 3.0)
|
activesupport (>= 3.0)
|
||||||
sprockets (~> 2.8)
|
sprockets (>= 2.8, < 4.0)
|
||||||
sqlite3 (1.3.9)
|
sqlite3 (1.4.2)
|
||||||
therubyracer (0.12.1)
|
ssrf_filter (1.0.7)
|
||||||
libv8 (~> 3.16.14.0)
|
temple (0.8.2)
|
||||||
|
therubyracer (0.12.3)
|
||||||
|
libv8 (~> 3.16.14.15)
|
||||||
ref
|
ref
|
||||||
thor (0.19.1)
|
thor (1.1.0)
|
||||||
thread_safe (0.3.4)
|
thread_safe (0.3.6)
|
||||||
tilt (1.4.1)
|
tilt (1.4.1)
|
||||||
treetop (1.4.15)
|
treetop (1.4.15)
|
||||||
polyglot
|
polyglot
|
||||||
polyglot (>= 0.3.1)
|
polyglot (>= 0.3.1)
|
||||||
turbolinks (2.3.0)
|
turbolinks (5.2.1)
|
||||||
coffee-rails
|
turbolinks-source (~> 5.2)
|
||||||
twitter-bootstrap-rails (2.2.8)
|
turbolinks-source (5.2.0)
|
||||||
|
twitter-bootstrap-rails (3.2.2)
|
||||||
actionpack (>= 3.1)
|
actionpack (>= 3.1)
|
||||||
execjs
|
execjs (>= 2.2.2, >= 2.2)
|
||||||
rails (>= 3.1)
|
less-rails (>= 2.5.0)
|
||||||
railties (>= 3.1)
|
railties (>= 3.1)
|
||||||
tzinfo (0.3.41)
|
tzinfo (0.3.60)
|
||||||
uglifier (2.5.3)
|
uglifier (4.2.0)
|
||||||
execjs (>= 0.3.0)
|
execjs (>= 0.3.0, < 3)
|
||||||
json (>= 1.8.0)
|
unicorn (6.0.0)
|
||||||
unicorn (4.8.3)
|
|
||||||
kgio (~> 2.6)
|
kgio (~> 2.6)
|
||||||
rack
|
|
||||||
raindrops (~> 0.7)
|
raindrops (~> 0.7)
|
||||||
|
|
||||||
PLATFORMS
|
PLATFORMS
|
||||||
@ -182,7 +199,7 @@ DEPENDENCIES
|
|||||||
jbuilder (~> 1.0.1)
|
jbuilder (~> 1.0.1)
|
||||||
jquery-rails
|
jquery-rails
|
||||||
kaminari
|
kaminari
|
||||||
mysql2
|
mysql2 (= 0.4.10)
|
||||||
net-ssh (~> 2.7.0)
|
net-ssh (~> 2.7.0)
|
||||||
nokogiri
|
nokogiri
|
||||||
rails (= 4.0.9)
|
rails (= 4.0.9)
|
||||||
@ -196,3 +213,6 @@ DEPENDENCIES
|
|||||||
twitter-bootstrap-rails
|
twitter-bootstrap-rails
|
||||||
uglifier (>= 1.3.0)
|
uglifier (>= 1.3.0)
|
||||||
unicorn
|
unicorn
|
||||||
|
|
||||||
|
BUNDLED WITH
|
||||||
|
1.17.3
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
APP_RUBY=2.1.2
|
APP_RUBY=2.6.0
|
||||||
ENV=production
|
ENV=production
|
||||||
APP_ROOT=/srv/www/web/ual_app/current/
|
APP_ROOT=/srv/www/web/ual_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