updates devise & ahoy
This commit is contained in:
4
Gemfile
4
Gemfile
@@ -19,7 +19,7 @@ gem 'jquery-ui-rails'
|
||||
# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
|
||||
gem 'turbolinks'
|
||||
|
||||
gem 'devise', '~> 3.5.6'
|
||||
gem 'devise', '~> 3.5.7'
|
||||
# Use ActiveModel has_secure_password
|
||||
# gem 'bcrypt', '~> 3.1.7'
|
||||
gem 'omniauth'
|
||||
@@ -52,7 +52,7 @@ gem 'newrelic_rpm', '~> 3.14'
|
||||
gem 'whenever', require: false
|
||||
gem 'pg_search'
|
||||
|
||||
gem 'ahoy_matey', '~> 1.2.1'
|
||||
gem 'ahoy_matey', '~> 1.4.0'
|
||||
gem 'groupdate' # group temporary data
|
||||
gem 'tolk' # Web interface for translations
|
||||
|
||||
|
||||
35
Gemfile.lock
35
Gemfile.lock
@@ -49,14 +49,15 @@ GEM
|
||||
activerecord (>= 3.2, < 5)
|
||||
acts_as_votable (0.10.0)
|
||||
addressable (2.4.0)
|
||||
ahoy_matey (1.2.1)
|
||||
ahoy_matey (1.4.0)
|
||||
addressable
|
||||
browser (>= 0.4.0)
|
||||
errbase
|
||||
browser (~> 2.0)
|
||||
geocoder
|
||||
rails
|
||||
rack-attack
|
||||
railties
|
||||
referer-parser (>= 0.3.0)
|
||||
request_store
|
||||
safely_block
|
||||
user_agent_parser
|
||||
uuidtools
|
||||
akami (1.3.1)
|
||||
@@ -70,8 +71,8 @@ GEM
|
||||
babel-transpiler (0.7.0)
|
||||
babel-source (>= 4.0, < 6)
|
||||
execjs (~> 2.0)
|
||||
bcrypt (3.1.10)
|
||||
browser (1.1.0)
|
||||
bcrypt (3.1.11)
|
||||
browser (2.0.3)
|
||||
builder (3.2.2)
|
||||
bullet (5.0.0)
|
||||
activesupport (>= 3.0.0)
|
||||
@@ -132,7 +133,7 @@ GEM
|
||||
delayed_job_active_record (4.1.0)
|
||||
activerecord (>= 3.0, < 5)
|
||||
delayed_job (>= 3.0, < 5)
|
||||
devise (3.5.6)
|
||||
devise (3.5.7)
|
||||
bcrypt (~> 3.0)
|
||||
orm_adapter (~> 0.1)
|
||||
railties (>= 3.2.6, < 5)
|
||||
@@ -176,7 +177,7 @@ GEM
|
||||
fuubar (2.0.0)
|
||||
rspec (~> 3.0)
|
||||
ruby-progressbar (~> 1.4)
|
||||
geocoder (1.3.1)
|
||||
geocoder (1.3.4)
|
||||
globalid (0.3.6)
|
||||
activesupport (>= 4.1.0)
|
||||
groupdate (2.5.2)
|
||||
@@ -223,9 +224,11 @@ GEM
|
||||
railties (>= 3.2)
|
||||
loofah (2.0.3)
|
||||
nokogiri (>= 1.5.9)
|
||||
mail (2.6.3)
|
||||
mime-types (>= 1.16, < 3)
|
||||
mime-types (2.99.1)
|
||||
mail (2.6.4)
|
||||
mime-types (>= 1.16, < 4)
|
||||
mime-types (3.0)
|
||||
mime-types-data (~> 3.2015)
|
||||
mime-types-data (3.2016.0221)
|
||||
mini_portile2 (2.0.0)
|
||||
minitest (5.8.4)
|
||||
multi_json (1.11.2)
|
||||
@@ -284,6 +287,8 @@ GEM
|
||||
rack (1.6.4)
|
||||
rack-accept (0.4.5)
|
||||
rack (>= 0.4)
|
||||
rack-attack (4.4.1)
|
||||
rack
|
||||
rack-test (0.6.3)
|
||||
rack (>= 1.0)
|
||||
rails (4.2.6)
|
||||
@@ -314,7 +319,7 @@ GEM
|
||||
rake (11.1.2)
|
||||
redcarpet (3.3.4)
|
||||
referer-parser (0.3.0)
|
||||
request_store (1.3.0)
|
||||
request_store (1.3.1)
|
||||
responders (2.1.2)
|
||||
railties (>= 4.2.0, < 5.1)
|
||||
rinku (1.7.3)
|
||||
@@ -343,6 +348,8 @@ GEM
|
||||
rspec-support (3.4.1)
|
||||
ruby-progressbar (1.7.5)
|
||||
safe_yaml (1.0.4)
|
||||
safely_block (0.1.0)
|
||||
errbase
|
||||
sass (3.4.22)
|
||||
sass-rails (5.0.4)
|
||||
railties (>= 4.0.0, < 5.0)
|
||||
@@ -432,7 +439,7 @@ PLATFORMS
|
||||
DEPENDENCIES
|
||||
acts-as-taggable-on
|
||||
acts_as_votable
|
||||
ahoy_matey (~> 1.2.1)
|
||||
ahoy_matey (~> 1.4.0)
|
||||
ancestry
|
||||
browser
|
||||
bullet
|
||||
@@ -451,7 +458,7 @@ DEPENDENCIES
|
||||
dalli
|
||||
database_cleaner
|
||||
delayed_job_active_record (~> 4.1.0)
|
||||
devise (~> 3.5.6)
|
||||
devise (~> 3.5.7)
|
||||
devise-async
|
||||
email_spec
|
||||
factory_girl_rails
|
||||
|
||||
@@ -56,7 +56,7 @@
|
||||
<h3><%= t("debates.show.share") %></h3>
|
||||
<div class="social-share-full">
|
||||
<%= social_share_button_tag("#{@debate.title} #{setting['twitter_hashtag']}") %>
|
||||
<% if browser.mobile? %>
|
||||
<% if browser.device.mobile? %>
|
||||
<a href="whatsapp://send?text=<%= @debate.title %> <%= debate_url(@debate) %>" data-action="share/whatsapp/share">
|
||||
<span class="icon-whatsapp whatsapp"></span>
|
||||
</a>
|
||||
|
||||
@@ -96,7 +96,7 @@
|
||||
<h3><%= t("proposals.show.share") %></h3>
|
||||
<div class="social-share-full">
|
||||
<%= social_share_button_tag("#{@proposal.title} #{setting['twitter_hashtag']}") %>
|
||||
<% if browser.mobile? %>
|
||||
<% if browser.device.mobile? %>
|
||||
<a href="whatsapp://send?text=<%= @proposal.title %> <%= proposal_url(@proposal) %>" data-action="share/whatsapp/share">
|
||||
<span class="icon-whatsapp whatsapp"></span>
|
||||
</a>
|
||||
|
||||
@@ -44,7 +44,7 @@
|
||||
<h3><%= t("spending_proposals.show.share") %></h3>
|
||||
<div class="social-share-full">
|
||||
<%= social_share_button_tag("#{@spending_proposal.title} #{setting['twitter_hashtag']}") %>
|
||||
<% if browser.mobile? %>
|
||||
<% if browser.device.mobile? %>
|
||||
<a href="whatsapp://send?text=<%= @spending_proposal.title %> <%= spending_proposal_url(@spending_proposal) %>" data-action="share/whatsapp/share">
|
||||
<span class="icon-whatsapp whatsapp"></span>
|
||||
</a>
|
||||
|
||||
Reference in New Issue
Block a user