Bundle update
This commit is contained in:
parent
5ed5a8de77
commit
6513e388de
142
Gemfile.lock
142
Gemfile.lock
@ -8,32 +8,32 @@ GEM
|
|||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
remote: https://rails-assets.org/
|
remote: https://rails-assets.org/
|
||||||
specs:
|
specs:
|
||||||
actioncable (5.2.1)
|
actioncable (5.2.2)
|
||||||
actionpack (= 5.2.1)
|
actionpack (= 5.2.2)
|
||||||
nio4r (~> 2.0)
|
nio4r (~> 2.0)
|
||||||
websocket-driver (>= 0.6.1)
|
websocket-driver (>= 0.6.1)
|
||||||
actionmailer (5.2.1)
|
actionmailer (5.2.2)
|
||||||
actionpack (= 5.2.1)
|
actionpack (= 5.2.2)
|
||||||
actionview (= 5.2.1)
|
actionview (= 5.2.2)
|
||||||
activejob (= 5.2.1)
|
activejob (= 5.2.2)
|
||||||
mail (~> 2.5, >= 2.5.4)
|
mail (~> 2.5, >= 2.5.4)
|
||||||
rails-dom-testing (~> 2.0)
|
rails-dom-testing (~> 2.0)
|
||||||
actionpack (5.2.1)
|
actionpack (5.2.2)
|
||||||
actionview (= 5.2.1)
|
actionview (= 5.2.2)
|
||||||
activesupport (= 5.2.1)
|
activesupport (= 5.2.2)
|
||||||
rack (~> 2.0)
|
rack (~> 2.0)
|
||||||
rack-test (>= 0.6.3)
|
rack-test (>= 0.6.3)
|
||||||
rails-dom-testing (~> 2.0)
|
rails-dom-testing (~> 2.0)
|
||||||
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
||||||
actionview (5.2.1)
|
actionview (5.2.2)
|
||||||
activesupport (= 5.2.1)
|
activesupport (= 5.2.2)
|
||||||
builder (~> 3.1)
|
builder (~> 3.1)
|
||||||
erubi (~> 1.4)
|
erubi (~> 1.4)
|
||||||
rails-dom-testing (~> 2.0)
|
rails-dom-testing (~> 2.0)
|
||||||
rails-html-sanitizer (~> 1.0, >= 1.0.3)
|
rails-html-sanitizer (~> 1.0, >= 1.0.3)
|
||||||
actionview-encoded_mail_to (1.0.9)
|
actionview-encoded_mail_to (1.0.9)
|
||||||
rails
|
rails
|
||||||
activeadmin (1.3.1)
|
activeadmin (1.4.3)
|
||||||
arbre (>= 1.1.1)
|
arbre (>= 1.1.1)
|
||||||
coffee-rails
|
coffee-rails
|
||||||
formtastic (~> 3.1)
|
formtastic (~> 3.1)
|
||||||
@ -45,20 +45,20 @@ GEM
|
|||||||
ransack (>= 1.8.7)
|
ransack (>= 1.8.7)
|
||||||
sass (~> 3.1)
|
sass (~> 3.1)
|
||||||
sprockets (< 4.1)
|
sprockets (< 4.1)
|
||||||
activejob (5.2.1)
|
activejob (5.2.2)
|
||||||
activesupport (= 5.2.1)
|
activesupport (= 5.2.2)
|
||||||
globalid (>= 0.3.6)
|
globalid (>= 0.3.6)
|
||||||
activemodel (5.2.1)
|
activemodel (5.2.2)
|
||||||
activesupport (= 5.2.1)
|
activesupport (= 5.2.2)
|
||||||
activerecord (5.2.1)
|
activerecord (5.2.2)
|
||||||
activemodel (= 5.2.1)
|
activemodel (= 5.2.2)
|
||||||
activesupport (= 5.2.1)
|
activesupport (= 5.2.2)
|
||||||
arel (>= 9.0)
|
arel (>= 9.0)
|
||||||
activestorage (5.2.1)
|
activestorage (5.2.2)
|
||||||
actionpack (= 5.2.1)
|
actionpack (= 5.2.2)
|
||||||
activerecord (= 5.2.1)
|
activerecord (= 5.2.2)
|
||||||
marcel (~> 0.3.1)
|
marcel (~> 0.3.1)
|
||||||
activesupport (5.2.1)
|
activesupport (5.2.2)
|
||||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||||
i18n (>= 0.7, < 2)
|
i18n (>= 0.7, < 2)
|
||||||
minitest (~> 5.1)
|
minitest (~> 5.1)
|
||||||
@ -88,7 +88,7 @@ GEM
|
|||||||
coffee-script-source
|
coffee-script-source
|
||||||
execjs
|
execjs
|
||||||
coffee-script-source (1.12.2)
|
coffee-script-source (1.12.2)
|
||||||
concurrent-ruby (1.1.3)
|
concurrent-ruby (1.1.4)
|
||||||
crass (1.0.4)
|
crass (1.0.4)
|
||||||
devise (4.5.0)
|
devise (4.5.0)
|
||||||
bcrypt (~> 3.0)
|
bcrypt (~> 3.0)
|
||||||
@ -96,8 +96,8 @@ GEM
|
|||||||
railties (>= 4.1.0, < 6.0)
|
railties (>= 4.1.0, < 6.0)
|
||||||
responders
|
responders
|
||||||
warden (~> 1.2.3)
|
warden (~> 1.2.3)
|
||||||
devise-i18n (1.6.5)
|
devise-i18n (1.7.0)
|
||||||
devise (>= 4.4)
|
devise (>= 4.5)
|
||||||
differ (0.1.2)
|
differ (0.1.2)
|
||||||
domain_name (0.5.20180417)
|
domain_name (0.5.20180417)
|
||||||
unf (>= 0.0.5, < 1.0.0)
|
unf (>= 0.0.5, < 1.0.0)
|
||||||
@ -107,14 +107,14 @@ GEM
|
|||||||
email_validator (1.6.0)
|
email_validator (1.6.0)
|
||||||
activemodel
|
activemodel
|
||||||
equalizer (0.0.11)
|
equalizer (0.0.11)
|
||||||
erubi (1.7.1)
|
erubi (1.8.0)
|
||||||
erubis (2.7.0)
|
erubis (2.7.0)
|
||||||
eventmachine (1.2.7)
|
eventmachine (1.2.7)
|
||||||
execjs (2.7.0)
|
execjs (2.7.0)
|
||||||
ffi (1.9.25)
|
ffi (1.9.25)
|
||||||
flag-icons-rails (3.1.0)
|
flag-icons-rails (3.1.0)
|
||||||
sass (~> 3.2)
|
sass (~> 3.2)
|
||||||
font-awesome-sass (5.5.0.1)
|
font-awesome-sass (5.6.1)
|
||||||
sassc (>= 1.11)
|
sassc (>= 1.11)
|
||||||
formatador (0.2.5)
|
formatador (0.2.5)
|
||||||
formtastic (3.1.5)
|
formtastic (3.1.5)
|
||||||
@ -123,7 +123,7 @@ GEM
|
|||||||
geocoder (1.5.0)
|
geocoder (1.5.0)
|
||||||
globalid (0.4.1)
|
globalid (0.4.1)
|
||||||
activesupport (>= 4.2.0)
|
activesupport (>= 4.2.0)
|
||||||
guard (2.14.2)
|
guard (2.15.0)
|
||||||
formatador (>= 0.2.4)
|
formatador (>= 0.2.4)
|
||||||
listen (>= 2.7, < 4.0)
|
listen (>= 2.7, < 4.0)
|
||||||
lumberjack (>= 1.0.12, < 2.0)
|
lumberjack (>= 1.0.12, < 2.0)
|
||||||
@ -192,11 +192,11 @@ GEM
|
|||||||
http-form_data (2.1.1)
|
http-form_data (2.1.1)
|
||||||
http_accept_language (2.1.1)
|
http_accept_language (2.1.1)
|
||||||
http_parser.rb (0.6.0)
|
http_parser.rb (0.6.0)
|
||||||
i18n (1.1.1)
|
i18n (1.3.0)
|
||||||
concurrent-ruby (~> 1.0)
|
concurrent-ruby (~> 1.0)
|
||||||
i18n-active_record (0.2.2)
|
i18n-active_record (0.2.2)
|
||||||
i18n (>= 0.5.0)
|
i18n (>= 0.5.0)
|
||||||
icalendar (2.5.1)
|
icalendar (2.5.2)
|
||||||
ice_cube (~> 0.16)
|
ice_cube (~> 0.16)
|
||||||
inherited_resources (1.9.0)
|
inherited_resources (1.9.0)
|
||||||
actionpack (>= 4.2, < 5.3)
|
actionpack (>= 4.2, < 5.3)
|
||||||
@ -241,12 +241,12 @@ GEM
|
|||||||
mimemagic (~> 0.3.2)
|
mimemagic (~> 0.3.2)
|
||||||
memoizable (0.4.2)
|
memoizable (0.4.2)
|
||||||
thread_safe (~> 0.3, >= 0.3.1)
|
thread_safe (~> 0.3, >= 0.3.1)
|
||||||
meta-tags (2.10.0)
|
meta-tags (2.11.0)
|
||||||
actionpack (>= 3.2.0, < 5.3)
|
actionpack (>= 3.2.0, < 5.3)
|
||||||
method_source (0.9.1)
|
method_source (0.9.2)
|
||||||
mimemagic (0.3.2)
|
mimemagic (0.3.3)
|
||||||
mini_mime (1.0.1)
|
mini_mime (1.0.1)
|
||||||
mini_portile2 (2.3.0)
|
mini_portile2 (2.4.0)
|
||||||
minitest (5.11.3)
|
minitest (5.11.3)
|
||||||
modernizr-rails (2.7.1)
|
modernizr-rails (2.7.1)
|
||||||
multi_json (1.13.1)
|
multi_json (1.13.1)
|
||||||
@ -255,14 +255,14 @@ GEM
|
|||||||
naught (1.1.0)
|
naught (1.1.0)
|
||||||
nenv (0.3.0)
|
nenv (0.3.0)
|
||||||
nio4r (2.3.1)
|
nio4r (2.3.1)
|
||||||
nokogiri (1.8.5)
|
nokogiri (1.9.1)
|
||||||
mini_portile2 (~> 2.3.0)
|
mini_portile2 (~> 2.4.0)
|
||||||
notiffany (0.1.1)
|
notiffany (0.1.1)
|
||||||
nenv (~> 0.1)
|
nenv (~> 0.1)
|
||||||
shellany (~> 0.0)
|
shellany (~> 0.0)
|
||||||
orm_adapter (0.5.0)
|
orm_adapter (0.5.0)
|
||||||
paper_trail (10.0.1)
|
paper_trail (10.1.0)
|
||||||
activerecord (>= 4.2, < 5.3)
|
activerecord (>= 4.2, < 6.0)
|
||||||
request_store (~> 1.1)
|
request_store (~> 1.1)
|
||||||
parallel (1.12.1)
|
parallel (1.12.1)
|
||||||
parser (2.5.3.0)
|
parser (2.5.3.0)
|
||||||
@ -274,7 +274,7 @@ GEM
|
|||||||
powerpack (0.1.2)
|
powerpack (0.1.2)
|
||||||
preserve (0.1.1)
|
preserve (0.1.1)
|
||||||
rails (>= 3.0)
|
rails (>= 3.0)
|
||||||
pry (0.12.0)
|
pry (0.12.2)
|
||||||
coderay (~> 1.1.0)
|
coderay (~> 1.1.0)
|
||||||
method_source (~> 0.9.0)
|
method_source (~> 0.9.0)
|
||||||
public_suffix (3.0.3)
|
public_suffix (3.0.3)
|
||||||
@ -284,18 +284,18 @@ GEM
|
|||||||
rack
|
rack
|
||||||
rack-test (1.1.0)
|
rack-test (1.1.0)
|
||||||
rack (>= 1.0, < 3)
|
rack (>= 1.0, < 3)
|
||||||
rails (5.2.1)
|
rails (5.2.2)
|
||||||
actioncable (= 5.2.1)
|
actioncable (= 5.2.2)
|
||||||
actionmailer (= 5.2.1)
|
actionmailer (= 5.2.2)
|
||||||
actionpack (= 5.2.1)
|
actionpack (= 5.2.2)
|
||||||
actionview (= 5.2.1)
|
actionview (= 5.2.2)
|
||||||
activejob (= 5.2.1)
|
activejob (= 5.2.2)
|
||||||
activemodel (= 5.2.1)
|
activemodel (= 5.2.2)
|
||||||
activerecord (= 5.2.1)
|
activerecord (= 5.2.2)
|
||||||
activestorage (= 5.2.1)
|
activestorage (= 5.2.2)
|
||||||
activesupport (= 5.2.1)
|
activesupport (= 5.2.2)
|
||||||
bundler (>= 1.3.0)
|
bundler (>= 1.3.0)
|
||||||
railties (= 5.2.1)
|
railties (= 5.2.2)
|
||||||
sprockets-rails (>= 2.0.0)
|
sprockets-rails (>= 2.0.0)
|
||||||
rails-assets-jquery (3.3.1)
|
rails-assets-jquery (3.3.1)
|
||||||
rails-assets-jquery-sparkline (2.1.3)
|
rails-assets-jquery-sparkline (2.1.3)
|
||||||
@ -304,10 +304,10 @@ GEM
|
|||||||
rails-assets-leaflet (1.3.4)
|
rails-assets-leaflet (1.3.4)
|
||||||
rails-assets-leaflet.markercluster (1.4.1)
|
rails-assets-leaflet.markercluster (1.4.1)
|
||||||
rails-assets-leaflet (>= 1.3.1)
|
rails-assets-leaflet (>= 1.3.1)
|
||||||
rails-controller-testing (1.0.2)
|
rails-controller-testing (1.0.4)
|
||||||
actionpack (~> 5.x, >= 5.0.1)
|
actionpack (>= 5.0.1.x)
|
||||||
actionview (~> 5.x, >= 5.0.1)
|
actionview (>= 5.0.1.x)
|
||||||
activesupport (~> 5.x)
|
activesupport (>= 5.0.1.x)
|
||||||
rails-dom-testing (2.0.3)
|
rails-dom-testing (2.0.3)
|
||||||
activesupport (>= 4.2.0)
|
activesupport (>= 4.2.0)
|
||||||
nokogiri (>= 1.6)
|
nokogiri (>= 1.6)
|
||||||
@ -316,22 +316,22 @@ GEM
|
|||||||
rails-i18n (5.1.2)
|
rails-i18n (5.1.2)
|
||||||
i18n (>= 0.7, < 2)
|
i18n (>= 0.7, < 2)
|
||||||
railties (>= 5.0, < 6)
|
railties (>= 5.0, < 6)
|
||||||
railties (5.2.1)
|
railties (5.2.2)
|
||||||
actionpack (= 5.2.1)
|
actionpack (= 5.2.2)
|
||||||
activesupport (= 5.2.1)
|
activesupport (= 5.2.2)
|
||||||
method_source
|
method_source
|
||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
thor (>= 0.19.0, < 2.0)
|
thor (>= 0.19.0, < 2.0)
|
||||||
rainbow (3.0.0)
|
rainbow (3.0.0)
|
||||||
rake (12.3.1)
|
rake (12.3.2)
|
||||||
ransack (2.1.0)
|
ransack (2.1.1)
|
||||||
actionpack (>= 5.0)
|
actionpack (>= 5.0)
|
||||||
activerecord (>= 5.0)
|
activerecord (>= 5.0)
|
||||||
activesupport (>= 5.0)
|
activesupport (>= 5.0)
|
||||||
i18n
|
i18n
|
||||||
rb-fsevent (0.10.3)
|
rb-fsevent (0.10.3)
|
||||||
rb-inotify (0.9.10)
|
rb-inotify (0.10.0)
|
||||||
ffi (>= 0.5.0, < 2)
|
ffi (~> 1.0)
|
||||||
rdoc (6.0.4)
|
rdoc (6.0.4)
|
||||||
ref (2.0.0)
|
ref (2.0.0)
|
||||||
request_store (1.4.1)
|
request_store (1.4.1)
|
||||||
@ -339,7 +339,7 @@ GEM
|
|||||||
responders (2.4.0)
|
responders (2.4.0)
|
||||||
actionpack (>= 4.2.0, < 5.3)
|
actionpack (>= 4.2.0, < 5.3)
|
||||||
railties (>= 4.2.0, < 5.3)
|
railties (>= 4.2.0, < 5.3)
|
||||||
rubocop (0.60.0)
|
rubocop (0.61.1)
|
||||||
jaro_winkler (~> 1.5.1)
|
jaro_winkler (~> 1.5.1)
|
||||||
parallel (~> 1.10)
|
parallel (~> 1.10)
|
||||||
parser (>= 2.5, != 2.5.1.1)
|
parser (>= 2.5, != 2.5.1.1)
|
||||||
@ -349,9 +349,9 @@ GEM
|
|||||||
unicode-display_width (~> 1.4.0)
|
unicode-display_width (~> 1.4.0)
|
||||||
ruby-progressbar (1.10.0)
|
ruby-progressbar (1.10.0)
|
||||||
ruby_dep (1.5.0)
|
ruby_dep (1.5.0)
|
||||||
ruby_parser (3.11.0)
|
ruby_parser (3.12.0)
|
||||||
sexp_processor (~> 4.9)
|
sexp_processor (~> 4.9)
|
||||||
sass (3.7.1)
|
sass (3.7.2)
|
||||||
sass-listen (~> 4.0.0)
|
sass-listen (~> 4.0.0)
|
||||||
sass-listen (4.0.0)
|
sass-listen (4.0.0)
|
||||||
rb-fsevent (~> 0.9, >= 0.9.4)
|
rb-fsevent (~> 0.9, >= 0.9.4)
|
||||||
@ -394,10 +394,10 @@ GEM
|
|||||||
therubyracer (0.12.3)
|
therubyracer (0.12.3)
|
||||||
libv8 (~> 3.16.14.15)
|
libv8 (~> 3.16.14.15)
|
||||||
ref
|
ref
|
||||||
thor (0.20.0)
|
thor (0.20.3)
|
||||||
thread_safe (0.3.6)
|
thread_safe (0.3.6)
|
||||||
tilt (2.0.8)
|
tilt (2.0.9)
|
||||||
tinymce-rails (4.8.4)
|
tinymce-rails (4.9.2)
|
||||||
railties (>= 3.1.1)
|
railties (>= 3.1.1)
|
||||||
tinymce-rails-langs (4.20180103)
|
tinymce-rails-langs (4.20180103)
|
||||||
tinymce-rails (~> 4.1, >= 4.1.10)
|
tinymce-rails (~> 4.1, >= 4.1.10)
|
||||||
@ -417,14 +417,14 @@ GEM
|
|||||||
simple_oauth (~> 0.3.0)
|
simple_oauth (~> 0.3.0)
|
||||||
tzinfo (1.2.5)
|
tzinfo (1.2.5)
|
||||||
thread_safe (~> 0.1)
|
thread_safe (~> 0.1)
|
||||||
uglifier (4.1.19)
|
uglifier (4.1.20)
|
||||||
execjs (>= 0.3.0, < 3)
|
execjs (>= 0.3.0, < 3)
|
||||||
unf (0.1.4)
|
unf (0.1.4)
|
||||||
unf_ext
|
unf_ext
|
||||||
unf_ext (0.0.7.5)
|
unf_ext (0.0.7.5)
|
||||||
unicode-display_width (1.4.0)
|
unicode-display_width (1.4.0)
|
||||||
warden (1.2.7)
|
warden (1.2.8)
|
||||||
rack (>= 1.0)
|
rack (>= 2.0.6)
|
||||||
web-console (3.7.0)
|
web-console (3.7.0)
|
||||||
actionview (>= 5.0)
|
actionview (>= 5.0)
|
||||||
activemodel (>= 5.0)
|
activemodel (>= 5.0)
|
||||||
|
@ -10,7 +10,7 @@ class OrgasController < ApplicationController
|
|||||||
|
|
||||||
def index
|
def index
|
||||||
@unfiltered_orgas = apply_scopes(Orga.moderated)
|
@unfiltered_orgas = apply_scopes(Orga.moderated)
|
||||||
@search = @unfiltered_orgas.search params[:q]
|
@search = @unfiltered_orgas.ransack params[:q]
|
||||||
@search.sorts = 'updated_at desc' if @search.sorts.empty?
|
@search.sorts = 'updated_at desc' if @search.sorts.empty?
|
||||||
@orgas = @search.result.page params[:page]
|
@orgas = @search.result.page params[:page]
|
||||||
end
|
end
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
= search_form_for Orga.search(params[:q]) do |f|
|
= search_form_for Orga.ransack(params[:q]) do |f|
|
||||||
= f.label :search, t('.label')
|
= f.label :search, t('.label')
|
||||||
%em.fa.fa-users
|
%em.fa.fa-users
|
||||||
= f.search_field :name_or_city_or_tags_or_description_cont_any,
|
= f.search_field :name_or_city_or_tags_or_description_cont_any,
|
||||||
id: :q_search, size: 16,
|
id: :q_ransack, size: 16,
|
||||||
placeholder: t('.title', entity: Orga.model_name.human),
|
placeholder: t('.title', entity: Orga.model_name.human),
|
||||||
title: t('.helper', entity: Orga.model_name.human)
|
title: t('.helper', entity: Orga.model_name.human)
|
||||||
= f.button class: :search do
|
= f.button class: :search do
|
||||||
|
Loading…
Reference in New Issue
Block a user