deploy
This commit is contained in:
parent
873e217d99
commit
ec689cf4d6
3
Gemfile
3
Gemfile
@ -68,3 +68,6 @@ gem 'acts_as_commentable'
|
||||
|
||||
# Use debugger
|
||||
# gem 'debugger', group: [:development, :test]
|
||||
|
||||
|
||||
gem 'net-ssh', '2.7.0'
|
||||
|
125
Gemfile.lock
125
Gemfile.lock
@ -1,9 +1,9 @@
|
||||
GIT
|
||||
remote: git://github.com/justinfrench/formtastic.git
|
||||
revision: cd6cb88f28ea7444267802ced8e5ec0f5cfd0f90
|
||||
revision: c79e46560d1516c6c3c0ef85fb29bed8e36068ac
|
||||
specs:
|
||||
formtastic (2.3.0.rc2)
|
||||
actionpack (>= 3.0)
|
||||
formtastic (2.3.0.rc3)
|
||||
actionpack (>= 3.2.13)
|
||||
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
@ -32,11 +32,10 @@ GEM
|
||||
multi_json (~> 1.3)
|
||||
thread_safe (~> 0.1)
|
||||
tzinfo (~> 0.3.37)
|
||||
acts_as_commentable (4.0.0)
|
||||
acts_as_tree (1.4.0)
|
||||
acts_as_commentable (4.0.1)
|
||||
acts_as_tree (1.5.1)
|
||||
activerecord (>= 3.0.0)
|
||||
arel (4.0.0)
|
||||
atomic (1.1.10)
|
||||
arel (4.0.2)
|
||||
bcrypt-ruby (3.0.1)
|
||||
builder (3.1.4)
|
||||
capistrano (2.15.5)
|
||||
@ -45,69 +44,69 @@ GEM
|
||||
net-sftp (>= 2.0.0)
|
||||
net-ssh (>= 2.0.14)
|
||||
net-ssh-gateway (>= 1.1.0)
|
||||
carrierwave (0.9.0)
|
||||
carrierwave (0.10.0)
|
||||
activemodel (>= 3.2.0)
|
||||
activesupport (>= 3.2.0)
|
||||
json (>= 1.7)
|
||||
coffee-rails (4.0.0)
|
||||
mime-types (>= 1.16)
|
||||
coffee-rails (4.0.1)
|
||||
coffee-script (>= 2.2.0)
|
||||
railties (>= 4.0.0.beta, < 5.0)
|
||||
railties (>= 4.0.0, < 5.0)
|
||||
coffee-script (2.2.0)
|
||||
coffee-script-source
|
||||
execjs
|
||||
coffee-script-source (1.6.3)
|
||||
commonjs (0.2.6)
|
||||
coffee-script-source (1.7.0)
|
||||
commonjs (0.2.7)
|
||||
erubis (2.7.0)
|
||||
execjs (1.4.0)
|
||||
multi_json (~> 1.0)
|
||||
haml (4.0.3)
|
||||
execjs (2.0.2)
|
||||
haml (4.0.5)
|
||||
tilt
|
||||
haml-rails (0.4)
|
||||
actionpack (>= 3.1, < 4.1)
|
||||
activesupport (>= 3.1, < 4.1)
|
||||
haml (>= 3.1, < 4.1)
|
||||
railties (>= 3.1, < 4.1)
|
||||
highline (1.6.19)
|
||||
haml-rails (0.5.1)
|
||||
actionpack (~> 4.0.0)
|
||||
activesupport (~> 4.0.0)
|
||||
haml (>= 3.1, < 5.0)
|
||||
railties (~> 4.0.0)
|
||||
highline (1.6.21)
|
||||
hike (1.2.3)
|
||||
htmlentities (4.3.1)
|
||||
i18n (0.6.4)
|
||||
i18n (0.6.9)
|
||||
jbuilder (1.0.2)
|
||||
activesupport (>= 3.0.0)
|
||||
jquery-rails (3.0.4)
|
||||
jquery-rails (3.1.0)
|
||||
railties (>= 3.0, < 5.0)
|
||||
thor (>= 0.14, < 2.0)
|
||||
json (1.8.0)
|
||||
kaminari (0.14.1)
|
||||
json (1.8.1)
|
||||
kaminari (0.15.1)
|
||||
actionpack (>= 3.0.0)
|
||||
activesupport (>= 3.0.0)
|
||||
kaminari-bootstrap (0.1.3)
|
||||
kaminari-bootstrap (3.0.1)
|
||||
kaminari (>= 0.13.0)
|
||||
rails
|
||||
kgio (2.8.0)
|
||||
less (2.3.2)
|
||||
commonjs (~> 0.2.6)
|
||||
less-rails (2.3.3)
|
||||
kgio (2.9.2)
|
||||
less (2.5.0)
|
||||
commonjs (~> 0.2.7)
|
||||
less-rails (2.5.0)
|
||||
actionpack (>= 3.1)
|
||||
less (~> 2.3.1)
|
||||
libv8 (3.11.8.17)
|
||||
less (~> 2.5.0)
|
||||
libv8 (3.16.14.3)
|
||||
mail (2.5.4)
|
||||
mime-types (~> 1.16)
|
||||
treetop (~> 1.4.8)
|
||||
mime-types (1.23)
|
||||
mini_portile (0.5.1)
|
||||
mime-types (1.25.1)
|
||||
mini_portile (0.5.3)
|
||||
minitest (4.7.5)
|
||||
multi_json (1.7.7)
|
||||
mysql2 (0.3.13)
|
||||
net-scp (1.1.2)
|
||||
multi_json (1.9.2)
|
||||
mysql2 (0.3.15)
|
||||
net-scp (1.2.0)
|
||||
net-ssh (>= 2.6.5)
|
||||
net-sftp (2.1.2)
|
||||
net-ssh (>= 2.6.5)
|
||||
net-ssh (2.6.8)
|
||||
net-ssh (2.7.0)
|
||||
net-ssh-gateway (1.2.0)
|
||||
net-ssh (>= 2.6.5)
|
||||
nokogiri (1.6.0)
|
||||
nokogiri (1.6.1)
|
||||
mini_portile (~> 0.5.0)
|
||||
polyglot (0.3.3)
|
||||
polyglot (0.3.4)
|
||||
rack (1.5.2)
|
||||
rack-test (0.6.2)
|
||||
rack (>= 1.0)
|
||||
@ -124,49 +123,48 @@ GEM
|
||||
activesupport (= 4.0.0)
|
||||
rake (>= 0.8.7)
|
||||
thor (>= 0.18.1, < 2.0)
|
||||
raindrops (0.11.0)
|
||||
rake (10.1.0)
|
||||
rdoc (3.12.2)
|
||||
raindrops (0.13.0)
|
||||
rake (10.3.0)
|
||||
rdoc (4.1.1)
|
||||
json (~> 1.4)
|
||||
ref (1.0.5)
|
||||
rmagick (2.13.2)
|
||||
rvm-capistrano (1.4.1)
|
||||
capistrano (>= 2.0.0)
|
||||
sdoc (0.3.20)
|
||||
json (>= 1.1.3)
|
||||
rdoc (~> 3.10)
|
||||
sprockets (2.10.0)
|
||||
rvm-capistrano (1.5.1)
|
||||
capistrano (~> 2.15.4)
|
||||
sdoc (0.4.0)
|
||||
json (~> 1.8)
|
||||
rdoc (~> 4.0, < 5.0)
|
||||
sprockets (2.12.0)
|
||||
hike (~> 1.2)
|
||||
multi_json (~> 1.0)
|
||||
rack (~> 1.0)
|
||||
tilt (~> 1.1, != 1.3.0)
|
||||
sprockets-rails (2.0.0)
|
||||
sprockets-rails (2.0.1)
|
||||
actionpack (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
sprockets (~> 2.8)
|
||||
sqlite3 (1.3.7)
|
||||
therubyracer (0.11.4)
|
||||
libv8 (~> 3.11.8.12)
|
||||
sqlite3 (1.3.9)
|
||||
therubyracer (0.12.1)
|
||||
libv8 (~> 3.16.14.0)
|
||||
ref
|
||||
thor (0.18.1)
|
||||
thread_safe (0.1.0)
|
||||
atomic
|
||||
thor (0.19.1)
|
||||
thread_safe (0.3.3)
|
||||
tilt (1.4.1)
|
||||
treetop (1.4.14)
|
||||
treetop (1.4.15)
|
||||
polyglot
|
||||
polyglot (>= 0.3.1)
|
||||
turbolinks (1.3.0)
|
||||
turbolinks (2.2.2)
|
||||
coffee-rails
|
||||
twitter-bootstrap-rails (2.2.7)
|
||||
twitter-bootstrap-rails (2.2.8)
|
||||
actionpack (>= 3.1)
|
||||
execjs
|
||||
rails (>= 3.1)
|
||||
railties (>= 3.1)
|
||||
tzinfo (0.3.37)
|
||||
uglifier (2.1.2)
|
||||
tzinfo (0.3.39)
|
||||
uglifier (2.5.0)
|
||||
execjs (>= 0.3.0)
|
||||
multi_json (~> 1.0, >= 1.0.2)
|
||||
unicorn (4.6.3)
|
||||
json (>= 1.8.0)
|
||||
unicorn (4.8.2)
|
||||
kgio (~> 2.6)
|
||||
rack
|
||||
raindrops (~> 0.7)
|
||||
@ -189,6 +187,7 @@ DEPENDENCIES
|
||||
kaminari-bootstrap
|
||||
less-rails
|
||||
mysql2
|
||||
net-ssh (= 2.7.0)
|
||||
nokogiri
|
||||
rails (= 4.0.0)
|
||||
rmagick
|
||||
|
@ -13,22 +13,21 @@
|
||||
#= require ./shared/responsiveslides.js
|
||||
|
||||
|
||||
$(window).load ->
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
$(document).ready ->
|
||||
if ( $("#top .menu").height() + 300 ) < $(window).height()
|
||||
|
||||
$(".contact").css("position", "absolute")
|
||||
|
||||
$(document).ready ->
|
||||
|
||||
|
||||
|
||||
$(".rslides").responsiveSlides
|
||||
prevText: "<img src='/arrow-prev.png'/>"
|
||||
nextText: "<img src='/arrow-next.png'/>"
|
||||
auto: false
|
||||
auto: true
|
||||
timeout: 2500
|
||||
pager: false
|
||||
nav: true
|
||||
|
@ -4,7 +4,6 @@ set :application, 'gs_app'
|
||||
set :domain, 'gs-production.fr'
|
||||
|
||||
set :user, 'web'
|
||||
set :password, "sio2web"
|
||||
set :scm_user, "git"
|
||||
set :scm_host, "gitlab.bally.me"
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user