bterkuile/mozo-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git.companytools.nl:/var/git/qwaiter

Browse Source
This commit is contained in:
Benjamin ter Kuile
2017-01-13 14:45:27 +01:00
parent 74a4918f2a 22675eb813
commit 9cc522b753
5 changed files with 161 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gemfile
+4 -3
View File
@@ -1,6 +1,6 @@
source 'https://rubygems.org' source 'https://rubygems.org'
gem 'rails', '~> 4.2.3' gem 'rails', '~> 4.2.6'
gem 'rack-cors', require: 'rack/cors' gem 'rack-cors', require: 'rack/cors'
# Bundle edge Rails instead: # Bundle edge Rails instead:
@@ -15,7 +15,7 @@ gem 'slim-rails'
gem 'jsonapi-serializers', github: 'bterkuile/jsonapi-serializers' gem 'jsonapi-serializers', github: 'bterkuile/jsonapi-serializers'
group :assets do group :assets do
gem 'jquery-rails' gem 'jquery-rails'
gem 'jquery-ui-rails' gem 'jquery-ui-rails', '~> 5.0.5' # https://github.com/joliss/jquery-ui-rails/issues/108
gem 'sass-rails' #, '~> 5.0.0' gem 'sass-rails' #, '~> 5.0.0'
gem 'coffee-rails' #, '~> 3.2.1' gem 'coffee-rails' #, '~> 3.2.1'
#gem 'twitter-bootstrap-rails' #gem 'twitter-bootstrap-rails'
@@ -34,6 +34,7 @@ group :assets do
gem 'ember-source', '~> 2.5.1' gem 'ember-source', '~> 2.5.1'
gem 'ember-data-source', '~> 2.5.3' gem 'ember-data-source', '~> 2.5.3'
gem "barber", "0.11.1"
gem 'ember-rails' gem 'ember-rails'
gem 'ember-validations-rails' gem 'ember-validations-rails'
@@ -54,7 +55,7 @@ end
# gem 'couchbase-docstore' # gem 'couchbase-docstore'
# gem 'couchbase-structures', github: 'bterkuile/couchbase-structures' # gem 'couchbase-structures', github: 'bterkuile/couchbase-structures'
gem 'couch_potato', '~> 1.4.0' #, github: 'bterkuile/couch_potato' #gem 'couch_potato', '~> 1.4.0' #, github: 'bterkuile/couch_potato'
#gem 'simply_stored', path: '~/development/rails/components/simply_stored' #, github: 'bterkuile/simply_stored' #gem 'simply_stored', path: '~/development/rails/components/simply_stored' #, github: 'bterkuile/simply_stored'
gem 'simply_stored', github: 'bterkuile/simply_stored' gem 'simply_stored', github: 'bterkuile/simply_stored'
#gem 'orm_adapter', github: 'bterkuile/orm_adapter' #gem 'orm_adapter', github: 'bterkuile/orm_adapter'
Gemfile.lock
+140 -148
View File
@@ -30,33 +30,32 @@ GIT
GIT GIT
remote: git://github.com/bterkuile/simply_stored.git remote: git://github.com/bterkuile/simply_stored.git
revision: 95e045e1ed073090505596d74c6f1d3f39ef4729 revision: 7633d88a62972cee6aea49d7d2a175bf07906236
specs: specs:
simply_stored (1.0.0) simply_stored (1.0.0)
activesupport activesupport
couch_potato (>= 1.4.0) couch_potato (>= 1.7.0)
rest-client (>= 1.4.2)
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
remote: https://rails-assets.org/ remote: https://rails-assets.org/
specs: specs:
ace-rails-ap (4.0.2) ace-rails-ap (4.1.1)
actionmailer (4.2.6) actionmailer (4.2.7.1)
actionpack (= 4.2.6) actionpack (= 4.2.7.1)
actionview (= 4.2.6) actionview (= 4.2.7.1)
activejob (= 4.2.6) activejob (= 4.2.7.1)
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.6) actionpack (4.2.7.1)
actionview (= 4.2.6) actionview (= 4.2.7.1)
activesupport (= 4.2.6) activesupport (= 4.2.7.1)
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.6) actionview (4.2.7.1)
activesupport (= 4.2.6) activesupport (= 4.2.7.1)
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)
@@ -67,28 +66,29 @@ GEM
activemodel (>= 3.0.2, < 5.1) activemodel (>= 3.0.2, < 5.1)
activesupport (>= 3.0.2, < 5.1) activesupport (>= 3.0.2, < 5.1)
active_decorator (0.7.1) active_decorator (0.7.1)
active_model_serializers (0.10.0) active_model_serializers (0.10.3)
actionpack (>= 4.0) actionpack (>= 4.1, < 6)
activemodel (>= 4.0) activemodel (>= 4.1, < 6)
railties (>= 4.0) jsonapi (= 0.1.1.beta2)
activejob (4.2.6) activejob (4.2.7.1)
activesupport (= 4.2.6) activesupport (= 4.2.7.1)
globalid (>= 0.3.0) globalid (>= 0.3.0)
activemodel (4.2.6) activemodel (4.2.7.1)
activesupport (= 4.2.6) activesupport (= 4.2.7.1)
builder (~> 3.1) builder (~> 3.1)
activerecord (4.2.6) activerecord (4.2.7.1)
activemodel (= 4.2.6) activemodel (= 4.2.7.1)
activesupport (= 4.2.6) activesupport (= 4.2.7.1)
arel (~> 6.0) arel (~> 6.0)
activesupport (4.2.6) activesupport (4.2.7.1)
i18n (~> 0.7) i18n (~> 0.7)
json (~> 1.7, >= 1.7.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.4.0) addressable (2.5.0)
airbrussh (1.0.2) public_suffix (~> 2.0, >= 2.0.2)
airbrussh (1.1.1)
sshkit (>= 1.6.1, != 1.7.0) sshkit (>= 1.6.1, != 1.7.0)
arel (6.0.3) arel (6.0.3)
babel-source (5.8.35) babel-source (5.8.35)
@@ -104,17 +104,17 @@ GEM
thor (~> 0.19) thor (~> 0.19)
builder (3.2.2) builder (3.2.2)
cancancan (1.15.0) cancancan (1.15.0)
capistrano (3.5.0) capistrano (3.6.1)
airbrussh (>= 1.0.0) airbrussh (>= 1.0.0)
capistrano-harrow capistrano-harrow
i18n i18n
rake (>= 10.0.0) rake (>= 10.0.0)
sshkit (>= 1.9.0) sshkit (>= 1.9.0)
capistrano-bundler (1.1.4) capistrano-bundler (1.2.0)
capistrano (~> 3.1) capistrano (~> 3.1)
sshkit (~> 1.2) sshkit (~> 1.2)
capistrano-harrow (0.5.1) capistrano-harrow (0.5.3)
capistrano-rails (1.1.7) capistrano-rails (1.2.0)
capistrano (~> 3.1) capistrano (~> 3.1)
capistrano-bundler (~> 1.1) capistrano-bundler (~> 1.1)
capistrano-rvm (0.1.2) capistrano-rvm (0.1.2)
@@ -123,54 +123,52 @@ GEM
capistrano3-puma (1.2.1) capistrano3-puma (1.2.1)
capistrano (~> 3.0) capistrano (~> 3.0)
puma (>= 2.6) puma (>= 2.6)
capybara (2.7.1) capybara (2.10.1)
addressable addressable
mime-types (>= 1.16) mime-types (>= 1.16)
nokogiri (>= 1.3.3) nokogiri (>= 1.3.3)
rack (>= 1.0.0) rack (>= 1.0.0)
rack-test (>= 0.5.4) rack-test (>= 0.5.4)
xpath (~> 2.0) xpath (~> 2.0)
capybara-screenshot (1.0.13) capybara-screenshot (1.0.14)
capybara (>= 1.0, < 3) capybara (>= 1.0, < 3)
launchy launchy
chunky_png (1.3.5) chunky_png (1.3.8)
climate_control (0.0.3) climate_control (0.0.3)
activesupport (>= 3.0) activesupport (>= 3.0)
cliver (0.3.2) cliver (0.3.2)
cocaine (0.5.8) cocaine (0.5.8)
climate_control (>= 0.0.3, < 1.0) climate_control (>= 0.0.3, < 1.0)
coderay (1.1.1) coderay (1.1.1)
coffee-rails (4.1.1) coffee-rails (4.2.1)
coffee-script (>= 2.2.0) coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.1.x) railties (>= 4.0.0, < 5.2.x)
coffee-script (2.4.1) coffee-script (2.4.1)
coffee-script-source coffee-script-source
execjs execjs
coffee-script-source (1.10.0) coffee-script-source (1.11.1)
concurrent-ruby (1.0.2) concurrent-ruby (1.0.2)
cookiejar (0.3.3) cookiejar (0.3.3)
couch_potato (1.4.0) couch_potato (1.7.0)
activemodel activemodel (~> 4.0)
couchrest (~> 1.2.0) couchrest (~> 2.0.0.rc3)
json (~> 1.6) json (~> 1.6)
couchrest (1.2.1) couchrest (2.0.0)
httpclient (~> 2.8)
mime-types (>= 1.15) mime-types (>= 1.15)
multi_json (~> 1.7, ~> 1.0) multi_json (~> 1.7)
rest-client (~> 1.8.0)
crack (0.4.3) crack (0.4.3)
safe_yaml (~> 1.0.0) safe_yaml (~> 1.0.0)
devise (4.1.1) devise (4.2.0)
bcrypt (~> 3.0) bcrypt (~> 3.0)
orm_adapter (~> 0.1) orm_adapter (~> 0.1)
railties (>= 4.1.0, < 5.1) railties (>= 4.1.0, < 5.1)
responders responders
warden (~> 1.2.3) warden (~> 1.2.3)
devise-i18n (1.1.0) devise-i18n (1.1.1)
diff-lcs (1.2.5) diff-lcs (1.2.5)
docile (1.1.5) docile (1.1.5)
domain_name (0.5.20160310) em-http-request (1.1.5)
unf (>= 0.0.5, < 1.0.0)
em-http-request (1.1.4)
addressable (>= 2.3.4) addressable (>= 2.3.4)
cookiejar (!= 0.3.1) cookiejar (!= 0.3.1)
em-socksify (>= 0.3) em-socksify (>= 0.3)
@@ -180,8 +178,8 @@ GEM
eventmachine (>= 1.0.0.beta.4) eventmachine (>= 1.0.0.beta.4)
email_validator (1.6.0) email_validator (1.6.0)
activemodel activemodel
ember-cli-assets (0.0.32) ember-cli-assets (0.0.35)
ember-data-source (2.5.3) ember-data-source (2.5.5)
ember-source (>= 2, < 3.0) ember-source (>= 2, < 3.0)
ember-emblem-template (0.4.0) ember-emblem-template (0.4.0)
ember-handlebars-template (~> 0.7.0) ember-handlebars-template (~> 0.7.0)
@@ -206,19 +204,19 @@ GEM
ember-validations-rails (1.0.0) ember-validations-rails (1.0.0)
railties railties
erubis (2.7.0) erubis (2.7.0)
eventmachine (1.2.0.1) eventmachine (1.2.1)
exception_notification (4.1.4) exception_notification (4.2.1)
actionmailer (~> 4.0) actionmailer (>= 4.0, < 6)
activesupport (~> 4.0) activesupport (>= 4.0, < 6)
execjs (2.7.0) execjs (2.7.0)
factory_girl (4.7.0) factory_girl (4.7.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
factory_girl_rails (4.7.0) factory_girl_rails (4.7.0)
factory_girl (~> 4.7.0) factory_girl (~> 4.7.0)
railties (>= 3.0.0) railties (>= 3.0.0)
faraday (0.9.2) faraday (0.10.1)
multipart-post (>= 1.2, < 3) multipart-post (>= 1.2, < 3)
faye (1.1.2) faye (1.2.3)
cookiejar (>= 0.3.0) cookiejar (>= 0.3.0)
em-http-request (>= 0.3.0) em-http-request (>= 0.3.0)
eventmachine (>= 0.12.0) eventmachine (>= 0.12.0)
@@ -226,41 +224,42 @@ GEM
multi_json (>= 1.0.0) multi_json (>= 1.0.0)
rack (>= 1.0.0) rack (>= 1.0.0)
websocket-driver (>= 0.5.1) websocket-driver (>= 0.5.1)
faye-websocket (0.10.4) faye-websocket (0.10.5)
eventmachine (>= 0.12.0) eventmachine (>= 0.12.0)
websocket-driver (>= 0.5.1) websocket-driver (>= 0.5.1)
font-awesome-rails (4.6.3.1) font-awesome-rails (4.7.0.0)
railties (>= 3.2, < 5.1) railties (>= 3.2, < 5.1)
foreman (0.82.0) foreman (0.82.0)
thor (~> 0.19.1) thor (~> 0.19.1)
foundation-rails (5.5.3.2) foundation-rails (5.5.3.2)
railties (>= 3.1.0) railties (>= 3.1.0)
sass (>= 3.3.0, < 3.5) sass (>= 3.3.0, < 3.5)
fuubar (2.0.0) fuubar (2.2.0)
rspec (~> 3.0) rspec-core (~> 3.0)
ruby-progressbar (~> 1.4) ruby-progressbar (~> 1.4)
gherkin (2.12.2) gherkin (2.12.2)
multi_json (~> 1.3) multi_json (~> 1.3)
globalid (0.3.6) globalid (0.3.7)
activesupport (>= 4.1.0) activesupport (>= 4.1.0)
hashdiff (0.3.0) hashdiff (0.3.1)
hashie (3.4.4) hashie (3.4.6)
http-cookie (1.0.2)
domain_name (~> 0.5)
http_parser.rb (0.6.0) http_parser.rb (0.6.0)
httpclient (2.8.2.4)
i18n (0.7.0) i18n (0.7.0)
iso_country_codes (0.7.5) iso_country_codes (0.7.5)
jquery-rails (4.1.1) jquery-rails (4.2.1)
rails-dom-testing (>= 1, < 3) rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0) railties (>= 4.2.0)
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
jquery-ui-rails (5.0.5) jquery-ui-rails (5.0.5)
railties (>= 3.2.16) railties (>= 3.2.16)
js-routes (1.2.6) js-routes (1.3.1)
railties (>= 3.2) railties (>= 3.2)
sprockets-rails sprockets-rails
json (1.8.3) json (1.8.3)
jwt (1.5.1) jsonapi (0.1.1.beta2)
json (~> 1.8)
jwt (1.5.6)
kaminari (0.17.0) kaminari (0.17.0)
actionpack (>= 3.0.0) actionpack (>= 3.0.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
@@ -268,38 +267,38 @@ GEM
addressable (~> 2.3) addressable (~> 2.3)
letter_opener (1.4.1) letter_opener (1.4.1)
launchy (~> 2.2) launchy (~> 2.2)
libv8 (3.16.14.15) libv8 (3.16.14.17)
loofah (2.0.3) loofah (2.0.3)
nokogiri (>= 1.5.9) nokogiri (>= 1.5.9)
mail (2.6.4) mail (2.6.4)
mime-types (>= 1.16, < 4) mime-types (>= 1.16, < 4)
method_source (0.8.2) method_source (0.8.2)
mime-types (2.99.2) mime-types (3.1)
mimemagic (0.3.1) mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mimemagic (0.3.2)
mini_magick (4.5.1) mini_magick (4.5.1)
mini_portile2 (2.1.0) mini_portile2 (2.1.0)
minitest (5.9.0) minitest (5.9.1)
multi_json (1.12.1) multi_json (1.12.1)
multi_xml (0.5.5) multi_xml (0.6.0)
multipart-post (2.0.0) multipart-post (2.0.0)
naught (1.1.0) naught (1.1.0)
net-scp (1.2.1) net-scp (1.2.1)
net-ssh (>= 2.6.5) net-ssh (>= 2.6.5)
net-ssh (3.1.1) net-ssh (3.2.0)
netrc (0.11.0) nokogiri (1.6.8.1)
nokogiri (1.6.8)
mini_portile2 (~> 2.1.0) mini_portile2 (~> 2.1.0)
pkg-config (~> 1.1.7) oauth2 (1.3.0)
oauth2 (1.1.0) faraday (>= 0.8, < 0.11)
faraday (>= 0.8, < 0.10) jwt (~> 1.0)
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.3.1) omniauth (1.3.1)
hashie (>= 1.2, < 4) hashie (>= 1.2, < 4)
rack (>= 1.0, < 3) rack (>= 1.0, < 3)
omniauth-facebook (3.0.0) omniauth-facebook (4.0.0)
omniauth-oauth2 (~> 1.2) omniauth-oauth2 (~> 1.2)
omniauth-instagram (1.0.2) omniauth-instagram (1.0.2)
omniauth (~> 1) omniauth (~> 1)
@@ -308,7 +307,7 @@ GEM
oauth2 (~> 1.0) oauth2 (~> 1.0)
omniauth (~> 1.2) omniauth (~> 1.2)
orm_adapter (0.5.0) orm_adapter (0.5.0)
paperclip (5.0.0) paperclip (5.1.0)
activemodel (>= 4.2.0) activemodel (>= 4.2.0)
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
cocaine (~> 0.5.5) cocaine (~> 0.5.5)
@@ -316,41 +315,40 @@ GEM
mimemagic (~> 0.3.0) mimemagic (~> 0.3.0)
pickadate-rails (3.5.6.0) pickadate-rails (3.5.6.0)
railties (>= 3.1.0) railties (>= 3.1.0)
pkg-config (1.1.7) poltergeist (1.11.0)
poltergeist (1.9.0)
capybara (~> 2.1) capybara (~> 2.1)
cliver (~> 0.3.1) cliver (~> 0.3.1)
multi_json (~> 1.0)
websocket-driver (>= 0.2.0) websocket-driver (>= 0.2.0)
pry (0.10.3) pry (0.10.4)
coderay (~> 1.1.0) coderay (~> 1.1.0)
method_source (~> 0.8.1) method_source (~> 0.8.1)
slop (~> 3.4) slop (~> 3.4)
pry-doc (0.8.0) pry-doc (0.9.0)
pry (~> 0.9) pry (~> 0.9)
yard (~> 0.8) yard (~> 0.8)
pry-rails (0.3.4) pry-rails (0.3.4)
pry (>= 0.9.10) pry (>= 0.9.10)
puma (3.4.0) public_suffix (2.0.4)
puma (3.6.2)
quiet_assets (1.1.0) quiet_assets (1.1.0)
railties (>= 3.1, < 5.0) railties (>= 3.1, < 5.0)
rack (1.6.4) rack (1.6.5)
rack-cors (0.4.0) rack-cors (0.4.0)
rack-test (0.6.3) rack-test (0.6.3)
rack (>= 1.0) rack (>= 1.0)
rails (4.2.6) rails (4.2.7.1)
actionmailer (= 4.2.6) actionmailer (= 4.2.7.1)
actionpack (= 4.2.6) actionpack (= 4.2.7.1)
actionview (= 4.2.6) actionview (= 4.2.7.1)
activejob (= 4.2.6) activejob (= 4.2.7.1)
activemodel (= 4.2.6) activemodel (= 4.2.7.1)
activerecord (= 4.2.6) activerecord (= 4.2.7.1)
activesupport (= 4.2.6) activesupport (= 4.2.7.1)
bundler (>= 1.3.0, < 2.0) bundler (>= 1.3.0, < 2.0)
railties (= 4.2.6) railties (= 4.2.7.1)
sprockets-rails sprockets-rails
rails-assets-ember-qunit (0.4.20) rails-assets-ember-qunit (1.0.0)
rails-assets-qunit (1.23.1) rails-assets-qunit (2.0.1)
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.7) rails-dom-testing (1.0.7)
@@ -359,104 +357,98 @@ GEM
rails-deprecated_sanitizer (>= 1.0.1) rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.3) rails-html-sanitizer (1.0.3)
loofah (~> 2.0) loofah (~> 2.0)
railties (4.2.6) railties (4.2.7.1)
actionpack (= 4.2.6) actionpack (= 4.2.7.1)
activesupport (= 4.2.6) activesupport (= 4.2.7.1)
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
rake (11.2.2) rake (11.3.0)
ref (2.0.0) ref (2.0.0)
responders (2.2.0) responders (2.3.0)
railties (>= 4.2.0, < 5.1) railties (>= 4.2.0, < 5.1)
rest-client (1.8.0)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 3.0)
netrc (~> 0.7)
rqrcode (0.10.1) rqrcode (0.10.1)
chunky_png (~> 1.0) chunky_png (~> 1.0)
rspec (3.4.0) rspec (3.5.0)
rspec-core (~> 3.4.0) rspec-core (~> 3.5.0)
rspec-expectations (~> 3.4.0) rspec-expectations (~> 3.5.0)
rspec-mocks (~> 3.4.0) rspec-mocks (~> 3.5.0)
rspec-core (3.4.4) rspec-core (3.5.4)
rspec-support (~> 3.4.0) rspec-support (~> 3.5.0)
rspec-expectations (3.4.0) rspec-expectations (3.5.0)
diff-lcs (>= 1.2.0, < 2.0) diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.4.0) rspec-support (~> 3.5.0)
rspec-its (1.2.0) rspec-its (1.2.0)
rspec-core (>= 3.0.0) rspec-core (>= 3.0.0)
rspec-expectations (>= 3.0.0) rspec-expectations (>= 3.0.0)
rspec-mocks (3.4.1) rspec-mocks (3.5.0)
diff-lcs (>= 1.2.0, < 2.0) diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.4.0) rspec-support (~> 3.5.0)
rspec-rails (3.4.2) rspec-rails (3.5.2)
actionpack (>= 3.0, < 4.3) actionpack (>= 3.0)
activesupport (>= 3.0, < 4.3) activesupport (>= 3.0)
railties (>= 3.0, < 4.3) railties (>= 3.0)
rspec-core (~> 3.4.0) rspec-core (~> 3.5.0)
rspec-expectations (~> 3.4.0) rspec-expectations (~> 3.5.0)
rspec-mocks (~> 3.4.0) rspec-mocks (~> 3.5.0)
rspec-support (~> 3.4.0) rspec-support (~> 3.5.0)
rspec-support (3.4.1) rspec-support (3.5.0)
ruby-progressbar (1.8.1) ruby-progressbar (1.8.1)
safe_yaml (1.0.4) safe_yaml (1.0.4)
sass (3.4.22) sass (3.4.22)
sass-rails (5.0.4) sass-rails (5.0.6)
railties (>= 4.0.0, < 5.0) railties (>= 4.0.0, < 6)
sass (~> 3.1) sass (~> 3.1)
sprockets (>= 2.8, < 4.0) sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0) sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3) tilt (>= 1.1, < 3)
simplecov (0.11.2) simplecov (0.12.0)
docile (~> 1.1.0) docile (~> 1.1.0)
json (~> 1.8) json (>= 1.8, < 3)
simplecov-html (~> 0.10.0) simplecov-html (~> 0.10.0)
simplecov-html (0.10.0) simplecov-html (0.10.0)
slim (3.0.7) slim (3.0.7)
temple (~> 0.7.6) temple (~> 0.7.6)
tilt (>= 1.3.3, < 2.1) tilt (>= 1.3.3, < 2.1)
slim-rails (3.1.0) slim-rails (3.1.1)
actionpack (>= 3.1) actionpack (>= 3.1)
railties (>= 3.1) railties (>= 3.1)
slim (~> 3.0) slim (~> 3.0)
slop (3.6.0) slop (3.6.0)
spring (1.7.1) spring (2.0.0)
activesupport (>= 4.2)
spring-commands-rspec (1.0.4) spring-commands-rspec (1.0.4)
spring (>= 0.9.1) spring (>= 0.9.1)
sprockets (3.6.0) sprockets (3.7.0)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
rack (> 1, < 3) rack (> 1, < 3)
sprockets-rails (2.3.3) sprockets-rails (2.3.3)
actionpack (>= 3.0) actionpack (>= 3.0)
activesupport (>= 3.0) activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0) sprockets (>= 2.8, < 4.0)
sshkit (1.11.0) sshkit (1.11.4)
net-scp (>= 1.1.2) net-scp (>= 1.1.2)
net-ssh (>= 2.8.0) net-ssh (>= 2.8.0)
sucker_punch (2.0.2) sucker_punch (2.0.2)
concurrent-ruby (~> 1.0.0) concurrent-ruby (~> 1.0.0)
temple (0.7.7) temple (0.7.7)
test_squad (0.1.2) test_squad (0.1.3)
rails rails
therubyracer (0.12.2) therubyracer (0.12.2)
libv8 (~> 3.16.14.0) libv8 (~> 3.16.14.0)
ref ref
thor (0.19.1) thor (0.19.4)
thread_safe (0.3.5) thread_safe (0.3.5)
tilt (2.0.5) tilt (2.0.5)
timecop (0.8.1) timecop (0.8.1)
tinymce-rails (4.4.0) tinymce-rails (4.5.0)
railties (>= 3.1.1) railties (>= 3.1.1)
turnip (2.1.1) turnip (2.1.1)
gherkin (~> 2.5) gherkin (~> 2.5)
rspec (>= 3.0, < 4.0) rspec (>= 3.0, < 4.0)
tzinfo (1.2.2) tzinfo (1.2.2)
thread_safe (~> 0.1) thread_safe (~> 0.1)
uglifier (3.0.0) uglifier (3.0.3)
execjs (>= 0.3.0, < 3) execjs (>= 0.3.0, < 3)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.2)
warden (1.2.6) warden (1.2.6)
rack (>= 1.0) rack (>= 1.0)
webmock (2.1.0) webmock (2.1.0)
@@ -468,7 +460,7 @@ GEM
websocket-extensions (0.1.2) websocket-extensions (0.1.2)
xpath (2.0.0) xpath (2.0.0)
nokogiri (~> 1.3) nokogiri (~> 1.3)
yard (0.8.7.6) yard (0.9.5)
PLATFORMS PLATFORMS
ruby ruby
@@ -478,6 +470,7 @@ DEPENDENCIES
active_attr active_attr
active_decorator active_decorator
airbrussh airbrussh
barber (= 0.11.1)
bourbon bourbon
cancancan cancancan
capistrano capistrano
@@ -488,7 +481,6 @@ DEPENDENCIES
capybara-screenshot capybara-screenshot
cmtool! cmtool!
coffee-rails coffee-rails
couch_potato (~> 1.4.0)
devise devise
devise-i18n devise-i18n
devise_simply_stored! devise_simply_stored!
@@ -507,7 +499,7 @@ DEPENDENCIES
fuubar fuubar
iso_country_codes iso_country_codes
jquery-rails jquery-rails
jquery-ui-rails jquery-ui-rails (~> 5.0.5)
js-routes js-routes
jsonapi-serializers! jsonapi-serializers!
kaminari kaminari
@@ -525,7 +517,7 @@ DEPENDENCIES
puma puma
quiet_assets quiet_assets
rack-cors rack-cors
rails (~> 4.2.3) rails (~> 4.2.6)
rails-assets-ember-qunit! rails-assets-ember-qunit!
rails-assets-qunit! rails-assets-qunit!
rqrcode rqrcode
@@ -546,4 +538,4 @@ DEPENDENCIES
webmock webmock
BUNDLED WITH BUNDLED WITH
1.12.3 1.13.1
app/controllers/user_controller.rb
+8 -1
View File
@@ -13,7 +13,14 @@ class UserController < Users::ApplicationController
end end
def obtain_token def obtain_token
redirect_to user_omniauth_authorize_path(params[:provider].presence || 'facebook') and return unless current_user.present? if current_user.blank?
case params[:provider]
when 'instagram' then redirect_to user_instagram_omniauth_authorize_path
else redirect_to user_facebook_omniauth_authorize_path
end
return
end
#redirect_to user_omniauth_authorize_path(params[:provider].presence || 'facebook') and return unless current_user.present?
respond_to do |format| respond_to do |format|
format.html { render layout: 'user/obtain_token' } format.html { render layout: 'user/obtain_token' }
format.json do format.json do
config/deploy.rb
+3 -3
View File
@@ -94,9 +94,9 @@ namespace :deploy do
on roles(fetch(:assets_roles)) do on roles(fetch(:assets_roles)) do
run_locally do run_locally do
with rails_env: fetch(:stage) do with rails_env: fetch(:stage) do
execute "RAILS_ENV=#{fetch(:stage)} DEPLOY=yes bin/rake assets:precompile" execute "RAILS_GROUPS=assets RAILS_ENV=#{fetch(:stage)} DEPLOY=yes bin/rake assets:precompile"
execute "RAILS_ENV=#{fetch(:stage)} DEPLOY=yes bin/rake assets:dedigest" execute "RAILS_GROUPS=assets RAILS_ENV=#{fetch(:stage)} DEPLOY=yes bin/rake assets:dedigest"
execute "RAILS_ENV=#{fetch(:stage)} DEPLOY=yes bin/rake assets:gzip" execute "RAILS_GROUPS=assets RAILS_ENV=#{fetch(:stage)} DEPLOY=yes bin/rake assets:gzip"
end end
end end