identation fix
This commit is contained in:
Chashmeet Singh
parent
a23c376299
commit
3931bec2e2
4 changed files with 198 additions and 184 deletions
366
Gemfile.lock
366
Gemfile.lock
|
|
@ -1,9 +1,10 @@
|
||||||
GIT
|
GIT
|
||||||
remote: git://github.com/stefanpenner/country_select.git
|
remote: git://github.com/stefanpenner/country_select.git
|
||||||
revision: 585e9538a01ae9878e92f12a98261a09842ed015
|
revision: c83c550e3e4585c3e9c1b749df65619428aa985d
|
||||||
specs:
|
specs:
|
||||||
country_select (2.1.0)
|
country_select (2.5.1)
|
||||||
countries (~> 0.9, >= 0.9.3)
|
countries (~> 1.2.0)
|
||||||
|
sort_alphabetical (~> 1.0)
|
||||||
|
|
||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
|
|
@ -28,8 +29,8 @@ GEM
|
||||||
erubis (~> 2.7.0)
|
erubis (~> 2.7.0)
|
||||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||||
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
||||||
active_model_serializers (0.8.1)
|
active_model_serializers (0.9.4)
|
||||||
activemodel (>= 3.0)
|
activemodel (>= 3.2)
|
||||||
activejob (4.2.5.2)
|
activejob (4.2.5.2)
|
||||||
activesupport (= 4.2.5.2)
|
activesupport (= 4.2.5.2)
|
||||||
globalid (>= 0.3.0)
|
globalid (>= 0.3.0)
|
||||||
|
|
@ -49,33 +50,34 @@ GEM
|
||||||
activeuuid (0.6.1)
|
activeuuid (0.6.1)
|
||||||
activerecord (>= 3.1)
|
activerecord (>= 3.1)
|
||||||
uuidtools
|
uuidtools
|
||||||
acts_as_commentable_with_threading (1.2.0)
|
acts_as_commentable_with_threading (2.0.1)
|
||||||
|
activerecord (>= 4.0)
|
||||||
|
activesupport (>= 4.0)
|
||||||
|
awesome_nested_set (>= 3.0)
|
||||||
|
acts_as_list (0.7.2)
|
||||||
activerecord (>= 3.0)
|
activerecord (>= 3.0)
|
||||||
activesupport (>= 3.0)
|
addressable (2.4.0)
|
||||||
awesome_nested_set (>= 2.0)
|
ahoy_matey (1.2.1)
|
||||||
acts_as_list (0.4.0)
|
|
||||||
activerecord (>= 3.0)
|
|
||||||
addressable (2.3.6)
|
|
||||||
ahoy_matey (1.0.0)
|
|
||||||
addressable
|
addressable
|
||||||
browser (>= 0.4.0)
|
browser (>= 0.4.0)
|
||||||
|
errbase
|
||||||
geocoder
|
geocoder
|
||||||
referer-parser
|
rails
|
||||||
|
referer-parser (>= 0.3.0)
|
||||||
request_store
|
request_store
|
||||||
user_agent_parser
|
user_agent_parser
|
||||||
uuidtools
|
uuidtools
|
||||||
arel (6.0.3)
|
arel (6.0.3)
|
||||||
ast (2.2.0)
|
ast (2.2.0)
|
||||||
autoprefixer-rails (5.1.9)
|
autoprefixer-rails (6.3.3.1)
|
||||||
execjs
|
execjs
|
||||||
json
|
awesome_nested_set (3.0.3)
|
||||||
awesome_nested_set (3.0.0.rc.5)
|
|
||||||
activerecord (>= 4.0.0, < 5)
|
activerecord (>= 4.0.0, < 5)
|
||||||
axlsx (2.0.1)
|
axlsx (2.0.1)
|
||||||
htmlentities (~> 4.3.1)
|
htmlentities (~> 4.3.1)
|
||||||
nokogiri (>= 1.4.1)
|
nokogiri (>= 1.4.1)
|
||||||
rubyzip (~> 1.0.0)
|
rubyzip (~> 1.0.0)
|
||||||
axlsx_rails (0.2.0)
|
axlsx_rails (0.4.0)
|
||||||
axlsx (>= 2.0.1)
|
axlsx (>= 2.0.1)
|
||||||
rails (>= 3.1)
|
rails (>= 3.1)
|
||||||
bcrypt (3.1.10)
|
bcrypt (3.1.10)
|
||||||
|
|
@ -87,24 +89,18 @@ GEM
|
||||||
bootstrap-switch-rails (3.0.2)
|
bootstrap-switch-rails (3.0.2)
|
||||||
bootstrap3-datetimepicker-rails (3.0.3)
|
bootstrap3-datetimepicker-rails (3.0.3)
|
||||||
momentjs-rails (>= 2.8.1)
|
momentjs-rails (>= 2.8.1)
|
||||||
browser (0.6.0)
|
browser (2.0.1)
|
||||||
builder (3.2.2)
|
builder (3.2.2)
|
||||||
byebug (3.1.2)
|
byebug (8.2.2)
|
||||||
columnize (~> 0.8)
|
cancancan (1.13.1)
|
||||||
debugger-linecache (~> 1.2)
|
capybara (2.6.2)
|
||||||
cancancan (1.8.4)
|
addressable
|
||||||
capybara (2.2.1)
|
|
||||||
mime-types (>= 1.16)
|
mime-types (>= 1.16)
|
||||||
nokogiri (>= 1.3.3)
|
nokogiri (>= 1.3.3)
|
||||||
rack (>= 1.0.0)
|
rack (>= 1.0.0)
|
||||||
rack-test (>= 0.5.4)
|
rack-test (>= 0.5.4)
|
||||||
xpath (~> 2.0)
|
xpath (~> 2.0)
|
||||||
celluloid (0.15.2)
|
chart-js-rails (0.0.9)
|
||||||
timers (~> 1.1.0)
|
|
||||||
celluloid-io (0.15.0)
|
|
||||||
celluloid (>= 0.15.0)
|
|
||||||
nio4r (>= 0.5.0)
|
|
||||||
chart-js-rails (0.0.6)
|
|
||||||
railties (> 3.1)
|
railties (> 3.1)
|
||||||
chronic (0.10.2)
|
chronic (0.10.2)
|
||||||
climate_control (0.0.3)
|
climate_control (0.0.3)
|
||||||
|
|
@ -112,8 +108,8 @@ GEM
|
||||||
cliver (0.3.2)
|
cliver (0.3.2)
|
||||||
cocaine (0.5.8)
|
cocaine (0.5.8)
|
||||||
climate_control (>= 0.0.3, < 1.0)
|
climate_control (>= 0.0.3, < 1.0)
|
||||||
cocoon (1.2.6)
|
cocoon (1.2.8)
|
||||||
coderay (1.1.0)
|
coderay (1.1.1)
|
||||||
coffee-rails (4.1.1)
|
coffee-rails (4.1.1)
|
||||||
coffee-script (>= 2.2.0)
|
coffee-script (>= 2.2.0)
|
||||||
railties (>= 4.0.0, < 5.1.x)
|
railties (>= 4.0.0, < 5.1.x)
|
||||||
|
|
@ -121,26 +117,26 @@ GEM
|
||||||
coffee-script-source
|
coffee-script-source
|
||||||
execjs
|
execjs
|
||||||
coffee-script-source (1.10.0)
|
coffee-script-source (1.10.0)
|
||||||
columnize (0.8.9)
|
concurrent-ruby (1.0.1)
|
||||||
countries (0.9.3)
|
countries (1.2.5)
|
||||||
currencies (~> 0.4.2)
|
currencies (~> 0.4.2)
|
||||||
coveralls (0.7.0)
|
i18n_data (~> 0.7.0)
|
||||||
multi_json (~> 1.3)
|
coveralls (0.8.13)
|
||||||
rest-client
|
json (~> 1.8)
|
||||||
simplecov (>= 0.7)
|
simplecov (~> 0.11.0)
|
||||||
term-ansicolor
|
term-ansicolor (~> 1.3)
|
||||||
thor
|
thor (~> 0.19.1)
|
||||||
|
tins (~> 1.6.0)
|
||||||
currencies (0.4.2)
|
currencies (0.4.2)
|
||||||
daemons (1.1.9)
|
daemons (1.2.3)
|
||||||
database_cleaner (1.3.0)
|
database_cleaner (1.5.1)
|
||||||
debug_inspector (0.0.2)
|
debug_inspector (0.0.2)
|
||||||
debugger-linecache (1.2.0)
|
|
||||||
delayed_job (4.1.1)
|
delayed_job (4.1.1)
|
||||||
activesupport (>= 3.0, < 5.0)
|
activesupport (>= 3.0, < 5.0)
|
||||||
delayed_job_active_record (4.1.0)
|
delayed_job_active_record (4.1.0)
|
||||||
activerecord (>= 3.0, < 5)
|
activerecord (>= 3.0, < 5)
|
||||||
delayed_job (>= 3.0, < 5)
|
delayed_job (>= 3.0, < 5)
|
||||||
devise (3.5.5)
|
devise (3.5.6)
|
||||||
bcrypt (~> 3.0)
|
bcrypt (~> 3.0)
|
||||||
orm_adapter (~> 0.1)
|
orm_adapter (~> 0.1)
|
||||||
railties (>= 3.2.6, < 5)
|
railties (>= 3.2.6, < 5)
|
||||||
|
|
@ -150,7 +146,8 @@ GEM
|
||||||
devise_ichain_authenticatable (0.3.1)
|
devise_ichain_authenticatable (0.3.1)
|
||||||
devise (>= 2.2)
|
devise (>= 2.2)
|
||||||
diff-lcs (1.2.5)
|
diff-lcs (1.2.5)
|
||||||
docile (1.1.3)
|
docile (1.1.5)
|
||||||
|
errbase (0.0.3)
|
||||||
erubis (2.7.0)
|
erubis (2.7.0)
|
||||||
execjs (2.6.0)
|
execjs (2.6.0)
|
||||||
factory_girl (4.5.0)
|
factory_girl (4.5.0)
|
||||||
|
|
@ -158,66 +155,74 @@ GEM
|
||||||
factory_girl_rails (4.6.0)
|
factory_girl_rails (4.6.0)
|
||||||
factory_girl (~> 4.5.0)
|
factory_girl (~> 4.5.0)
|
||||||
railties (>= 3.0.0)
|
railties (>= 3.0.0)
|
||||||
faraday (0.9.0)
|
faraday (0.9.2)
|
||||||
multipart-post (>= 1.2, < 3)
|
multipart-post (>= 1.2, < 3)
|
||||||
ffi (1.9.3)
|
ffi (1.9.10)
|
||||||
font-awesome-rails (4.1.0.0)
|
font-awesome-rails (4.5.0.1)
|
||||||
railties (>= 3.2, < 5.0)
|
railties (>= 3.2, < 5.1)
|
||||||
formatador (0.2.4)
|
formatador (0.2.5)
|
||||||
formtastic (3.1.3)
|
formtastic (3.1.3)
|
||||||
actionpack (>= 3.2.13)
|
actionpack (>= 3.2.13)
|
||||||
formtastic-bootstrap (3.1.1)
|
formtastic-bootstrap (3.1.1)
|
||||||
formtastic (>= 3.0)
|
formtastic (>= 3.0)
|
||||||
geocoder (1.2.2)
|
geocoder (1.3.1)
|
||||||
globalid (0.3.6)
|
globalid (0.3.6)
|
||||||
activesupport (>= 4.1.0)
|
activesupport (>= 4.1.0)
|
||||||
gravtastic (3.2.6)
|
gravtastic (3.2.6)
|
||||||
guard (2.6.0)
|
guard (2.13.0)
|
||||||
formatador (>= 0.2.4)
|
formatador (>= 0.2.4)
|
||||||
listen (~> 2.7)
|
listen (>= 2.7, <= 4.0)
|
||||||
lumberjack (~> 1.0)
|
lumberjack (~> 1.0)
|
||||||
|
nenv (~> 0.1)
|
||||||
|
notiffany (~> 0.0)
|
||||||
pry (>= 0.9.12)
|
pry (>= 0.9.12)
|
||||||
|
shellany (~> 0.0)
|
||||||
thor (>= 0.18.1)
|
thor (>= 0.18.1)
|
||||||
guard-rspec (4.2.8)
|
guard-rspec (4.2.10)
|
||||||
guard (~> 2.1)
|
guard (~> 2.1)
|
||||||
rspec (>= 2.14, < 4.0)
|
rspec (>= 2.14, < 4.0)
|
||||||
haml (4.0.5)
|
haml (4.0.7)
|
||||||
tilt
|
tilt
|
||||||
haml-rails (0.5.3)
|
haml-rails (0.9.0)
|
||||||
actionpack (>= 4.0.1)
|
actionpack (>= 4.0.1)
|
||||||
activesupport (>= 4.0.1)
|
activesupport (>= 4.0.1)
|
||||||
haml (>= 3.1, < 5.0)
|
haml (>= 4.0.6, < 5.0)
|
||||||
|
html2haml (>= 1.0.1)
|
||||||
railties (>= 4.0.1)
|
railties (>= 4.0.1)
|
||||||
hashie (2.1.1)
|
hashie (3.4.3)
|
||||||
hike (1.2.3)
|
|
||||||
hoptoad_notifier (2.4.11)
|
hoptoad_notifier (2.4.11)
|
||||||
activesupport
|
activesupport
|
||||||
builder
|
builder
|
||||||
htmlentities (4.3.1)
|
html2haml (2.0.0)
|
||||||
|
erubis (~> 2.7.0)
|
||||||
|
haml (~> 4.0.0)
|
||||||
|
nokogiri (~> 1.6.0)
|
||||||
|
ruby_parser (~> 3.5)
|
||||||
|
htmlentities (4.3.4)
|
||||||
i18n (0.7.0)
|
i18n (0.7.0)
|
||||||
inversion (0.12.3)
|
i18n_data (0.7.0)
|
||||||
loggability (~> 0.4)
|
inversion (0.18.0)
|
||||||
|
loggability (~> 0.11)
|
||||||
jquery-datatables-rails (2.2.3)
|
jquery-datatables-rails (2.2.3)
|
||||||
jquery-rails
|
jquery-rails
|
||||||
sass-rails
|
sass-rails
|
||||||
jquery-rails (3.1.4)
|
jquery-rails (4.1.0)
|
||||||
railties (>= 3.0, < 5.0)
|
rails-dom-testing (~> 1.0)
|
||||||
|
railties (>= 4.2.0)
|
||||||
thor (>= 0.14, < 2.0)
|
thor (>= 0.14, < 2.0)
|
||||||
json (1.8.3)
|
json (1.8.3)
|
||||||
jwt (1.0.0)
|
jwt (1.5.1)
|
||||||
launchy (2.4.2)
|
launchy (2.4.3)
|
||||||
addressable (~> 2.3)
|
addressable (~> 2.3)
|
||||||
letter_opener (1.2.0)
|
letter_opener (1.4.1)
|
||||||
launchy (~> 2.2)
|
launchy (~> 2.2)
|
||||||
listen (2.7.2)
|
listen (3.0.6)
|
||||||
celluloid (>= 0.15.2)
|
|
||||||
celluloid-io (>= 0.15.0)
|
|
||||||
rb-fsevent (>= 0.9.3)
|
rb-fsevent (>= 0.9.3)
|
||||||
rb-inotify (>= 0.9)
|
rb-inotify (>= 0.9.7)
|
||||||
loggability (0.11.0)
|
loggability (0.11.0)
|
||||||
loofah (2.0.3)
|
loofah (2.0.3)
|
||||||
nokogiri (>= 1.5.9)
|
nokogiri (>= 1.5.9)
|
||||||
lumberjack (1.0.5)
|
lumberjack (1.0.10)
|
||||||
mail (2.6.3)
|
mail (2.6.3)
|
||||||
mime-types (>= 1.16, < 3)
|
mime-types (>= 1.16, < 3)
|
||||||
method_source (0.8.2)
|
method_source (0.8.2)
|
||||||
|
|
@ -228,7 +233,7 @@ GEM
|
||||||
rake
|
rake
|
||||||
mini_portile2 (2.0.0)
|
mini_portile2 (2.0.0)
|
||||||
minitest (5.8.4)
|
minitest (5.8.4)
|
||||||
momentjs-rails (2.8.1)
|
momentjs-rails (2.11.0)
|
||||||
railties (>= 3.1)
|
railties (>= 3.1)
|
||||||
monetize (1.4.0)
|
monetize (1.4.0)
|
||||||
money (~> 6.7)
|
money (~> 6.7)
|
||||||
|
|
@ -243,72 +248,75 @@ GEM
|
||||||
multi_json (1.11.2)
|
multi_json (1.11.2)
|
||||||
multi_xml (0.5.5)
|
multi_xml (0.5.5)
|
||||||
multipart-post (2.0.0)
|
multipart-post (2.0.0)
|
||||||
mysql2 (0.4.2)
|
mysql2 (0.4.3)
|
||||||
netrc (0.10.3)
|
nenv (0.3.0)
|
||||||
nio4r (1.1.0)
|
|
||||||
nokogiri (1.6.7.2)
|
nokogiri (1.6.7.2)
|
||||||
mini_portile2 (~> 2.0.0.rc2)
|
mini_portile2 (~> 2.0.0.rc2)
|
||||||
oauth2 (0.9.4)
|
notiffany (0.0.8)
|
||||||
|
nenv (~> 0.1)
|
||||||
|
shellany (~> 0.0)
|
||||||
|
oauth2 (1.1.0)
|
||||||
faraday (>= 0.8, < 0.10)
|
faraday (>= 0.8, < 0.10)
|
||||||
jwt (~> 1.0)
|
jwt (~> 1.0, < 1.5.2)
|
||||||
multi_json (~> 1.3)
|
multi_json (~> 1.3)
|
||||||
multi_xml (~> 0.5)
|
multi_xml (~> 0.5)
|
||||||
rack (~> 1.2)
|
rack (>= 1.2, < 3)
|
||||||
omniauth (1.2.1)
|
omniauth (1.3.1)
|
||||||
hashie (>= 1.2, < 3)
|
hashie (>= 1.2, < 4)
|
||||||
rack (~> 1.0)
|
rack (>= 1.0, < 3)
|
||||||
omniauth-facebook (1.6.0)
|
omniauth-facebook (3.0.0)
|
||||||
omniauth-oauth2 (~> 1.1)
|
omniauth-oauth2 (~> 1.2)
|
||||||
omniauth-github (1.1.2)
|
omniauth-github (1.1.2)
|
||||||
omniauth (~> 1.0)
|
omniauth (~> 1.0)
|
||||||
omniauth-oauth2 (~> 1.1)
|
omniauth-oauth2 (~> 1.1)
|
||||||
omniauth-google-oauth2 (0.2.4)
|
omniauth-google-oauth2 (0.3.1)
|
||||||
omniauth (~> 1.0)
|
jwt (~> 1.0)
|
||||||
omniauth-oauth2 (~> 1.1)
|
|
||||||
omniauth-oauth2 (1.1.2)
|
|
||||||
faraday (>= 0.8, < 0.10)
|
|
||||||
multi_json (~> 1.3)
|
multi_json (~> 1.3)
|
||||||
oauth2 (~> 0.9.3)
|
omniauth (>= 1.1.1)
|
||||||
|
omniauth-oauth2 (>= 1.3.1)
|
||||||
|
omniauth-oauth2 (1.4.0)
|
||||||
|
oauth2 (~> 1.0)
|
||||||
omniauth (~> 1.2)
|
omniauth (~> 1.2)
|
||||||
omniauth-openid (1.0.1)
|
omniauth-openid (1.0.1)
|
||||||
omniauth (~> 1.0)
|
omniauth (~> 1.0)
|
||||||
rack-openid (~> 1.3.1)
|
rack-openid (~> 1.3.1)
|
||||||
open4 (1.3.4)
|
open4 (1.3.4)
|
||||||
orm_adapter (0.5.0)
|
orm_adapter (0.5.0)
|
||||||
paper_trail (3.0.1)
|
paper_trail (4.1.0)
|
||||||
activerecord (>= 3.0, < 5.0)
|
activerecord (>= 3.0, < 6.0)
|
||||||
activesupport (>= 3.0, < 5.0)
|
activesupport (>= 3.0, < 6.0)
|
||||||
paperclip (4.3.2)
|
request_store (~> 1.1)
|
||||||
|
paperclip (4.3.5)
|
||||||
activemodel (>= 3.2.0)
|
activemodel (>= 3.2.0)
|
||||||
activesupport (>= 3.2.0)
|
activesupport (>= 3.2.0)
|
||||||
cocaine (~> 0.5.5)
|
cocaine (~> 0.5.5)
|
||||||
mime-types
|
mime-types
|
||||||
mimemagic (= 0.3.0)
|
mimemagic (= 0.3.0)
|
||||||
parser (2.3.0.3)
|
parser (2.3.0.6)
|
||||||
ast (~> 2.2)
|
ast (~> 2.2)
|
||||||
pdf-core (0.2.5)
|
pdf-core (0.6.1)
|
||||||
phantomjs (1.9.7.1)
|
phantomjs (2.1.1.0)
|
||||||
piwik_analytics (1.0.2)
|
piwik_analytics (1.0.2)
|
||||||
actionpack
|
actionpack
|
||||||
activesupport
|
activesupport
|
||||||
rails (>= 3.0.0)
|
rails (>= 3.0.0)
|
||||||
poltergeist (1.5.1)
|
poltergeist (1.9.0)
|
||||||
capybara (~> 2.1)
|
capybara (~> 2.1)
|
||||||
cliver (~> 0.3.1)
|
cliver (~> 0.3.1)
|
||||||
multi_json (~> 1.0)
|
multi_json (~> 1.0)
|
||||||
websocket-driver (>= 0.2.0)
|
websocket-driver (>= 0.2.0)
|
||||||
powerpack (0.1.1)
|
powerpack (0.1.1)
|
||||||
prawn (1.0.0)
|
prawn (2.1.0)
|
||||||
pdf-core (~> 0.2.2)
|
pdf-core (~> 0.6.1)
|
||||||
ttfunk (~> 1.1.1)
|
ttfunk (~> 1.4.0)
|
||||||
prawn_rails (0.0.11)
|
prawn_rails (0.0.11)
|
||||||
prawn (>= 0.11.1)
|
prawn (>= 0.11.1)
|
||||||
railties (>= 3.0.0)
|
railties (>= 3.0.0)
|
||||||
pry (0.9.12.6)
|
pry (0.10.3)
|
||||||
coderay (~> 1.0)
|
coderay (~> 1.1.0)
|
||||||
method_source (~> 0.8)
|
method_source (~> 0.8.1)
|
||||||
slop (~> 3.4)
|
slop (~> 3.4)
|
||||||
quiet_assets (1.0.2)
|
quiet_assets (1.1.0)
|
||||||
railties (>= 3.1, < 5.0)
|
railties (>= 3.1, < 5.0)
|
||||||
rack (1.6.4)
|
rack (1.6.4)
|
||||||
rack-openid (1.3.1)
|
rack-openid (1.3.1)
|
||||||
|
|
@ -328,8 +336,8 @@ GEM
|
||||||
railties (= 4.2.5.2)
|
railties (= 4.2.5.2)
|
||||||
sprockets-rails
|
sprockets-rails
|
||||||
rails-assets-date.format (1.2.3)
|
rails-assets-date.format (1.2.3)
|
||||||
rails-assets-holderjs (2.9.1)
|
rails-assets-holderjs (2.9.3)
|
||||||
rails-assets-jquery (2.2.0)
|
rails-assets-jquery (2.2.1)
|
||||||
rails-assets-jquery-smooth-scroll (1.7.2)
|
rails-assets-jquery-smooth-scroll (1.7.2)
|
||||||
rails-assets-jquery (>= 1.4.2)
|
rails-assets-jquery (>= 1.4.2)
|
||||||
rails-assets-leaflet (0.7.7)
|
rails-assets-leaflet (0.7.7)
|
||||||
|
|
@ -356,121 +364,125 @@ GEM
|
||||||
thor (>= 0.18.1, < 2.0)
|
thor (>= 0.18.1, < 2.0)
|
||||||
rainbow (2.1.0)
|
rainbow (2.1.0)
|
||||||
rake (10.5.0)
|
rake (10.5.0)
|
||||||
rb-fsevent (0.9.4)
|
rb-fsevent (0.9.7)
|
||||||
rb-inotify (0.9.4)
|
rb-inotify (0.9.7)
|
||||||
ffi (>= 0.5.0)
|
ffi (>= 0.5.0)
|
||||||
rdoc (4.1.1)
|
rdoc (4.2.2)
|
||||||
json (~> 1.4)
|
json (~> 1.4)
|
||||||
rdoc-generator-fivefish (0.1.0)
|
rdoc-generator-fivefish (0.1.0)
|
||||||
inversion (~> 0.12)
|
inversion (~> 0.12)
|
||||||
loggability (~> 0.6)
|
loggability (~> 0.6)
|
||||||
rdoc (~> 4.0)
|
rdoc (~> 4.0)
|
||||||
yajl-ruby (~> 1.1)
|
yajl-ruby (~> 1.1)
|
||||||
redcarpet (3.2.3)
|
redcarpet (3.3.4)
|
||||||
referer-parser (0.2.1)
|
referer-parser (0.3.0)
|
||||||
request_store (1.0.6)
|
request_store (1.3.0)
|
||||||
responders (2.1.1)
|
responders (2.1.1)
|
||||||
railties (>= 4.2.0, < 5.1)
|
railties (>= 4.2.0, < 5.1)
|
||||||
rest-client (1.7.3)
|
rolify (5.0.0)
|
||||||
mime-types (>= 1.16, < 3.0)
|
rspec (3.4.0)
|
||||||
netrc (~> 0.7)
|
rspec-core (~> 3.4.0)
|
||||||
rolify (3.4.0)
|
rspec-expectations (~> 3.4.0)
|
||||||
rspec (3.0.0)
|
rspec-mocks (~> 3.4.0)
|
||||||
rspec-core (~> 3.0.0)
|
rspec-activemodel-mocks (1.0.3)
|
||||||
rspec-expectations (~> 3.0.0)
|
|
||||||
rspec-mocks (~> 3.0.0)
|
|
||||||
rspec-activemodel-mocks (1.0.1)
|
|
||||||
activemodel (>= 3.0)
|
activemodel (>= 3.0)
|
||||||
activesupport (>= 3.0)
|
activesupport (>= 3.0)
|
||||||
rspec-mocks (>= 2.99, < 4.0)
|
rspec-mocks (>= 2.99, < 4.0)
|
||||||
rspec-core (3.0.2)
|
rspec-core (3.4.3)
|
||||||
rspec-support (~> 3.0.0)
|
rspec-support (~> 3.4.0)
|
||||||
rspec-expectations (3.0.2)
|
rspec-expectations (3.4.0)
|
||||||
diff-lcs (>= 1.2.0, < 2.0)
|
diff-lcs (>= 1.2.0, < 2.0)
|
||||||
rspec-support (~> 3.0.0)
|
rspec-support (~> 3.4.0)
|
||||||
rspec-mocks (3.0.2)
|
rspec-mocks (3.4.1)
|
||||||
rspec-support (~> 3.0.0)
|
diff-lcs (>= 1.2.0, < 2.0)
|
||||||
rspec-rails (3.0.0)
|
rspec-support (~> 3.4.0)
|
||||||
actionpack (>= 3.0)
|
rspec-rails (3.4.2)
|
||||||
activesupport (>= 3.0)
|
actionpack (>= 3.0, < 4.3)
|
||||||
railties (>= 3.0)
|
activesupport (>= 3.0, < 4.3)
|
||||||
rspec-core (~> 3.0.0)
|
railties (>= 3.0, < 4.3)
|
||||||
rspec-expectations (~> 3.0.0)
|
rspec-core (~> 3.4.0)
|
||||||
rspec-mocks (~> 3.0.0)
|
rspec-expectations (~> 3.4.0)
|
||||||
rspec-support (~> 3.0.0)
|
rspec-mocks (~> 3.4.0)
|
||||||
rspec-support (3.0.2)
|
rspec-support (~> 3.4.0)
|
||||||
rubocop (0.37.0)
|
rspec-support (3.4.1)
|
||||||
parser (>= 2.3.0.2, < 3.0)
|
rubocop (0.37.2)
|
||||||
|
parser (>= 2.3.0.4, < 3.0)
|
||||||
powerpack (~> 0.1)
|
powerpack (~> 0.1)
|
||||||
rainbow (>= 1.99.1, < 3.0)
|
rainbow (>= 1.99.1, < 3.0)
|
||||||
ruby-progressbar (~> 1.7)
|
ruby-progressbar (~> 1.7)
|
||||||
unicode-display_width (~> 0.3)
|
unicode-display_width (~> 0.3)
|
||||||
ruby-oembed (0.8.14)
|
ruby-oembed (0.9.0)
|
||||||
ruby-openid (2.5.0)
|
ruby-openid (2.7.0)
|
||||||
ruby-progressbar (1.7.5)
|
ruby-progressbar (1.7.5)
|
||||||
|
ruby_parser (3.8.1)
|
||||||
|
sexp_processor (~> 4.1)
|
||||||
rubyzip (1.0.0)
|
rubyzip (1.0.0)
|
||||||
sass (3.2.19)
|
sass (3.4.21)
|
||||||
sass-rails (4.0.4)
|
sass-rails (5.0.4)
|
||||||
railties (>= 4.0.0, < 5.0)
|
railties (>= 4.0.0, < 5.0)
|
||||||
sass (~> 3.2.2)
|
sass (~> 3.1)
|
||||||
sprockets (~> 2.8, < 2.12)
|
sprockets (>= 2.8, < 4.0)
|
||||||
sprockets-rails (~> 2.0)
|
sprockets-rails (>= 2.0, < 4.0)
|
||||||
shoulda-matchers (2.6.1)
|
tilt (>= 1.1, < 3)
|
||||||
activesupport (>= 3.0.0)
|
sexp_processor (4.7.0)
|
||||||
simplecov (0.8.2)
|
shellany (0.0.1)
|
||||||
|
shoulda-matchers (3.1.1)
|
||||||
|
activesupport (>= 4.0.0)
|
||||||
|
simplecov (0.11.2)
|
||||||
docile (~> 1.1.0)
|
docile (~> 1.1.0)
|
||||||
multi_json
|
json (~> 1.8)
|
||||||
simplecov-html (~> 0.8.0)
|
simplecov-html (~> 0.10.0)
|
||||||
simplecov-html (0.8.0)
|
simplecov-html (0.10.0)
|
||||||
sixarm_ruby_unaccent (1.1.1)
|
sixarm_ruby_unaccent (1.1.1)
|
||||||
slop (3.6.0)
|
slop (3.6.0)
|
||||||
spring (1.6.3)
|
sort_alphabetical (1.0.2)
|
||||||
|
unicode_utils (>= 1.2.2)
|
||||||
|
spring (1.6.4)
|
||||||
spring-commands-rspec (1.0.4)
|
spring-commands-rspec (1.0.4)
|
||||||
spring (>= 0.9.1)
|
spring (>= 0.9.1)
|
||||||
sprockets (2.11.3)
|
sprockets (3.5.2)
|
||||||
hike (~> 1.2)
|
concurrent-ruby (~> 1.0)
|
||||||
multi_json (~> 1.0)
|
rack (> 1, < 3)
|
||||||
rack (~> 1.0)
|
sprockets-rails (3.0.3)
|
||||||
tilt (~> 1.1, != 1.3.0)
|
actionpack (>= 4.0)
|
||||||
sprockets-rails (2.3.3)
|
activesupport (>= 4.0)
|
||||||
actionpack (>= 3.0)
|
sprockets (>= 3.0.0)
|
||||||
activesupport (>= 3.0)
|
sqlite3 (1.3.11)
|
||||||
sprockets (>= 2.8, < 4.0)
|
term-ansicolor (1.3.2)
|
||||||
sqlite3 (1.3.9)
|
|
||||||
term-ansicolor (1.3.0)
|
|
||||||
tins (~> 1.0)
|
tins (~> 1.0)
|
||||||
thor (0.19.1)
|
thor (0.19.1)
|
||||||
thread_safe (0.3.5)
|
thread_safe (0.3.5)
|
||||||
tilt (1.4.1)
|
tilt (2.0.2)
|
||||||
timecop (0.7.1)
|
timecop (0.8.0)
|
||||||
timers (1.1.0)
|
tins (1.6.0)
|
||||||
tins (1.1.0)
|
transitions (1.0.1)
|
||||||
transitions (0.1.12)
|
ttfunk (1.4.0)
|
||||||
ttfunk (1.1.1)
|
|
||||||
turbolinks (2.5.3)
|
turbolinks (2.5.3)
|
||||||
coffee-rails
|
coffee-rails
|
||||||
tzinfo (1.2.2)
|
tzinfo (1.2.2)
|
||||||
thread_safe (~> 0.1)
|
thread_safe (~> 0.1)
|
||||||
uglifier (2.5.0)
|
uglifier (2.7.2)
|
||||||
execjs (>= 0.3.0)
|
execjs (>= 0.3.0)
|
||||||
json (>= 1.8.0)
|
json (>= 1.8.0)
|
||||||
unicode-display_width (0.3.1)
|
unicode-display_width (0.3.1)
|
||||||
user_agent_parser (2.1.5)
|
unicode_utils (1.4.0)
|
||||||
|
user_agent_parser (2.3.0)
|
||||||
uuidtools (2.1.5)
|
uuidtools (2.1.5)
|
||||||
warden (1.2.4)
|
warden (1.2.6)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
web-console (2.2.1)
|
web-console (2.3.0)
|
||||||
activemodel (>= 4.0)
|
activemodel (>= 4.0)
|
||||||
binding_of_caller (>= 0.7.2)
|
binding_of_caller (>= 0.7.2)
|
||||||
railties (>= 4.0)
|
railties (>= 4.0)
|
||||||
sprockets-rails (>= 2.0, < 4.0)
|
sprockets-rails (>= 2.0, < 4.0)
|
||||||
websocket-driver (0.3.3)
|
websocket-driver (0.6.3)
|
||||||
whenever (0.9.2)
|
websocket-extensions (>= 0.1.0)
|
||||||
activesupport (>= 2.3.4)
|
websocket-extensions (0.1.2)
|
||||||
|
whenever (0.9.4)
|
||||||
chronic (>= 0.6.3)
|
chronic (>= 0.6.3)
|
||||||
xpath (2.0.0)
|
xpath (2.0.0)
|
||||||
nokogiri (~> 1.3)
|
nokogiri (~> 1.3)
|
||||||
yajl-ruby (1.2.0)
|
yajl-ruby (1.2.1)
|
||||||
|
|
||||||
PLATFORMS
|
PLATFORMS
|
||||||
ruby
|
ruby
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,8 @@ class CommercialsController < ApplicationController
|
||||||
redirect_to edit_conference_program_proposal_path(conference_id: @conference.short_title, id: @event.id, anchor: 'commercials-content'),
|
redirect_to edit_conference_program_proposal_path(conference_id: @conference.short_title, id: @event.id, anchor: 'commercials-content'),
|
||||||
notice: 'Commercial was successfully created.'
|
notice: 'Commercial was successfully created.'
|
||||||
else
|
else
|
||||||
redirect_to edit_conference_proposal_path(conference_id: @conference.short_title, id: @event.id, anchor: 'commercials-content'), error: "An error prohibited this Commercial from being saved: #{@commercial.errors.full_messages.join('. ')}."
|
redirect_to edit_conference_proposal_path(conference_id: @conference.short_title, id: @event.id, anchor: 'commercials-content'),
|
||||||
|
error: "An error prohibited this Commercial from being saved: #{@commercial.errors.full_messages.join('. ')}."
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
@ -21,7 +22,8 @@ class CommercialsController < ApplicationController
|
||||||
redirect_to edit_conference_program_proposal_path(conference_id: @conference.short_title, id: @event.id, anchor: 'commercials-content'),
|
redirect_to edit_conference_program_proposal_path(conference_id: @conference.short_title, id: @event.id, anchor: 'commercials-content'),
|
||||||
notice: 'Commercial was successfully updated.'
|
notice: 'Commercial was successfully updated.'
|
||||||
else
|
else
|
||||||
redirect_to edit_conference_proposal_path(conference_id: @conference.short_title, id: @event.id, anchor: 'commercials-content'), error: "An error prohibited this Commercial from being saved: #{@commercial.errors.full_messages.join('. ')}."
|
redirect_to edit_conference_proposal_path(conference_id: @conference.short_title, id: @event.id, anchor: 'commercials-content'),
|
||||||
|
error: "An error prohibited this Commercial from being saved: #{@commercial.errors.full_messages.join('. ')}."
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -63,9 +63,9 @@ class ConferenceRegistrationsController < ApplicationController
|
||||||
|
|
||||||
notice = 'You are now registered and will be receiving E-Mail notifications.'
|
notice = 'You are now registered and will be receiving E-Mail notifications.'
|
||||||
if @conference.tickets.any? && !current_user.supports?(@conference)
|
if @conference.tickets.any? && !current_user.supports?(@conference)
|
||||||
redirect_to conference_tickets_path(@conference.short_title), notice: notice
|
redirect_to conference_tickets_path(@conference.short_title), notice: notice
|
||||||
else
|
else
|
||||||
redirect_to conference_conference_registrations_path(@conference.short_title), notice: notice
|
redirect_to conference_conference_registrations_path(@conference.short_title), notice: notice
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
render :new, error: "Could not create your registration for #{@conference.title}: "\
|
render :new, error: "Could not create your registration for #{@conference.title}: "\
|
||||||
|
|
|
||||||
|
|
@ -54,7 +54,8 @@ class ProposalController < ApplicationController
|
||||||
|
|
||||||
ahoy.track 'Event submission', title: 'New submission'
|
ahoy.track 'Event submission', title: 'New submission'
|
||||||
|
|
||||||
redirect_to conference_program_proposal_index_path(@conference.short_title), notice: 'Proposal was successfully submitted.'
|
redirect_to conference_program_proposal_index_path(@conference.short_title),
|
||||||
|
notice: 'Proposal was successfully submitted.'
|
||||||
end
|
end
|
||||||
|
|
||||||
def update
|
def update
|
||||||
|
|
@ -62,8 +63,7 @@ class ProposalController < ApplicationController
|
||||||
@url = conference_program_proposal_path(@conference.short_title, params[:id])
|
@url = conference_program_proposal_path(@conference.short_title, params[:id])
|
||||||
|
|
||||||
if !@event.update(event_params)
|
if !@event.update(event_params)
|
||||||
render action: 'new', error: "Could not update proposal: #{@event.errors.full_messages.join(', ')}"
|
render action: 'new', error: "Could not update proposal: #{@event.errors.full_messages.join(', ')}"
|
||||||
|
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue