Bundle update
This commit is contained in:
parent
952e14fa73
commit
2ad53168e5
@ -1,18 +1,18 @@
|
||||
GIT
|
||||
remote: git://github.com/gregbell/active_admin.git
|
||||
revision: 5e9917a5c85d0697114ce9f6166da48595c4d1ba
|
||||
revision: 759a9bb7f8dab1b4cb9e23832febf7d0c370ebe4
|
||||
specs:
|
||||
activeadmin (1.0.0.pre)
|
||||
arbre (~> 1.0, >= 1.0.2)
|
||||
bourbon
|
||||
coffee-rails
|
||||
formtastic (~> 2.3.0.rc3)
|
||||
formtastic (~> 2.3)
|
||||
inherited_resources (~> 1.4.1)
|
||||
jquery-rails
|
||||
jquery-ui-rails (~> 5.0)
|
||||
kaminari (~> 0.15)
|
||||
rails (>= 3.2, < 4.2)
|
||||
ransack (~> 1.0)
|
||||
ransack (~> 1.3)
|
||||
sass-rails
|
||||
|
||||
GIT
|
||||
@ -290,7 +290,7 @@ GEM
|
||||
thread_safe (0.3.4)
|
||||
tilt (1.4.1)
|
||||
timers (1.1.0)
|
||||
tinymce-rails (4.1.3)
|
||||
tinymce-rails (4.1.4)
|
||||
railties (>= 3.1.1)
|
||||
tinymce-rails-langs (4.20140129)
|
||||
tinymce-rails (~> 4.0)
|
||||
|
@ -18,7 +18,7 @@
|
||||
root_url(start_date: start_date), class: 'month_selector' } do |date, events|
|
||||
.day_number= date.day
|
||||
%ul.events
|
||||
- events.select { |e| (e.start_time.to_date..e.end_time.to_date).cover? date }
|
||||
- events.select { |e| (e.start_time.to_date..e.end_time.to_date).cover? date }
|
||||
- .sort_by { |e| e.city }.each do |event|
|
||||
%li.event
|
||||
= link_to event do
|
||||
@ -37,7 +37,7 @@
|
||||
{ param => (date_range.last + 1.day).beginning_of_month, tag: params[:tag], region: params[:region] } } do |date, events|
|
||||
.day_number= date.day
|
||||
%ul.events
|
||||
- events.select { |e| (e.start_time.to_date..e.end_time.to_date).cover? date }
|
||||
- events.select { |e| (e.start_time.to_date..e.end_time.to_date).cover? date }
|
||||
- .sort_by { |e| e.city }.each do |event|
|
||||
%li.event
|
||||
= link_to event do
|
||||
|
Loading…
Reference in New Issue
Block a user