Conference select issue

This commit is contained in:
Godwin 2014-07-05 14:15:25 -06:00
parent c40a7b65ba
commit 200f3ad723
3 changed files with 4 additions and 13 deletions

View File

@ -38,7 +38,7 @@ group :development do
gem 'meta_request' gem 'meta_request'
gem 'haml-rails' gem 'haml-rails'
gem 'awesome_print' gem 'awesome_print'
gem 'rails-footnotes', :github => 'josevalim/rails-footnotes' #gem 'rails-footnotes', :github => 'josevalim/rails-footnotes'
end end
group :test do group :test do
@ -50,7 +50,7 @@ group :test do
gem 'selenium-webdriver' gem 'selenium-webdriver'
gem 'simplecov', require: false gem 'simplecov', require: false
gem 'webmock', require: false gem 'webmock', require: false
gem 'wdm', '>= 0.1.0' if RbConfig::CONFIG['target_os'] =~ /mswin|mingw|cygwin/i #gem 'wdm', '>= 0.1.0' if RbConfig::CONFIG['target_os'] =~ /mswin|mingw|cygwin/i
end end
group :staging, :production do group :staging, :production do

View File

@ -1,10 +1,3 @@
GIT
remote: git://github.com/josevalim/rails-footnotes.git
revision: 961015b3a73c2a0fc6b9501fc001e6eb082b7025
specs:
rails-footnotes (4.0.1)
rails (>= 3.2)
GIT GIT
remote: git://github.com/svenfuchs/i18n-active_record.git remote: git://github.com/svenfuchs/i18n-active_record.git
revision: 2d9a22b6a4e5d809782cdbfa65b14d9e47aa27fc revision: 2d9a22b6a4e5d809782cdbfa65b14d9e47aa27fc
@ -300,7 +293,6 @@ GEM
execjs (>= 0.3.0) execjs (>= 0.3.0)
json (>= 1.8.0) json (>= 1.8.0)
unicode_utils (1.4.0) unicode_utils (1.4.0)
wdm (0.1.0)
webmock (1.18.0) webmock (1.18.0)
addressable (>= 2.3.6) addressable (>= 2.3.6)
crack (>= 0.3.2) crack (>= 0.3.2)
@ -343,7 +335,6 @@ DEPENDENCIES
paper_trail paper_trail
pg pg
rails (= 4.0.0) rails (= 4.0.0)
rails-footnotes!
rails_12factor rails_12factor
rspec rspec
rspec-rails rspec-rails
@ -353,5 +344,4 @@ DEPENDENCIES
simplecov simplecov
sorcery (>= 0.8.1) sorcery (>= 0.8.1)
uglifier (>= 1.3.0) uglifier (>= 1.3.0)
wdm (>= 0.1.0)
webmock webmock

View File

@ -1,5 +1,6 @@
- title 'Bike!Bike!' - title 'Bike!Bike!'
= render 'conferences/header' - if @conference
= render 'conferences/header'
-#%section -#%section
-# .row -# .row