Revert to unbroken state
This commit is contained in:
Rien Maertens
parent
fa331f8a76
commit
e22953c41b
8 changed files with 192 additions and 183 deletions
|
|
@ -1 +1 @@
|
||||||
2.5.0
|
2.3.0-dev
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
sudo: false
|
sudo: false
|
||||||
language: ruby
|
language: ruby
|
||||||
rvm:
|
rvm:
|
||||||
- 2.5.0
|
- 2.2.0
|
||||||
|
|
||||||
before_script:
|
before_script:
|
||||||
- "RAILS_ENV=test bundle exec rake db:create"
|
- "RAILS_ENV=test bundle exec rake db:create"
|
||||||
|
|
|
||||||
2
Capfile
2
Capfile
|
|
@ -3,8 +3,6 @@ require 'capistrano/setup'
|
||||||
|
|
||||||
# Includes default deployment tasks
|
# Includes default deployment tasks
|
||||||
require 'capistrano/deploy'
|
require 'capistrano/deploy'
|
||||||
require "capistrano/scm/git"
|
|
||||||
install_plugin Capistrano::SCM::Git
|
|
||||||
|
|
||||||
require 'capistrano/rails'
|
require 'capistrano/rails'
|
||||||
require 'capistrano/rbenv'
|
require 'capistrano/rbenv'
|
||||||
|
|
|
||||||
6
Gemfile
6
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.2.8'
|
gem 'rails', '4.2.4'
|
||||||
|
|
||||||
# Assets
|
# Assets
|
||||||
gem 'sass-rails', '~> 4.0.3'
|
gem 'sass-rails', '~> 4.0.3'
|
||||||
|
|
@ -23,7 +23,7 @@ group :doc do
|
||||||
end
|
end
|
||||||
|
|
||||||
group :production do
|
group :production do
|
||||||
gem 'mysql2', '< 0.5', '>= 0.3.13' # Database
|
gem 'mysql2', '~> 0.3.18' # Database
|
||||||
end
|
end
|
||||||
|
|
||||||
group :test do
|
group :test do
|
||||||
|
|
@ -77,7 +77,7 @@ gem 'identicon'
|
||||||
|
|
||||||
# Run stuff in the background
|
# Run stuff in the background
|
||||||
gem 'daemons'
|
gem 'daemons'
|
||||||
gem 'delayed_job', '4.1.4'
|
gem 'delayed_job', '~> 4.0'
|
||||||
gem 'delayed_job_active_record'
|
gem 'delayed_job_active_record'
|
||||||
|
|
||||||
gem 'httparty'
|
gem 'httparty'
|
||||||
|
|
|
||||||
351
Gemfile.lock
351
Gemfile.lock
|
|
@ -1,121 +1,130 @@
|
||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
actionmailer (4.2.10)
|
actionmailer (4.2.4)
|
||||||
actionpack (= 4.2.10)
|
actionpack (= 4.2.4)
|
||||||
actionview (= 4.2.10)
|
actionview (= 4.2.4)
|
||||||
activejob (= 4.2.10)
|
activejob (= 4.2.4)
|
||||||
mail (~> 2.5, >= 2.5.4)
|
mail (~> 2.5, >= 2.5.4)
|
||||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||||
actionpack (4.2.10)
|
actionpack (4.2.4)
|
||||||
actionview (= 4.2.10)
|
actionview (= 4.2.4)
|
||||||
activesupport (= 4.2.10)
|
activesupport (= 4.2.4)
|
||||||
rack (~> 1.6)
|
rack (~> 1.6)
|
||||||
rack-test (~> 0.6.2)
|
rack-test (~> 0.6.2)
|
||||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||||
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
||||||
actionview (4.2.10)
|
actionview (4.2.4)
|
||||||
activesupport (= 4.2.10)
|
activesupport (= 4.2.4)
|
||||||
builder (~> 3.1)
|
builder (~> 3.1)
|
||||||
erubis (~> 2.7.0)
|
erubis (~> 2.7.0)
|
||||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||||
rails-html-sanitizer (~> 1.0, >= 1.0.3)
|
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
||||||
activejob (4.2.10)
|
activejob (4.2.4)
|
||||||
activesupport (= 4.2.10)
|
activesupport (= 4.2.4)
|
||||||
globalid (>= 0.3.0)
|
globalid (>= 0.3.0)
|
||||||
activemodel (4.2.10)
|
activemodel (4.2.4)
|
||||||
activesupport (= 4.2.10)
|
activesupport (= 4.2.4)
|
||||||
builder (~> 3.1)
|
builder (~> 3.1)
|
||||||
activerecord (4.2.10)
|
activerecord (4.2.4)
|
||||||
activemodel (= 4.2.10)
|
activemodel (= 4.2.4)
|
||||||
activesupport (= 4.2.10)
|
activesupport (= 4.2.4)
|
||||||
arel (~> 6.0)
|
arel (~> 6.0)
|
||||||
activesupport (4.2.10)
|
activesupport (4.2.4)
|
||||||
i18n (~> 0.7)
|
i18n (~> 0.7)
|
||||||
|
json (~> 1.7, >= 1.7.7)
|
||||||
minitest (~> 5.1)
|
minitest (~> 5.1)
|
||||||
thread_safe (~> 0.3, >= 0.3.4)
|
thread_safe (~> 0.3, >= 0.3.4)
|
||||||
tzinfo (~> 1.1)
|
tzinfo (~> 1.1)
|
||||||
addressable (2.5.2)
|
addressable (2.4.0)
|
||||||
public_suffix (>= 2.0.2, < 4.0)
|
airbrake (4.3.5)
|
||||||
airbrake (4.3.8)
|
|
||||||
builder
|
builder
|
||||||
multi_json
|
multi_json
|
||||||
airbrussh (1.3.0)
|
annotate (2.7.0)
|
||||||
sshkit (>= 1.6.1, != 1.7.0)
|
|
||||||
annotate (2.7.4)
|
|
||||||
activerecord (>= 3.2, < 6.0)
|
activerecord (>= 3.2, < 6.0)
|
||||||
rake (>= 10.4, < 13.0)
|
rake (~> 10.4)
|
||||||
arel (6.0.4)
|
arel (6.0.3)
|
||||||
bcrypt (3.1.12)
|
bcrypt (3.1.10)
|
||||||
bootstrap-sass (3.2.0.0)
|
bootstrap-sass (3.2.0.0)
|
||||||
sass (~> 3.2)
|
sass (~> 3.2)
|
||||||
bootstrap-switch-rails (3.3.4)
|
bootstrap-switch-rails (3.3.3)
|
||||||
bootstrap-will_paginate (0.0.10)
|
bootstrap-will_paginate (0.0.10)
|
||||||
will_paginate
|
will_paginate
|
||||||
builder (3.2.3)
|
builder (3.2.2)
|
||||||
cancancan (2.2.0)
|
cancancan (1.13.1)
|
||||||
capistrano (3.11.0)
|
capistrano (3.4.0)
|
||||||
airbrussh (>= 1.0.0)
|
|
||||||
i18n
|
i18n
|
||||||
rake (>= 10.0.0)
|
rake (>= 10.0.0)
|
||||||
sshkit (>= 1.9.0)
|
sshkit (~> 1.3)
|
||||||
capistrano-bundler (1.3.0)
|
capistrano-bundler (1.1.4)
|
||||||
capistrano (~> 3.1)
|
capistrano (~> 3.1)
|
||||||
sshkit (~> 1.2)
|
sshkit (~> 1.2)
|
||||||
capistrano-passenger (0.2.0)
|
capistrano-passenger (0.2.0)
|
||||||
capistrano (~> 3.0)
|
capistrano (~> 3.0)
|
||||||
capistrano-rails (1.4.0)
|
capistrano-rails (1.1.6)
|
||||||
capistrano (~> 3.1)
|
capistrano (~> 3.1)
|
||||||
capistrano-bundler (~> 1.1)
|
capistrano-bundler (~> 1.1)
|
||||||
capistrano-rbenv (2.1.3)
|
capistrano-rbenv (2.0.4)
|
||||||
capistrano (~> 3.1)
|
capistrano (~> 3.1)
|
||||||
sshkit (~> 1.3)
|
sshkit (~> 1.3)
|
||||||
capistrano-rvm (0.1.2)
|
capistrano-rvm (0.1.2)
|
||||||
capistrano (~> 3.0)
|
capistrano (~> 3.0)
|
||||||
sshkit (~> 1.2)
|
sshkit (~> 1.2)
|
||||||
chunky_png (1.3.10)
|
chunky_png (1.3.5)
|
||||||
climate_control (0.2.0)
|
climate_control (0.0.3)
|
||||||
codeclimate-test-reporter (1.0.8)
|
activesupport (>= 3.0)
|
||||||
simplecov (<= 0.13)
|
cocaine (0.5.8)
|
||||||
concurrent-ruby (1.0.5)
|
climate_control (>= 0.0.3, < 1.0)
|
||||||
coveralls (0.8.19)
|
codeclimate-test-reporter (0.4.8)
|
||||||
json (>= 1.8, < 3)
|
simplecov (>= 0.7.1, < 1.0.0)
|
||||||
simplecov (~> 0.12.0)
|
coffee-rails (4.1.1)
|
||||||
|
coffee-script (>= 2.2.0)
|
||||||
|
railties (>= 4.0.0, < 5.1.x)
|
||||||
|
coffee-script (2.4.1)
|
||||||
|
coffee-script-source
|
||||||
|
execjs
|
||||||
|
coffee-script-source (1.10.0)
|
||||||
|
coveralls (0.8.10)
|
||||||
|
json (~> 1.8)
|
||||||
|
rest-client (>= 1.6.8, < 2)
|
||||||
|
simplecov (~> 0.11.0)
|
||||||
term-ansicolor (~> 1.3)
|
term-ansicolor (~> 1.3)
|
||||||
thor (~> 0.19.1)
|
thor (~> 0.19.1)
|
||||||
tins (~> 1.6)
|
tins (~> 1.6.0)
|
||||||
crack (0.4.3)
|
crack (0.4.3)
|
||||||
safe_yaml (~> 1.0.0)
|
safe_yaml (~> 1.0.0)
|
||||||
crass (1.0.4)
|
daemons (1.2.3)
|
||||||
daemons (1.2.6)
|
delayed_job (4.1.1)
|
||||||
delayed_job (4.1.4)
|
activesupport (>= 3.0, < 5.0)
|
||||||
activesupport (>= 3.0, < 5.2)
|
delayed_job_active_record (4.1.0)
|
||||||
delayed_job_active_record (4.1.3)
|
activerecord (>= 3.0, < 5)
|
||||||
activerecord (>= 3.0, < 5.3)
|
|
||||||
delayed_job (>= 3.0, < 5)
|
delayed_job (>= 3.0, < 5)
|
||||||
devise (4.4.3)
|
devise (3.5.6)
|
||||||
bcrypt (~> 3.0)
|
bcrypt (~> 3.0)
|
||||||
orm_adapter (~> 0.1)
|
orm_adapter (~> 0.1)
|
||||||
railties (>= 4.1.0, < 6.0)
|
railties (>= 3.2.6, < 5)
|
||||||
responders
|
responders
|
||||||
|
thread_safe (~> 0.1)
|
||||||
warden (~> 1.2.3)
|
warden (~> 1.2.3)
|
||||||
diff-lcs (1.3)
|
diff-lcs (1.2.5)
|
||||||
docile (1.1.5)
|
docile (1.1.5)
|
||||||
|
domain_name (0.5.20160128)
|
||||||
|
unf (>= 0.0.5, < 1.0.0)
|
||||||
erubis (2.7.0)
|
erubis (2.7.0)
|
||||||
execjs (2.7.0)
|
execjs (2.6.0)
|
||||||
factory_girl (4.9.0)
|
factory_girl (4.5.0)
|
||||||
activesupport (>= 3.0.0)
|
activesupport (>= 3.0.0)
|
||||||
factory_girl_rails (4.9.0)
|
factory_girl_rails (4.6.0)
|
||||||
factory_girl (~> 4.9.0)
|
factory_girl (~> 4.5.0)
|
||||||
railties (>= 3.0.0)
|
railties (>= 3.0.0)
|
||||||
faker (1.4.2)
|
faker (1.4.2)
|
||||||
i18n (~> 0.5)
|
i18n (~> 0.5)
|
||||||
faraday (0.12.2)
|
faraday (0.9.2)
|
||||||
multipart-post (>= 1.2, < 3)
|
multipart-post (>= 1.2, < 3)
|
||||||
friendly_id (5.1.0)
|
friendly_id (5.1.0)
|
||||||
activerecord (>= 4.0.0)
|
activerecord (>= 4.0.0)
|
||||||
globalid (0.4.1)
|
globalid (0.3.6)
|
||||||
activesupport (>= 4.2.0)
|
activesupport (>= 4.1.0)
|
||||||
haml (4.0.7)
|
haml (4.0.7)
|
||||||
tilt
|
tilt
|
||||||
haml-rails (0.9.0)
|
haml-rails (0.9.0)
|
||||||
|
|
@ -124,118 +133,120 @@ GEM
|
||||||
haml (>= 4.0.6, < 5.0)
|
haml (>= 4.0.6, < 5.0)
|
||||||
html2haml (>= 1.0.1)
|
html2haml (>= 1.0.1)
|
||||||
railties (>= 4.0.1)
|
railties (>= 4.0.1)
|
||||||
hashdiff (0.3.7)
|
hashdiff (0.2.3)
|
||||||
hashie (3.5.7)
|
hashie (3.4.3)
|
||||||
hike (1.2.3)
|
hike (1.2.3)
|
||||||
html2haml (2.2.0)
|
html2haml (2.0.0)
|
||||||
erubis (~> 2.7.0)
|
erubis (~> 2.7.0)
|
||||||
haml (>= 4.0, < 6)
|
haml (~> 4.0.0)
|
||||||
nokogiri (>= 1.6.0)
|
nokogiri (~> 1.6.0)
|
||||||
ruby_parser (~> 3.5)
|
ruby_parser (~> 3.5)
|
||||||
httparty (0.16.2)
|
http-cookie (1.0.2)
|
||||||
|
domain_name (~> 0.5)
|
||||||
|
httparty (0.13.7)
|
||||||
|
json (~> 1.8)
|
||||||
multi_xml (>= 0.5.2)
|
multi_xml (>= 0.5.2)
|
||||||
i18n (0.9.5)
|
i18n (0.7.0)
|
||||||
concurrent-ruby (~> 1.0)
|
|
||||||
identicon (0.0.5)
|
identicon (0.0.5)
|
||||||
chunky_png
|
chunky_png
|
||||||
jquery-rails (4.3.3)
|
jquery-rails (4.1.0)
|
||||||
rails-dom-testing (>= 1, < 3)
|
rails-dom-testing (~> 1.0)
|
||||||
railties (>= 4.2.0)
|
railties (>= 4.2.0)
|
||||||
thor (>= 0.14, < 2.0)
|
thor (>= 0.14, < 2.0)
|
||||||
json (1.8.6)
|
json (1.8.3)
|
||||||
jwt (1.5.6)
|
jwt (1.5.1)
|
||||||
loofah (2.2.2)
|
loofah (2.0.3)
|
||||||
crass (~> 1.0.2)
|
|
||||||
nokogiri (>= 1.5.9)
|
nokogiri (>= 1.5.9)
|
||||||
mail (2.7.0)
|
mail (2.6.3)
|
||||||
mini_mime (>= 0.1.1)
|
mime-types (>= 1.16, < 3)
|
||||||
mime-types (3.1)
|
mime-types (2.99)
|
||||||
mime-types-data (~> 3.2015)
|
mimemagic (0.3.0)
|
||||||
mime-types-data (3.2016.0521)
|
mini_portile2 (2.0.0)
|
||||||
mimemagic (0.3.2)
|
minitest (5.8.4)
|
||||||
mini_mime (1.0.0)
|
multi_json (1.11.2)
|
||||||
mini_portile2 (2.3.0)
|
multi_xml (0.5.5)
|
||||||
minitest (5.11.3)
|
|
||||||
multi_json (1.13.1)
|
|
||||||
multi_xml (0.6.0)
|
|
||||||
multipart-post (2.0.0)
|
multipart-post (2.0.0)
|
||||||
mysql2 (0.4.10)
|
mysql2 (0.3.20)
|
||||||
net-scp (1.2.1)
|
net-scp (1.2.1)
|
||||||
net-ssh (>= 2.6.5)
|
net-ssh (>= 2.6.5)
|
||||||
net-ssh (5.0.2)
|
net-ssh (3.0.2)
|
||||||
nokogiri (1.8.4)
|
netrc (0.11.0)
|
||||||
mini_portile2 (~> 2.3.0)
|
nokogiri (1.6.7.2)
|
||||||
oauth2 (1.4.0)
|
mini_portile2 (~> 2.0.0.rc2)
|
||||||
faraday (>= 0.8, < 0.13)
|
oauth2 (1.1.0)
|
||||||
jwt (~> 1.0)
|
faraday (>= 0.8, < 0.10)
|
||||||
|
jwt (~> 1.0, < 1.5.2)
|
||||||
multi_json (~> 1.3)
|
multi_json (~> 1.3)
|
||||||
multi_xml (~> 0.5)
|
multi_xml (~> 0.5)
|
||||||
rack (>= 1.2, < 3)
|
rack (>= 1.2, < 3)
|
||||||
omniauth (1.8.1)
|
omniauth (1.3.1)
|
||||||
hashie (>= 3.4.6, < 3.6.0)
|
hashie (>= 1.2, < 4)
|
||||||
rack (>= 1.6.2, < 3)
|
rack (>= 1.0, < 3)
|
||||||
omniauth-oauth2 (1.3.1)
|
omniauth-oauth2 (1.3.1)
|
||||||
oauth2 (~> 1.0)
|
oauth2 (~> 1.0)
|
||||||
omniauth (~> 1.2)
|
omniauth (~> 1.2)
|
||||||
orm_adapter (0.5.0)
|
orm_adapter (0.5.0)
|
||||||
paperclip (6.0.0)
|
paperclip (4.3.4)
|
||||||
activemodel (>= 4.2.0)
|
activemodel (>= 3.2.0)
|
||||||
activesupport (>= 4.2.0)
|
activesupport (>= 3.2.0)
|
||||||
|
cocaine (~> 0.5.5)
|
||||||
mime-types
|
mime-types
|
||||||
mimemagic (~> 0.3.0)
|
mimemagic (= 0.3.0)
|
||||||
terrapin (~> 0.6.0)
|
rack (1.6.4)
|
||||||
public_suffix (3.0.2)
|
|
||||||
rack (1.6.10)
|
|
||||||
rack-test (0.6.3)
|
rack-test (0.6.3)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
rails (4.2.10)
|
rails (4.2.4)
|
||||||
actionmailer (= 4.2.10)
|
actionmailer (= 4.2.4)
|
||||||
actionpack (= 4.2.10)
|
actionpack (= 4.2.4)
|
||||||
actionview (= 4.2.10)
|
actionview (= 4.2.4)
|
||||||
activejob (= 4.2.10)
|
activejob (= 4.2.4)
|
||||||
activemodel (= 4.2.10)
|
activemodel (= 4.2.4)
|
||||||
activerecord (= 4.2.10)
|
activerecord (= 4.2.4)
|
||||||
activesupport (= 4.2.10)
|
activesupport (= 4.2.4)
|
||||||
bundler (>= 1.3.0, < 2.0)
|
bundler (>= 1.3.0, < 2.0)
|
||||||
railties (= 4.2.10)
|
railties (= 4.2.4)
|
||||||
sprockets-rails
|
sprockets-rails
|
||||||
rails-deprecated_sanitizer (1.0.3)
|
rails-deprecated_sanitizer (1.0.3)
|
||||||
activesupport (>= 4.2.0.alpha)
|
activesupport (>= 4.2.0.alpha)
|
||||||
rails-dom-testing (1.0.9)
|
rails-dom-testing (1.0.7)
|
||||||
activesupport (>= 4.2.0, < 5.0)
|
activesupport (>= 4.2.0.beta, < 5.0)
|
||||||
nokogiri (~> 1.6)
|
nokogiri (~> 1.6.0)
|
||||||
rails-deprecated_sanitizer (>= 1.0.1)
|
rails-deprecated_sanitizer (>= 1.0.1)
|
||||||
rails-html-sanitizer (1.0.4)
|
rails-html-sanitizer (1.0.3)
|
||||||
loofah (~> 2.2, >= 2.2.2)
|
loofah (~> 2.0)
|
||||||
railties (4.2.10)
|
railties (4.2.4)
|
||||||
actionpack (= 4.2.10)
|
actionpack (= 4.2.4)
|
||||||
activesupport (= 4.2.10)
|
activesupport (= 4.2.4)
|
||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
thor (>= 0.18.1, < 2.0)
|
thor (>= 0.18.1, < 2.0)
|
||||||
rake (12.3.1)
|
rake (10.5.0)
|
||||||
rdoc (4.3.0)
|
rdoc (4.2.1)
|
||||||
responders (2.4.0)
|
json (~> 1.4)
|
||||||
actionpack (>= 4.2.0, < 5.3)
|
responders (2.1.1)
|
||||||
railties (>= 4.2.0, < 5.3)
|
railties (>= 4.2.0, < 5.1)
|
||||||
rspec-core (3.7.1)
|
rest-client (1.8.0)
|
||||||
rspec-support (~> 3.7.0)
|
http-cookie (>= 1.0.2, < 2.0)
|
||||||
rspec-expectations (3.7.0)
|
mime-types (>= 1.16, < 3.0)
|
||||||
|
netrc (~> 0.7)
|
||||||
|
rspec-core (3.4.2)
|
||||||
|
rspec-support (~> 3.4.0)
|
||||||
|
rspec-expectations (3.4.0)
|
||||||
diff-lcs (>= 1.2.0, < 2.0)
|
diff-lcs (>= 1.2.0, < 2.0)
|
||||||
rspec-support (~> 3.7.0)
|
rspec-support (~> 3.4.0)
|
||||||
rspec-mocks (3.7.0)
|
rspec-mocks (3.4.1)
|
||||||
diff-lcs (>= 1.2.0, < 2.0)
|
diff-lcs (>= 1.2.0, < 2.0)
|
||||||
rspec-support (~> 3.7.0)
|
rspec-support (~> 3.4.0)
|
||||||
rspec-rails (3.7.2)
|
rspec-rails (3.4.2)
|
||||||
actionpack (>= 3.0)
|
actionpack (>= 3.0, < 4.3)
|
||||||
activesupport (>= 3.0)
|
activesupport (>= 3.0, < 4.3)
|
||||||
railties (>= 3.0)
|
railties (>= 3.0, < 4.3)
|
||||||
rspec-core (~> 3.7.0)
|
rspec-core (~> 3.4.0)
|
||||||
rspec-expectations (~> 3.7.0)
|
rspec-expectations (~> 3.4.0)
|
||||||
rspec-mocks (~> 3.7.0)
|
rspec-mocks (~> 3.4.0)
|
||||||
rspec-support (~> 3.7.0)
|
rspec-support (~> 3.4.0)
|
||||||
rspec-support (3.7.1)
|
rspec-support (3.4.1)
|
||||||
ruby_parser (3.11.0)
|
ruby_parser (3.7.3)
|
||||||
sexp_processor (~> 4.9)
|
sexp_processor (~> 4.1)
|
||||||
safe_yaml (1.0.4)
|
safe_yaml (1.0.4)
|
||||||
sass (3.2.19)
|
sass (3.2.19)
|
||||||
sass-rails (4.0.5)
|
sass-rails (4.0.5)
|
||||||
|
|
@ -243,18 +254,17 @@ GEM
|
||||||
sass (~> 3.2.2)
|
sass (~> 3.2.2)
|
||||||
sprockets (~> 2.8, < 3.0)
|
sprockets (~> 2.8, < 3.0)
|
||||||
sprockets-rails (~> 2.0)
|
sprockets-rails (~> 2.0)
|
||||||
sdoc (0.4.2)
|
sdoc (0.4.1)
|
||||||
json (~> 1.7, >= 1.7.7)
|
json (~> 1.7, >= 1.7.7)
|
||||||
rdoc (~> 4.0)
|
rdoc (~> 4.0)
|
||||||
sexp_processor (4.11.0)
|
sexp_processor (4.6.1)
|
||||||
simplecov (0.12.0)
|
simplecov (0.11.2)
|
||||||
docile (~> 1.1.0)
|
docile (~> 1.1.0)
|
||||||
json (>= 1.8, < 3)
|
json (~> 1.8)
|
||||||
simplecov-html (~> 0.10.0)
|
simplecov-html (~> 0.10.0)
|
||||||
simplecov-html (0.10.2)
|
simplecov-html (0.10.0)
|
||||||
spring (2.0.2)
|
spring (1.6.2)
|
||||||
activesupport (>= 4.2)
|
sprockets (2.12.4)
|
||||||
sprockets (2.12.5)
|
|
||||||
hike (~> 1.2)
|
hike (~> 1.2)
|
||||||
multi_json (~> 1.0)
|
multi_json (~> 1.0)
|
||||||
rack (~> 1.0)
|
rack (~> 1.0)
|
||||||
|
|
@ -263,28 +273,29 @@ GEM
|
||||||
actionpack (>= 3.0)
|
actionpack (>= 3.0)
|
||||||
activesupport (>= 3.0)
|
activesupport (>= 3.0)
|
||||||
sprockets (>= 2.8, < 4.0)
|
sprockets (>= 2.8, < 4.0)
|
||||||
sqlite3 (1.3.13)
|
sqlite3 (1.3.11)
|
||||||
sshkit (1.17.0)
|
sshkit (1.8.1)
|
||||||
net-scp (>= 1.1.2)
|
net-scp (>= 1.1.2)
|
||||||
net-ssh (>= 2.8.0)
|
net-ssh (>= 2.8.0)
|
||||||
term-ansicolor (1.6.0)
|
term-ansicolor (1.3.2)
|
||||||
tins (~> 1.0)
|
tins (~> 1.0)
|
||||||
terrapin (0.6.0)
|
thor (0.19.1)
|
||||||
climate_control (>= 0.0.3, < 1.0)
|
thread_safe (0.3.5)
|
||||||
thor (0.19.4)
|
|
||||||
thread_safe (0.3.6)
|
|
||||||
tilt (1.4.1)
|
tilt (1.4.1)
|
||||||
tins (1.16.3)
|
tins (1.6.0)
|
||||||
turbolinks (5.1.1)
|
turbolinks (2.5.3)
|
||||||
turbolinks-source (~> 5.1)
|
coffee-rails
|
||||||
turbolinks-source (5.1.0)
|
tzinfo (1.2.2)
|
||||||
tzinfo (1.2.5)
|
|
||||||
thread_safe (~> 0.1)
|
thread_safe (~> 0.1)
|
||||||
uglifier (4.1.16)
|
uglifier (2.7.2)
|
||||||
execjs (>= 0.3.0, < 3)
|
execjs (>= 0.3.0)
|
||||||
warden (1.2.7)
|
json (>= 1.8.0)
|
||||||
|
unf (0.1.4)
|
||||||
|
unf_ext
|
||||||
|
unf_ext (0.0.7.2)
|
||||||
|
warden (1.2.6)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
webmock (3.4.2)
|
webmock (1.22.6)
|
||||||
addressable (>= 2.3.6)
|
addressable (>= 2.3.6)
|
||||||
crack (>= 0.3.2)
|
crack (>= 0.3.2)
|
||||||
hashdiff
|
hashdiff
|
||||||
|
|
@ -308,7 +319,7 @@ DEPENDENCIES
|
||||||
codeclimate-test-reporter
|
codeclimate-test-reporter
|
||||||
coveralls
|
coveralls
|
||||||
daemons
|
daemons
|
||||||
delayed_job (= 4.1.4)
|
delayed_job (~> 4.0)
|
||||||
delayed_job_active_record
|
delayed_job_active_record
|
||||||
devise
|
devise
|
||||||
factory_girl_rails
|
factory_girl_rails
|
||||||
|
|
@ -318,10 +329,10 @@ DEPENDENCIES
|
||||||
httparty
|
httparty
|
||||||
identicon
|
identicon
|
||||||
jquery-rails
|
jquery-rails
|
||||||
mysql2 (>= 0.3.13, < 0.5)
|
mysql2 (~> 0.3.18)
|
||||||
omniauth-oauth2 (= 1.3.1)
|
omniauth-oauth2 (= 1.3.1)
|
||||||
paperclip
|
paperclip
|
||||||
rails (~> 4.2.8)
|
rails (= 4.2.4)
|
||||||
rspec-rails
|
rspec-rails
|
||||||
sass-rails (~> 4.0.3)
|
sass-rails (~> 4.0.3)
|
||||||
sdoc (~> 0.4.0)
|
sdoc (~> 0.4.0)
|
||||||
|
|
@ -333,4 +344,4 @@ DEPENDENCIES
|
||||||
will_paginate (= 3.0.7)
|
will_paginate (= 3.0.7)
|
||||||
|
|
||||||
BUNDLED WITH
|
BUNDLED WITH
|
||||||
1.16.3
|
1.11.2
|
||||||
|
|
|
||||||
|
|
@ -2,9 +2,9 @@
|
||||||
# lock '3.1.0'
|
# lock '3.1.0'
|
||||||
|
|
||||||
set :application, 'Tap'
|
set :application, 'Tap'
|
||||||
set :repo_url, 'https://github.com/ZeusWPI/Tap.git'
|
set :repo_url, 'git@github.com:ZeusWPI/Tap.git'
|
||||||
|
|
||||||
set :branch, 'herbert'
|
set :branch, 'master'
|
||||||
set :deploy_to, '/home/tap/production'
|
set :deploy_to, '/home/tap/production'
|
||||||
|
|
||||||
# Default branch is :master
|
# Default branch is :master
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
server 'tap.zeus.gent', user: 'tap', roles: %w{web app db}, ssh_options: {
|
server 'zeus.ugent.be', user: 'tap', roles: %w{web app db}, ssh_options: {
|
||||||
forward_agent: true,
|
forward_agent: true,
|
||||||
auth_methods: ['publickey'],
|
auth_methods: ['publickey'],
|
||||||
port: 2222
|
port: 2222
|
||||||
|
|
|
||||||
|
|
@ -79,13 +79,13 @@ Rails.application.configure do
|
||||||
Paperclip.options[:command_path] = "/usr/local/bin/"
|
Paperclip.options[:command_path] = "/usr/local/bin/"
|
||||||
|
|
||||||
# Help the asset pipeline for staging
|
# Help the asset pipeline for staging
|
||||||
config.x.host = 'tap.zeus.gent'
|
config.x.host = 'zeus.ugent.be'
|
||||||
config.relative_url_root = "/"
|
config.relative_url_root = "/tap"
|
||||||
|
|
||||||
config.action_mailer.default_url_options = {
|
config.action_mailer.default_url_options = {
|
||||||
host: config.x.host,
|
host: config.x.host,
|
||||||
script_name: config.relative_url_root,
|
script_name: config.relative_url_root,
|
||||||
}
|
}
|
||||||
|
|
||||||
config.api_url = "https://tab.zeus.gent"
|
config.api_url = "https://zeus.ugent.be/tab"
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue