Bundle update
This commit is contained in:
parent
bd55a2f911
commit
1b8de3ee35
7
Gemfile
7
Gemfile
|
|
@ -69,6 +69,10 @@ group :development do
|
|||
gem 'sqlite3'
|
||||
gem 'webrick'
|
||||
gem 'quiet_assets'
|
||||
|
||||
# Access an IRB console on exception pages or by using <%= console %> in views
|
||||
gem 'web-console', '~> 2.0'
|
||||
|
||||
gem 'guard-migrate', require: false
|
||||
gem 'guard-bundler', require: false
|
||||
gem 'guard-rubocop', require: false
|
||||
|
|
@ -90,9 +94,6 @@ group :development, :test do
|
|||
# console
|
||||
gem 'byebug'
|
||||
|
||||
# Access an IRB console on exception pages or by using <%= console %> in views
|
||||
gem 'web-console', '~> 2.0'
|
||||
|
||||
# Spring speeds up development by keeping your application running in the
|
||||
# background. Read more: https://github.com/rails/spring
|
||||
gem 'spring'
|
||||
|
|
|
|||
145
Gemfile.lock
145
Gemfile.lock
|
|
@ -1,6 +1,6 @@
|
|||
GIT
|
||||
remote: git://github.com/Compass/compass-rails.git
|
||||
revision: a1c890628d61f62e61474de2c00dde2658251196
|
||||
revision: 5b16c6c6ef8ad28f84e61a460602592fea5fc810
|
||||
specs:
|
||||
compass-rails (3.0.0)
|
||||
compass (~> 1.0.0)
|
||||
|
|
@ -25,21 +25,21 @@ GIT
|
|||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
actionmailer (4.2.5)
|
||||
actionpack (= 4.2.5)
|
||||
actionview (= 4.2.5)
|
||||
activejob (= 4.2.5)
|
||||
actionmailer (4.2.5.1)
|
||||
actionpack (= 4.2.5.1)
|
||||
actionview (= 4.2.5.1)
|
||||
activejob (= 4.2.5.1)
|
||||
mail (~> 2.5, >= 2.5.4)
|
||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||
actionpack (4.2.5)
|
||||
actionview (= 4.2.5)
|
||||
activesupport (= 4.2.5)
|
||||
actionpack (4.2.5.1)
|
||||
actionview (= 4.2.5.1)
|
||||
activesupport (= 4.2.5.1)
|
||||
rack (~> 1.6)
|
||||
rack-test (~> 0.6.2)
|
||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
||||
actionview (4.2.5)
|
||||
activesupport (= 4.2.5)
|
||||
actionview (4.2.5.1)
|
||||
activesupport (= 4.2.5.1)
|
||||
builder (~> 3.1)
|
||||
erubis (~> 2.7.0)
|
||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||
|
|
@ -61,17 +61,17 @@ GEM
|
|||
sass-rails
|
||||
activeadmin_pagedown (0.0.2)
|
||||
activeadmin (>= 0.5.0)
|
||||
activejob (4.2.5)
|
||||
activesupport (= 4.2.5)
|
||||
activejob (4.2.5.1)
|
||||
activesupport (= 4.2.5.1)
|
||||
globalid (>= 0.3.0)
|
||||
activemodel (4.2.5)
|
||||
activesupport (= 4.2.5)
|
||||
activemodel (4.2.5.1)
|
||||
activesupport (= 4.2.5.1)
|
||||
builder (~> 3.1)
|
||||
activerecord (4.2.5)
|
||||
activemodel (= 4.2.5)
|
||||
activesupport (= 4.2.5)
|
||||
activerecord (4.2.5.1)
|
||||
activemodel (= 4.2.5.1)
|
||||
activesupport (= 4.2.5.1)
|
||||
arel (~> 6.0)
|
||||
activesupport (4.2.5)
|
||||
activesupport (4.2.5.1)
|
||||
i18n (~> 0.7)
|
||||
json (~> 1.7, >= 1.7.7)
|
||||
minitest (~> 5.1)
|
||||
|
|
@ -82,15 +82,13 @@ GEM
|
|||
activesupport (>= 3.0.0)
|
||||
arel (6.0.3)
|
||||
ast (2.2.0)
|
||||
astrolabe (1.3.1)
|
||||
parser (~> 2.2)
|
||||
bcrypt (3.1.10)
|
||||
binding_of_caller (0.7.2)
|
||||
debug_inspector (>= 0.0.1)
|
||||
bourbon (4.2.6)
|
||||
sass (~> 3.4)
|
||||
thor (~> 0.19)
|
||||
brakeman (3.1.4)
|
||||
brakeman (3.1.5)
|
||||
erubis (~> 2.6)
|
||||
fastercsv (~> 1.5)
|
||||
haml (>= 3.0, < 5.0)
|
||||
|
|
@ -104,7 +102,7 @@ GEM
|
|||
terminal-table (~> 1.4)
|
||||
buftok (0.2.0)
|
||||
builder (3.2.2)
|
||||
byebug (8.2.1)
|
||||
byebug (8.2.2)
|
||||
chunky_png (1.3.5)
|
||||
coderay (1.1.0)
|
||||
coffee-rails (4.1.1)
|
||||
|
|
@ -128,7 +126,7 @@ GEM
|
|||
sass (>= 3.2, < 3.5)
|
||||
concurrent-ruby (1.0.0)
|
||||
debug_inspector (0.0.2)
|
||||
devise (3.5.3)
|
||||
devise (3.5.6)
|
||||
bcrypt (~> 3.0)
|
||||
orm_adapter (~> 0.1)
|
||||
railties (>= 3.2.6, < 5)
|
||||
|
|
@ -138,7 +136,7 @@ GEM
|
|||
devise-i18n (0.12.1)
|
||||
differ (0.1.2)
|
||||
docile (1.1.5)
|
||||
domain_name (0.5.25)
|
||||
domain_name (0.5.20160128)
|
||||
unf (>= 0.0.5, < 1.0.0)
|
||||
em-websocket (0.5.1)
|
||||
eventmachine (>= 0.12.9)
|
||||
|
|
@ -147,7 +145,7 @@ GEM
|
|||
activemodel
|
||||
equalizer (0.0.10)
|
||||
erubis (2.7.0)
|
||||
eventmachine (1.0.8)
|
||||
eventmachine (1.0.9.1)
|
||||
execjs (2.6.0)
|
||||
faraday (0.9.2)
|
||||
multipart-post (>= 1.2, < 3)
|
||||
|
|
@ -158,8 +156,8 @@ GEM
|
|||
formatador (0.2.5)
|
||||
formtastic (3.1.3)
|
||||
actionpack (>= 3.2.13)
|
||||
formtastic_i18n (0.4.1)
|
||||
geocoder (1.2.14)
|
||||
formtastic_i18n (0.5.0)
|
||||
geocoder (1.3.0)
|
||||
globalid (0.3.6)
|
||||
activesupport (>= 4.1.0)
|
||||
guard (2.13.0)
|
||||
|
|
@ -179,7 +177,7 @@ GEM
|
|||
guard (~> 2.2)
|
||||
guard-compat (~> 1.1)
|
||||
guard-compat (1.2.1)
|
||||
guard-livereload (2.5.1)
|
||||
guard-livereload (2.5.2)
|
||||
em-websocket (~> 0.5)
|
||||
guard (~> 2.8)
|
||||
guard-compat (~> 1.0)
|
||||
|
|
@ -215,7 +213,7 @@ GEM
|
|||
haml (~> 4.0.0)
|
||||
nokogiri (~> 1.6.0)
|
||||
ruby_parser (~> 3.5)
|
||||
http (0.9.8)
|
||||
http (1.0.2)
|
||||
addressable (~> 2.3)
|
||||
http-cookie (~> 1.0)
|
||||
http-form_data (~> 1.0.1)
|
||||
|
|
@ -231,10 +229,10 @@ GEM
|
|||
has_scope (~> 0.6.0.rc)
|
||||
railties (>= 3.2, < 5)
|
||||
responders
|
||||
jbuilder (2.4.0)
|
||||
jbuilder (2.4.1)
|
||||
activesupport (>= 3.0.0, < 5.1)
|
||||
multi_json (~> 1.2)
|
||||
jquery-rails (4.0.5)
|
||||
jquery-rails (4.1.0)
|
||||
rails-dom-testing (~> 1.0)
|
||||
railties (>= 4.2.0)
|
||||
thor (>= 0.14, < 2.0)
|
||||
|
|
@ -251,9 +249,9 @@ GEM
|
|||
railties (>= 3.1)
|
||||
leaflet-rails (0.7.4)
|
||||
libv8 (3.16.14.13)
|
||||
listen (3.0.5)
|
||||
listen (3.0.6)
|
||||
rb-fsevent (>= 0.9.3)
|
||||
rb-inotify (>= 0.9)
|
||||
rb-inotify (>= 0.9.7)
|
||||
loofah (2.0.3)
|
||||
nokogiri (>= 1.5.9)
|
||||
lumberjack (1.0.10)
|
||||
|
|
@ -266,25 +264,25 @@ GEM
|
|||
method_source (0.8.2)
|
||||
mime-types (2.99)
|
||||
mini_portile2 (2.0.0)
|
||||
minitest (5.8.3)
|
||||
minitest (5.8.4)
|
||||
modernizr-rails (2.7.1)
|
||||
multi_json (1.11.2)
|
||||
multipart-post (2.0.0)
|
||||
mysql2 (0.3.20)
|
||||
naught (1.1.0)
|
||||
nenv (0.2.0)
|
||||
nokogiri (1.6.7.1)
|
||||
nenv (0.3.0)
|
||||
nokogiri (1.6.7.2)
|
||||
mini_portile2 (~> 2.0.0.rc2)
|
||||
notiffany (0.0.8)
|
||||
nenv (~> 0.1)
|
||||
shellany (~> 0.0)
|
||||
orm_adapter (0.5.0)
|
||||
paper_trail (4.0.1)
|
||||
paper_trail (4.0.2)
|
||||
activerecord (>= 3.0, < 6.0)
|
||||
activesupport (>= 3.0, < 6.0)
|
||||
request_store (~> 1.1)
|
||||
parser (2.2.3.0)
|
||||
ast (>= 1.1, < 3.0)
|
||||
parser (2.3.0.5)
|
||||
ast (~> 2.2)
|
||||
polyamorous (1.3.0)
|
||||
activerecord (>= 3.0)
|
||||
powerpack (0.1.1)
|
||||
|
|
@ -299,16 +297,16 @@ GEM
|
|||
rack
|
||||
rack-test (0.6.3)
|
||||
rack (>= 1.0)
|
||||
rails (4.2.5)
|
||||
actionmailer (= 4.2.5)
|
||||
actionpack (= 4.2.5)
|
||||
actionview (= 4.2.5)
|
||||
activejob (= 4.2.5)
|
||||
activemodel (= 4.2.5)
|
||||
activerecord (= 4.2.5)
|
||||
activesupport (= 4.2.5)
|
||||
rails (4.2.5.1)
|
||||
actionmailer (= 4.2.5.1)
|
||||
actionpack (= 4.2.5.1)
|
||||
actionview (= 4.2.5.1)
|
||||
activejob (= 4.2.5.1)
|
||||
activemodel (= 4.2.5.1)
|
||||
activerecord (= 4.2.5.1)
|
||||
activesupport (= 4.2.5.1)
|
||||
bundler (>= 1.3.0, < 2.0)
|
||||
railties (= 4.2.5)
|
||||
railties (= 4.2.5.1)
|
||||
sprockets-rails
|
||||
rails-deprecated_sanitizer (1.0.3)
|
||||
activesupport (>= 4.2.0.alpha)
|
||||
|
|
@ -316,18 +314,18 @@ GEM
|
|||
activesupport (>= 4.2.0.beta, < 5.0)
|
||||
nokogiri (~> 1.6.0)
|
||||
rails-deprecated_sanitizer (>= 1.0.1)
|
||||
rails-html-sanitizer (1.0.2)
|
||||
rails-html-sanitizer (1.0.3)
|
||||
loofah (~> 2.0)
|
||||
rails-i18n (4.0.8)
|
||||
i18n (~> 0.7)
|
||||
railties (~> 4.0)
|
||||
railties (4.2.5)
|
||||
actionpack (= 4.2.5)
|
||||
activesupport (= 4.2.5)
|
||||
railties (4.2.5.1)
|
||||
actionpack (= 4.2.5.1)
|
||||
activesupport (= 4.2.5.1)
|
||||
rake (>= 0.8.7)
|
||||
thor (>= 0.18.1, < 2.0)
|
||||
rainbow (2.0.0)
|
||||
rake (10.4.2)
|
||||
rainbow (2.1.0)
|
||||
rake (10.5.0)
|
||||
ransack (1.7.0)
|
||||
actionpack (>= 3.0)
|
||||
activerecord (>= 3.0)
|
||||
|
|
@ -335,30 +333,29 @@ GEM
|
|||
i18n
|
||||
polyamorous (~> 1.2)
|
||||
rb-fsevent (0.9.7)
|
||||
rb-inotify (0.9.5)
|
||||
rb-inotify (0.9.7)
|
||||
ffi (>= 0.5.0)
|
||||
rdoc (4.2.1)
|
||||
rdoc (4.2.2)
|
||||
json (~> 1.4)
|
||||
redcarpet (3.3.4)
|
||||
ref (2.0.0)
|
||||
request_store (1.3.0)
|
||||
responders (2.1.1)
|
||||
railties (>= 4.2.0, < 5.1)
|
||||
rubocop (0.35.1)
|
||||
astrolabe (~> 1.3)
|
||||
parser (>= 2.2.3.0, < 3.0)
|
||||
rubocop (0.37.2)
|
||||
parser (>= 2.3.0.4, < 3.0)
|
||||
powerpack (~> 0.1)
|
||||
rainbow (>= 1.99.1, < 3.0)
|
||||
ruby-progressbar (~> 1.7)
|
||||
tins (<= 1.6.0)
|
||||
unicode-display_width (~> 0.3)
|
||||
ruby-progressbar (1.7.5)
|
||||
ruby2ruby (2.2.0)
|
||||
ruby_parser (~> 3.1)
|
||||
sexp_processor (~> 4.0)
|
||||
ruby_parser (3.7.2)
|
||||
ruby_parser (3.7.3)
|
||||
sexp_processor (~> 4.1)
|
||||
safe_yaml (1.0.4)
|
||||
sass (3.4.20)
|
||||
sass (3.4.21)
|
||||
sass-rails (5.0.4)
|
||||
railties (>= 4.0.0, < 5.0)
|
||||
sass (~> 3.1)
|
||||
|
|
@ -370,12 +367,12 @@ GEM
|
|||
rdoc (~> 4.0)
|
||||
select2-rails (3.5.9.3)
|
||||
thor (~> 0.14)
|
||||
sexp_processor (4.6.0)
|
||||
sexp_processor (4.6.1)
|
||||
shellany (0.0.1)
|
||||
simple_calendar (2.0.3)
|
||||
simple_calendar (2.0.6)
|
||||
rails (>= 3.0)
|
||||
simple_oauth (0.3.1)
|
||||
simplecov (0.11.1)
|
||||
simplecov (0.11.2)
|
||||
docile (~> 1.1.0)
|
||||
json (~> 1.8)
|
||||
simplecov-html (~> 0.10.0)
|
||||
|
|
@ -384,11 +381,11 @@ GEM
|
|||
temple (~> 0.7.3)
|
||||
tilt (>= 1.3.3, < 2.1)
|
||||
slop (3.6.0)
|
||||
spring (1.6.1)
|
||||
spring (1.6.3)
|
||||
sprockets (3.5.2)
|
||||
concurrent-ruby (~> 1.0)
|
||||
rack (> 1, < 3)
|
||||
sprockets-rails (3.0.0)
|
||||
sprockets-rails (3.0.1)
|
||||
actionpack (>= 4.0)
|
||||
activesupport (>= 4.0)
|
||||
sprockets (>= 3.0.0)
|
||||
|
|
@ -404,19 +401,18 @@ GEM
|
|||
thor (0.19.1)
|
||||
thread_safe (0.3.5)
|
||||
tilt (2.0.2)
|
||||
tins (1.6.0)
|
||||
tinymce-rails (4.3.2)
|
||||
tinymce-rails (4.3.3)
|
||||
railties (>= 3.1.1)
|
||||
tinymce-rails-langs (4.20140129)
|
||||
tinymce-rails (~> 4.0)
|
||||
turbolinks (2.5.3)
|
||||
coffee-rails
|
||||
twitter (5.15.0)
|
||||
twitter (5.16.0)
|
||||
addressable (~> 2.3)
|
||||
buftok (~> 0.2.0)
|
||||
equalizer (= 0.0.10)
|
||||
faraday (~> 0.9.0)
|
||||
http (>= 0.4, < 0.10)
|
||||
http (~> 1.0)
|
||||
http_parser.rb (~> 0.6.0)
|
||||
json (~> 1.8)
|
||||
memoizable (~> 0.4.0)
|
||||
|
|
@ -429,10 +425,11 @@ GEM
|
|||
json (>= 1.8.0)
|
||||
unf (0.1.4)
|
||||
unf_ext
|
||||
unf_ext (0.0.7.1)
|
||||
warden (1.2.4)
|
||||
unf_ext (0.0.7.2)
|
||||
unicode-display_width (0.3.1)
|
||||
warden (1.2.6)
|
||||
rack (>= 1.0)
|
||||
web-console (2.2.1)
|
||||
web-console (2.3.0)
|
||||
activemodel (>= 4.0)
|
||||
binding_of_caller (>= 0.7.2)
|
||||
railties (>= 4.0)
|
||||
|
|
|
|||
|
|
@ -88,11 +88,8 @@ class EventsController < ApplicationController
|
|||
|
||||
# Use callbacks to share common setup or constraints between actions
|
||||
def set_event
|
||||
if params[:secret].present?
|
||||
@event = Event.where secret: params[:secret]
|
||||
else
|
||||
@event = Event.moderated
|
||||
end
|
||||
@event = Event.where secret: params[:secret] if params[:secret].present?
|
||||
@event = @event.find params[:id]
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -89,9 +89,9 @@ class OrgasController < ApplicationController
|
|||
# through
|
||||
def orga_params
|
||||
params.require(:orga)
|
||||
.permit :lock_version, :kind_id, :name, :description, :city, :department,
|
||||
:region_id, :url, :diaspora, :feed, :contact, :submitter, :tags,
|
||||
:active
|
||||
.permit :lock_version, :kind_id, :name, :description, :city,
|
||||
:department, :region_id, :url, :diaspora, :feed, :contact,
|
||||
:submitter, :tags, :active
|
||||
end
|
||||
|
||||
# Check that you can only edit an existing event if you know its secret
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@ class TagsController < InheritedResources::Base
|
|||
.pluck(:tags).map(&:split).flatten
|
||||
.group_by { |i| i }
|
||||
.map { |k, v| [k, v.size] }
|
||||
.reject { |_k, v| v <= 3 }
|
||||
.sort
|
||||
|
||||
respond_to do |format|
|
||||
|
|
@ -28,7 +27,6 @@ class TagsController < InheritedResources::Base
|
|||
.pluck(:tags).map(&:split).flatten
|
||||
.group_by { |i| i }
|
||||
.map { |k, v| [k, v.size] }
|
||||
.reject { |_k, v| v <= 3 }
|
||||
.sort
|
||||
|
||||
respond_to do |format|
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@ class Event < ActiveRecord::Base
|
|||
host: ActionMailer::Base.default_url_options[:host])
|
||||
|
||||
tweet = "#{self} #{url}"
|
||||
if (tweet.size >= 140)
|
||||
if tweet.size >= 140
|
||||
tweet = "#{tweet[0, tweet.rindex(/\s/, 140 - url.size)]} #{url}"
|
||||
end
|
||||
tweet
|
||||
|
|
|
|||
|
|
@ -38,8 +38,7 @@ module AgendaDuLibreRails
|
|||
# config.quiet_assets = false
|
||||
config.sass.preferred_syntax = :sass
|
||||
|
||||
config.action_dispatch.default_headers
|
||||
.merge! 'X-Frame-Options' => 'ALLOWALL'
|
||||
config.action_dispatch.default_headers['X-Frame-Options'] = 'ALLOWALL'
|
||||
|
||||
config.active_record.raise_in_transactional_callbacks = true
|
||||
end
|
||||
|
|
|
|||
|
|
@ -25,7 +25,8 @@ Kind.create name: 'provider', icon: 'tty'
|
|||
Kind.create name: 'institution', icon: 'institution'
|
||||
|
||||
# rubocop:disable Metrics/LineLength
|
||||
I18n::Backend::ActiveRecord::Translation.create([
|
||||
I18n::Backend::ActiveRecord::Translation.create(
|
||||
[
|
||||
{ locale: 'fr', key: 'mail_suffix', value: '[AdL] ' },
|
||||
|
||||
{ locale: 'fr', key: 'layouts.application.subtitle',
|
||||
|
|
@ -409,4 +410,5 @@ Si des informations manquent, les récupérer sur le site de l'événement si el
|
|||
|
||||
Ces recommandations de modération sont à discuter et à améliorer au fur et à mesure de la vie du site. Nous pouvons en discuter via la liste `moderateurs@agendadulibre.org`.
|
||||
" }
|
||||
])
|
||||
]
|
||||
)
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ if File.file? 'Rakefile'
|
|||
.split("\0")
|
||||
|
||||
task = 'assets:precompile'
|
||||
if changed_assets.size > 0
|
||||
unless changed_assets.empty?
|
||||
run "#{rake_cmd} #{task} RAILS_ENV=#{RAILS_ENV} RAILS_GROUPS=assets"
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ class OrgasControllerTest < ActionController::TestCase
|
|||
# Necessary to have the proper paper_trail version
|
||||
@orga.update_attributes name: 'My Title'
|
||||
|
||||
patch :update, id: @orga, orga: { name: @orga.name }
|
||||
patch :update, id: @orga, secret: @orga.secret, orga: { name: @orga.name }
|
||||
|
||||
assert_empty assigns(:orga).errors.messages
|
||||
assert_redirected_to assigns(:orga)
|
||||
|
|
@ -71,10 +71,10 @@ class OrgasControllerTest < ActionController::TestCase
|
|||
end
|
||||
|
||||
test 'should not update orga without proper secret' do
|
||||
patch :update, id: @orga, secret: @orga.secret, orga: {
|
||||
patch :update, id: @orga, orga: {
|
||||
name: 'hello world'
|
||||
}
|
||||
|
||||
assert_redirected_to assigns(:orga)
|
||||
assert_redirected_to :new_user_session
|
||||
end
|
||||
end
|
||||
|
|
|
|||
Loading…
Reference in New Issue