From fcb2bd409e64e7307568c6528ddb0a5e3d991441 Mon Sep 17 00:00:00 2001
From: echarp <manu@echarp.org>
Date: Sun, 27 Mar 2016 14:34:34 +0200
Subject: [PATCH] Bundle update
---
Gemfile.lock | 37 ++++++++++----------
app/assets/javascripts/application.js.coffee | 2 +-
app/controllers/tags_controller.rb | 7 +++-
3 files changed, 26 insertions(+), 20 deletions(-)
diff --git a/Gemfile.lock b/Gemfile.lock
index c2fad1361..7a9bc3c5d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,9 +17,9 @@ GIT
GIT
remote: git://github.com/svenfuchs/i18n-active_record.git
- revision: b26c2e62e32df2f3b9ae42083647725b7ecfdff0
+ revision: cf2e3ad8afad0cc90da1e9693c928d3eb52da5b0
specs:
- i18n-active_record (0.0.2)
+ i18n-active_record (0.1.0)
i18n (>= 0.5.0)
GEM
@@ -132,7 +132,7 @@ GEM
devise-i18n (1.0.0)
differ (0.1.2)
docile (1.1.5)
- domain_name (0.5.20160309)
+ domain_name (0.5.20160310)
unf (>= 0.0.5, < 1.0.0)
em-websocket (0.5.1)
eventmachine (>= 0.12.9)
@@ -141,7 +141,7 @@ GEM
activemodel
equalizer (0.0.10)
erubis (2.7.0)
- eventmachine (1.0.9.1)
+ eventmachine (1.2.0.1)
execjs (2.6.0)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
@@ -149,7 +149,7 @@ GEM
font-awesome-sass (4.5.0)
sass (>= 3.2)
formatador (0.2.5)
- formtastic (3.1.3)
+ formtastic (3.1.4)
actionpack (>= 3.2.13)
formtastic_i18n (0.6.0)
geocoder (1.3.1)
@@ -208,7 +208,7 @@ GEM
haml (~> 4.0.0)
nokogiri (~> 1.6.0)
ruby_parser (~> 3.5)
- http (1.0.2)
+ http (1.0.4)
addressable (~> 2.3)
http-cookie (~> 1.0)
http-form_data (~> 1.0.1)
@@ -250,14 +250,16 @@ GEM
loofah (2.0.3)
nokogiri (>= 1.5.9)
lumberjack (1.0.10)
- mail (2.6.3)
- mime-types (>= 1.16, < 3)
+ mail (2.6.4)
+ mime-types (>= 1.16, < 4)
memoizable (0.4.2)
thread_safe (~> 0.3, >= 0.3.1)
meta-tags (2.1.0)
actionpack (>= 3.0.0)
method_source (0.8.2)
- mime-types (2.99.1)
+ mime-types (3.0)
+ mime-types-data (~> 3.2015)
+ mime-types-data (3.2016.0221)
mini_portile2 (2.0.0)
minitest (5.8.4)
modernizr-rails (2.7.1)
@@ -276,7 +278,7 @@ GEM
activerecord (>= 3.0, < 6.0)
activesupport (>= 3.0, < 6.0)
request_store (~> 1.1)
- parser (2.3.0.6)
+ parser (2.3.0.7)
ast (~> 2.2)
polyamorous (1.3.0)
activerecord (>= 3.0)
@@ -320,7 +322,7 @@ GEM
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (2.1.0)
- rake (11.1.0)
+ rake (11.1.1)
ransack (1.7.0)
actionpack (>= 3.0)
activerecord (>= 3.0)
@@ -335,10 +337,10 @@ GEM
redcarpet (3.3.4)
ref (2.0.0)
request_store (1.3.0)
- responders (2.1.1)
+ responders (2.1.2)
railties (>= 4.2.0, < 5.1)
- rubocop (0.38.0)
- parser (>= 2.3.0.6, < 3.0)
+ rubocop (0.39.0)
+ parser (>= 2.3.0.7, < 3.0)
powerpack (~> 0.1)
rainbow (>= 1.99.1, < 3.0)
ruby-progressbar (~> 1.7)
@@ -396,7 +398,7 @@ GEM
thor (0.19.1)
thread_safe (0.3.5)
tilt (2.0.2)
- tinymce-rails (4.3.7)
+ tinymce-rails (4.3.8)
railties (>= 3.1.1)
tinymce-rails-langs (4.20160310)
tinymce-rails (~> 4.1, >= 4.1.10)
@@ -415,9 +417,8 @@ GEM
simple_oauth (~> 0.3.0)
tzinfo (1.2.2)
thread_safe (~> 0.1)
- uglifier (2.7.2)
- execjs (>= 0.3.0)
- json (>= 1.8.0)
+ uglifier (3.0.0)
+ execjs (>= 0.3.0, < 3)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.2)
diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
index e8582e31f..b2085e008 100644
--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -50,4 +50,4 @@ $(document).ready ->
$('img.favicon').one 'error', ->
$(this).css visibility: 'hidden'
- # $('select').select2()
+ # $('select').select2()
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index b269e6129..da4ea6cf6 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -16,6 +16,11 @@ class TagsController < InheritedResources::Base
def show
@events_future = apply_scopes(Event).moderated.future
@events_past = apply_scopes(Event).moderated.past
+
+ respond_to do |format|
+ format.html
+ format.json { render json: @events_future + @events_past }
+ end
end
def orgas
@@ -35,6 +40,6 @@ class TagsController < InheritedResources::Base
.group_by { |i| i }
.map { |k, v| [k, v.size] }
.reject { |_k, v| v <= 3 }
- .sort
+ .sort { |t| -t[1] }
end
end
--
GitLab