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