gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge efa700f23c into 46a6a59622

Browse source
This commit is contained in:
agrim mittal 2017-04-07 16:50:28 +00:00 • committed by GitHub
commit 239eee9c25
4 changed files with 450 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.haml-lint.yml Normal file
View file

@ -0,0 +1 @@
inherits_from: .haml-lint_todo.yml

421
.haml-lint_todo.yml Normal file
View file

@ -0,0 +1,421 @@
# This configuration was generated by
# `haml-lint --auto-gen-config`
# on 2017-03-31 00:02:02 +0530 using Haml-Lint version 0.24.0.
# The point is for the user to remove these configuration records
# one by one as the lints are removed from the code base.
# Note that changes in the inspected code, or installation of new
# versions of Haml-Lint, may require this file to be generated again.
linters:
# Offense count: 943
LineLength:
exclude:
- "app/views/admin/campaigns/_form.html.haml"
- "app/views/admin/campaigns/index.html.haml"
- "app/views/admin/cfps/_form.html.haml"
- "app/views/admin/cfps/show.html.haml"
- "app/views/admin/comments/_all_comments.html.haml"
- "app/views/admin/comments/_posted_comments.html.haml"
- "app/views/admin/comments/_unread_comments.html.haml"
- "app/views/admin/commercials/index.html.haml"
- "app/views/admin/conferences/_campaigns.html.haml"
- "app/views/admin/conferences/_doughnut_chart.html.haml"
- "app/views/admin/conferences/_line_chart.html.haml"
- "app/views/admin/conferences/_recent_registrations.html.haml"
- "app/views/admin/conferences/_recent_submissions.html.haml"
- "app/views/admin/conferences/_recent_users.html.haml"
- "app/views/admin/conferences/_targets.html.haml"
- "app/views/admin/conferences/_todo_list.html.haml"
- "app/views/admin/conferences/_top_submitter.html.haml"
- "app/views/admin/conferences/edit.html.haml"
- "app/views/admin/conferences/index.html.haml"
- "app/views/admin/conferences/new.html.haml"
- "app/views/admin/conferences/show.html.haml"
- "app/views/admin/contacts/edit.html.haml"
- "app/views/admin/difficulty_levels/_form.html.haml"
- "app/views/admin/difficulty_levels/index.html.haml"
- "app/views/admin/emails/_help.html.haml"
- "app/views/admin/emails/index.html.haml"
- "app/views/admin/event_types/_form.html.haml"
- "app/views/admin/event_types/index.html.haml"
- "app/views/admin/events/_all_events.csv.haml"
- "app/views/admin/events/_all_with_comments.csv.haml"
- "app/views/admin/events/_change_state_dropdown.html.haml"
- "app/views/admin/events/_confirmed_events.csv.haml"
- "app/views/admin/events/_nested_comments.html.haml"
- "app/views/admin/events/_proposal.html.haml"
- "app/views/admin/events/_voting.html.haml"
- "app/views/admin/events/_voting_index.html.haml"
- "app/views/admin/events/index.html.haml"
- "app/views/admin/events/registrations.html.haml"
- "app/views/admin/events/reports.html.haml"
- "app/views/admin/events/show.html.haml"
- "app/views/admin/lodgings/_form.html.haml"
- "app/views/admin/lodgings/index.html.haml"
- "app/views/admin/programs/_form.html.haml"
- "app/views/admin/programs/show.html.haml"
- "app/views/admin/questions/_form.html.haml"
- "app/views/admin/questions/_questions.html.haml"
- "app/views/admin/questions/edit.html.haml"
- "app/views/admin/questions/index.html.haml"
- "app/views/admin/questions/show.html.haml"
- "app/views/admin/registration_periods/_form.html.haml"
- "app/views/admin/registration_periods/show.html.haml"
- "app/views/admin/registrations/edit.html.haml"
- "app/views/admin/registrations/index.html.haml"
- "app/views/admin/reports/_all_events.html.haml"
- "app/views/admin/reports/_events_with_requirements.html.haml"
- "app/views/admin/reports/_events_without_commercials.html.haml"
- "app/views/admin/reports/_missing_speakers.html.haml"
- "app/views/admin/resources/_form.html.haml"
- "app/views/admin/resources/index.html.haml"
- "app/views/admin/resources/show.html.haml"
- "app/views/admin/roles/_form.html.haml"
- "app/views/admin/roles/_users.html.haml"
- "app/views/admin/roles/index.html.haml"
- "app/views/admin/roles/show.html.haml"
- "app/views/admin/rooms/_form.html.haml"
- "app/views/admin/rooms/index.html.haml"
- "app/views/admin/schedules/_day_tab.html.haml"
- "app/views/admin/schedules/_event.html.haml"
- "app/views/admin/schedules/index.html.haml"
- "app/views/admin/schedules/show.html.haml"
- "app/views/admin/splashpages/_form.html.haml"
- "app/views/admin/splashpages/show.html.haml"
- "app/views/admin/sponsors/_form.html.haml"
- "app/views/admin/sponsors/index.html.haml"
- "app/views/admin/sponsorship_levels/_form.html.haml"
- "app/views/admin/sponsorship_levels/index.html.haml"
- "app/views/admin/targets/_form.html.haml"
- "app/views/admin/targets/index.html.haml"
- "app/views/admin/tickets/_form.html.haml"
- "app/views/admin/tickets/index.html.haml"
- "app/views/admin/tickets/show.html.haml"
- "app/views/admin/tracks/_form.html.haml"
- "app/views/admin/tracks/index.html.haml"
- "app/views/admin/tracks/show.html.haml"
- "app/views/admin/users/_event_registrations.html.haml"
- "app/views/admin/users/_form.html.haml"
- "app/views/admin/users/_submissions.html.haml"
- "app/views/admin/users/index.html.haml"
- "app/views/admin/users/show.html.haml"
- "app/views/admin/venues/_form.html.haml"
- "app/views/admin/venues/show.html.haml"
- "app/views/admin/versions/_object_desc_and_link.html.haml"
- "app/views/admin/versions/index.html.haml"
- "app/views/admin/volunteers/index.html.haml"
- "app/views/commercials/edit.html.haml"
- "app/views/commercials/new.html.haml"
- "app/views/conference_registrations/_form.html.haml"
- "app/views/conference_registrations/_questions.html.haml"
- "app/views/conference_registrations/_registration_info.html.haml"
- "app/views/conference_registrations/_volunteer.html.haml"
- "app/views/conference_registrations/show.html.haml"
- "app/views/conferences/_call_for_paper.html.haml"
- "app/views/conferences/_conference_details.html.haml"
- "app/views/conferences/_gallery.html.haml"
- "app/views/conferences/_lodging.html.haml"
- "app/views/conferences/_program.html.haml"
- "app/views/conferences/_registration.html.haml"
- "app/views/conferences/_schedule_splashpage.html.haml"
- "app/views/conferences/_sponsors.html.haml"
- "app/views/conferences/_tickets.html.haml"
- "app/views/conferences/_venue.html.haml"
- "app/views/conferences/_venue_map.html.haml"
- "app/views/conferences/index.html.haml"
- "app/views/conferences/show.html.haml"
- "app/views/devise/confirmations/new.html.haml"
- "app/views/devise/ichain_sessions/new.html.haml"
- "app/views/devise/ichain_sessions/new_test.html.haml"
- "app/views/devise/passwords/edit.html.haml"
- "app/views/devise/passwords/new.html.haml"
- "app/views/devise/registrations/_volunteeruser.html.haml"
- "app/views/devise/registrations/edit.html.haml"
- "app/views/devise/registrations/new.html.haml"
- "app/views/devise/sessions/new.html.haml"
- "app/views/devise/shared/_help.html.haml"
- "app/views/devise/shared/_links.html.haml"
- "app/views/devise/shared/_openid_links.html.haml"
- "app/views/devise/shared/_sign_in_form_embedded.html.haml"
- "app/views/devise/shared/_sign_up_form_embedded.html.haml"
- "app/views/layouts/_admin_sidebar.html.haml"
- "app/views/layouts/_admin_sidebar_index.html.haml"
- "app/views/layouts/_messages.html.haml"
- "app/views/layouts/_navigation.html.haml"
- "app/views/layouts/application.html.haml"
- "app/views/payments/_payment.html.haml"
- "app/views/proposals/_form.html.haml"
- "app/views/proposals/_proposal_form.html.haml"
- "app/views/proposals/_tooltip.html.haml"
- "app/views/proposals/index.html.haml"
- "app/views/proposals/new.html.haml"
- "app/views/proposals/registrations.html.haml"
- "app/views/proposals/show.html.haml"
- "app/views/schedules/_carousel.html.haml"
- "app/views/schedules/_event.html.haml"
- "app/views/schedules/_schedule.html.haml"
- "app/views/schedules/_schedule_item.html.haml"
- "app/views/schedules/_schedule_tabs.html.haml"
- "app/views/schedules/events.html.haml"
- "app/views/schedules/show.html.haml"
- "app/views/schedules/show.xml.haml"
- "app/views/shared/_changelog_actions.haml"
- "app/views/shared/_dynamic_association.html.haml"
- "app/views/shared/_media_item.html.haml"
- "app/views/shared/_media_items.html.haml"
- "app/views/shared/_object_changes.html.haml"
- "app/views/tickets/_ticket.html.haml"
- "app/views/tickets/index.html.haml"
- "app/views/users/edit.html.haml"
- "app/views/users/show.html.haml"
# Offense count: 204
InstanceVariables:
exclude:
- "app/views/admin/campaigns/_form.html.haml"
- "app/views/admin/cfps/_form.html.haml"
- "app/views/admin/conferences/_todo_list.html.haml"
- "app/views/admin/difficulty_levels/_form.html.haml"
- "app/views/admin/event_types/_form.html.haml"
- "app/views/admin/events/_change_state_dropdown.html.haml"
- "app/views/admin/events/_proposal.html.haml"
- "app/views/admin/events/_voting.html.haml"
- "app/views/admin/events/_voting_index.html.haml"
- "app/views/admin/lodgings/_form.html.haml"
- "app/views/admin/questions/_questions.html.haml"
- "app/views/admin/registration_periods/_form.html.haml"
- "app/views/admin/reports/_all_events.html.haml"
- "app/views/admin/reports/_events_with_requirements.html.haml"
- "app/views/admin/reports/_events_without_commercials.html.haml"
- "app/views/admin/reports/_missing_speakers.html.haml"
- "app/views/admin/roles/_form.html.haml"
- "app/views/admin/roles/_users.html.haml"
- "app/views/admin/rooms/_form.html.haml"
- "app/views/admin/schedules/_day_tab.html.haml"
- "app/views/admin/sponsors/_form.html.haml"
- "app/views/admin/sponsorship_levels/_form.html.haml"
- "app/views/admin/tickets/_form.html.haml"
- "app/views/admin/tracks/_form.html.haml"
- "app/views/admin/users/_form.html.haml"
- "app/views/admin/users/_submissions.html.haml"
- "app/views/admin/venues/_form.html.haml"
- "app/views/conference_registrations/_form.html.haml"
- "app/views/conference_registrations/_registration_info.html.haml"
- "app/views/conference_registrations/_volunteer.html.haml"
- "app/views/conferences/_call_for_paper.html.haml"
- "app/views/conferences/_lodging.html.haml"
- "app/views/conferences/_program.html.haml"
- "app/views/conferences/_registration.html.haml"
- "app/views/conferences/_schedule_splashpage.html.haml"
- "app/views/conferences/_sponsors.html.haml"
- "app/views/conferences/_tickets.html.haml"
- "app/views/conferences/_venue.html.haml"
- "app/views/conferences/_venue_map.html.haml"
- "app/views/layouts/_admin_sidebar.html.haml"
- "app/views/layouts/_user_menu.html.haml"
- "app/views/payments/_payment.html.haml"
- "app/views/proposals/_encouragement_text.html.haml"
- "app/views/proposals/_form.html.haml"
- "app/views/proposals/_proposal_form.html.haml"
- "app/views/schedules/_carousel.html.haml"
- "app/views/schedules/_event.html.haml"
- "app/views/schedules/_schedule.html.haml"
- "app/views/schedules/_schedule_item.html.haml"
- "app/views/schedules/_schedule_tabs.html.haml"
# Offense count: 32
IdNames:
exclude:
- "app/views/admin/cfps/show.html.haml"
- "app/views/admin/comments/index.html.haml"
- "app/views/admin/conferences/index.html.haml"
- "app/views/admin/conferences/show.html.haml"
- "app/views/admin/difficulty_levels/index.html.haml"
- "app/views/admin/event_types/index.html.haml"
- "app/views/admin/programs/show.html.haml"
- "app/views/admin/questions/show.html.haml"
- "app/views/admin/roles/show.html.haml"
- "app/views/admin/schedules/index.html.haml"
- "app/views/admin/sponsorship_levels/index.html.haml"
- "app/views/admin/users/_event_registrations.html.haml"
- "app/views/admin/users/show.html.haml"
- "app/views/users/edit.html.haml"
# Offense count: 8
UnnecessaryInterpolation:
exclude:
- "app/views/admin/conferences/_doughnut_chart.html.haml"
- "app/views/admin/conferences/_recent_submissions.html.haml"
- "app/views/admin/events/reports.html.haml"
- "app/views/admin/reports/_events_with_requirements.html.haml"
- "app/views/admin/reports/_events_without_commercials.html.haml"
- "app/views/proposals/_proposal_form.html.haml"
- "app/views/proposals/new.html.haml"
# Offense count: 48
UnnecessaryStringOutput:
exclude:
- "app/views/admin/conferences/_targets.html.haml"
- "app/views/admin/event_types/index.html.haml"
- "app/views/admin/events/show.html.haml"
- "app/views/admin/users/_submissions.html.haml"
- "app/views/admin/venues/show.html.haml"
- "app/views/admin/versions/_object_desc_and_link.html.haml"
- "app/views/admin/volunteers/show.html.haml"
- "app/views/conference_registrations/show.html.haml"
- "app/views/conferences/_call_for_paper.html.haml"
- "app/views/conferences/_conference_details.html.haml"
- "app/views/conferences/_program.html.haml"
- "app/views/conferences/_venue.html.haml"
- "app/views/conferences/show.html.haml"
- "app/views/devise/registrations/edit.html.haml"
- "app/views/proposals/_encouragement_text.html.haml"
- "app/views/proposals/_form.html.haml"
- "app/views/users/edit.html.haml"
- "app/views/users/show.html.haml"
# Offense count: 268
SpaceInsideHashAttributes:
exclude:
- "app/views/admin/conferences/_todo_list.html.haml"
- "app/views/admin/questions/_form.html.haml"
- "app/views/admin/questions/index.html.haml"
- "app/views/admin/registrations/index.html.haml"
- "app/views/admin/reports/_all_events.html.haml"
- "app/views/admin/reports/index.html.haml"
- "app/views/admin/schedules/_day_tab.html.haml"
- "app/views/admin/schedules/_event.html.haml"
- "app/views/admin/schedules/index.html.haml"
- "app/views/admin/schedules/show.html.haml"
- "app/views/admin/sponsorship_levels/index.html.haml"
- "app/views/admin/targets/index.html.haml"
- "app/views/admin/tickets/show.html.haml"
- "app/views/admin/tracks/index.html.haml"
- "app/views/admin/users/show.html.haml"
- "app/views/admin/venues/_form.html.haml"
- "app/views/admin/venues/show.html.haml"
- "app/views/conference_registrations/_form.html.haml"
- "app/views/conference_registrations/_ticket.html.haml"
- "app/views/conference_registrations/_volunteer.html.haml"
- "app/views/conferences/_venue.html.haml"
- "app/views/conferences/_venue_map.html.haml"
- "app/views/conferences/index.html.haml"
- "app/views/devise/shared/_help.html.haml"
- "app/views/devise/shared/_openid_links.html.haml"
- "app/views/devise/shared/_sign_in_form_embedded.html.haml"
- "app/views/layouts/_admin_sidebar.html.haml"
- "app/views/layouts/_admin_sidebar_index.html.haml"
- "app/views/layouts/_messages.html.haml"
- "app/views/layouts/_navigation.html.haml"
- "app/views/layouts/application.html.haml"
- "app/views/payments/_payment.html.haml"
- "app/views/proposals/_form.html.haml"
- "app/views/proposals/_tooltip.html.haml"
- "app/views/proposals/index.html.haml"
- "app/views/proposals/new.html.haml"
- "app/views/proposals/show.html.haml"
- "app/views/schedules/_carousel.html.haml"
- "app/views/schedules/_schedule_item.html.haml"
- "app/views/shared/_changelog_actions.haml"
- "app/views/shared/_dynamic_association.html.haml"
- "app/views/shared/_media_item.html.haml"
- "app/views/shared/_media_items.html.haml"
- "app/views/shared/_object_changes.html.haml"
- "app/views/tickets/_ticket.html.haml"
- "app/views/tickets/index.html.haml"
# Offense count: 27
ClassesBeforeIds:
exclude:
- "app/views/admin/emails/index.html.haml"
- "app/views/admin/events/reports.html.haml"
- "app/views/admin/events/show.html.haml"
- "app/views/admin/reports/index.html.haml"
- "app/views/admin/users/show.html.haml"
- "app/views/admin/venues/_form.html.haml"
- "app/views/conferences/index.html.haml"
- "app/views/devise/shared/_help.html.haml"
- "app/views/devise/shared/_sign_in_form_embedded.html.haml"
- "app/views/layouts/_navigation.html.haml"
- "app/views/proposals/_form.html.haml"
# Offense count: 14
ConsecutiveSilentScripts:
exclude:
- "app/views/admin/events/index.html.haml"
- "app/views/admin/schedules/_day_tab.html.haml"
- "app/views/admin/schedules/_event.html.haml"
- "app/views/admin/versions/_object_desc_and_link.html.haml"
- "app/views/schedules/_carousel.html.haml"
# Offense count: 2
FinalNewline:
exclude:
- "app/views/admin/registrations/index.csv.haml"
- "app/views/layouts/_admin.html.haml"
# Offense count: 1
ImplicitDiv:
exclude:
- "app/views/admin/registrations/index.html.haml"
# Offense count: 48
SpaceBeforeScript:
exclude:
- "app/views/admin/registrations/index.html.haml"
- "app/views/admin/sponsors/_form.html.haml"
- "app/views/admin/targets/_form.html.haml"
- "app/views/admin/tracks/_form.html.haml"
- "app/views/admin/tracks/show.html.haml"
- "app/views/admin/venues/show.html.haml"
- "app/views/admin/versions/index.html.haml"
- "app/views/conference_registrations/_form.html.haml"
- "app/views/conference_registrations/_ticket.html.haml"
- "app/views/conference_registrations/show.html.haml"
- "app/views/conferences/_lodging.html.haml"
- "app/views/conferences/_schedule_splashpage.html.haml"
- "app/views/conferences/_sponsors.html.haml"
- "app/views/conferences/_tickets.html.haml"
- "app/views/conferences/_venue.html.haml"
- "app/views/conferences/index.html.haml"
- "app/views/layouts/_admin.html.haml"
- "app/views/layouts/_navigation.html.haml"
- "app/views/layouts/_user_menu.html.haml"
- "app/views/layouts/application.html.haml"
- "app/views/proposals/_encouragement_text.html.haml"
- "app/views/proposals/new.html.haml"
- "app/views/proposals/registrations.html.haml"
- "app/views/proposals/show.html.haml"
- "app/views/schedules/events.html.haml"
- "app/views/schedules/show.xml.haml"
- "app/views/tickets/index.html.haml"
# Offense count: 9
MultilinePipe:
exclude:
- "app/views/admin/schedules/_day_tab.html.haml"
- "app/views/admin/schedules/_event.html.haml"
- "app/views/schedules/_carousel.html.haml"
- "app/views/schedules/_event.html.haml"
- "app/views/schedules/_schedule_item.html.haml"
# Offense count: 38
TrailingWhitespace:
exclude:
- "app/views/admin/users/_form.html.haml"
- "app/views/admin/users/index.html.haml"
- "app/views/admin/users/show.html.haml"
- "app/views/admin/volunteers/index.html.haml"
- "app/views/admin/volunteers/show.html.haml"
- "app/views/conference_registrations/_volunteer.html.haml"
- "app/views/devise/passwords/new.html.haml"
- "app/views/payments/new.html.haml"
- "app/views/tickets/index.html.haml"
# Offense count: 7
ClassAttributeWithStaticValue:
exclude:
- "app/views/conferences/_gallery.html.haml"
- "app/views/layouts/_navigation.html.haml"
- "app/views/schedules/events.html.haml"

1
Gemfile
View file

@ -198,6 +198,7 @@ group :development do
# to launch specs when files are modified
gem 'guard-rspec', '~> 4.2.8'
gem 'spring-commands-rspec'
gem 'haml_lint', '~> 0.24.0'
# for static code analisys
gem 'rubocop', require: false
# as database

48
Gemfile.lock
View file

@ -58,7 +58,7 @@ GEM
user_agent_parser
uuidtools
arel (6.0.3)
ast (2.2.0)
ast (2.3.0)
autoprefixer-rails (5.1.9)
execjs
json
@ -82,7 +82,7 @@ GEM
bootstrap3-datetimepicker-rails (3.0.3)
momentjs-rails (>= 2.8.1)
browser (0.6.0)
builder (3.2.2)
builder (3.2.3)
byebug (3.1.2)
columnize (~> 0.8)
debugger-linecache (~> 1.2)
@ -160,7 +160,7 @@ GEM
warden (~> 1.2.3)
devise_ichain_authenticatable (0.3.1)
devise (>= 2.2)
diff-lcs (1.2.5)
diff-lcs (1.3)
docile (1.1.5)
domain_name (0.5.20160310)
unf (>= 0.0.5, < 1.0.0)
@ -202,13 +202,19 @@ GEM
guard-rspec (4.2.8)
guard (~> 2.1)
rspec (>= 2.14, < 4.0)
haml (4.0.5)
haml (4.0.7)
tilt
haml-rails (0.5.3)
actionpack (>= 4.0.1)
activesupport (>= 4.0.1)
haml (>= 3.1, < 5.0)
railties (>= 4.0.1)
haml_lint (0.24.0)
haml (>= 4.0, < 5.1)
rainbow
rake (>= 10, < 13)
rubocop (>= 0.36.0)
sysexits (~> 1.1)
hashie (2.1.1)
hike (1.2.3)
hoptoad_notifier (2.4.11)
@ -230,7 +236,7 @@ GEM
thor (>= 0.14, < 2.0)
jquery-ui-rails (4.2.1)
railties (>= 3.2.16)
json (1.8.3)
json (1.8.6)
json-schema (2.5.0)
addressable (~> 2.3)
jwt (1.0.0)
@ -261,7 +267,7 @@ GEM
rake
mini_magick (4.5.1)
mini_portile2 (2.1.0)
minitest (5.9.0)
minitest (5.10.1)
momentjs-rails (2.8.1)
railties (>= 3.1)
monetize (1.4.0)
@ -282,7 +288,6 @@ GEM
nio4r (1.2.1)
nokogiri (1.7.1)
mini_portile2 (~> 2.1.0)
pkg-config (~> 1.1.7)
oauth2 (0.9.4)
faraday (>= 0.8, < 0.10)
jwt (~> 1.0)
@ -314,7 +319,7 @@ GEM
activerecord (>= 3.0, < 6.0)
activesupport (>= 3.0, < 6.0)
request_store (~> 1.1)
parser (2.3.0.3)
parser (2.4.0.0)
ast (~> 2.2)
pdf-core (0.2.5)
phantomjs (2.1.1.0)
@ -322,7 +327,6 @@ GEM
actionpack
activesupport
rails (>= 3.0.0)
pkg-config (1.1.7)
poltergeist (1.9.0)
capybara (~> 2.1)
cliver (~> 0.3.1)
@ -396,7 +400,7 @@ GEM
activesupport (= 4.2.7.1)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (2.1.0)
rainbow (2.2.1)
rake (10.5.0)
rb-fsevent (0.9.4)
rb-inotify (0.9.4)
@ -426,12 +430,12 @@ GEM
activemodel (>= 3.0)
activesupport (>= 3.0)
rspec-mocks (>= 2.99, < 4.0)
rspec-core (3.0.2)
rspec-core (3.0.4)
rspec-support (~> 3.0.0)
rspec-expectations (3.0.2)
rspec-expectations (3.0.4)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.0.0)
rspec-mocks (3.0.2)
rspec-mocks (3.0.4)
rspec-support (~> 3.0.0)
rspec-rails (3.0.0)
actionpack (>= 3.0)
@ -441,16 +445,16 @@ GEM
rspec-expectations (~> 3.0.0)
rspec-mocks (~> 3.0.0)
rspec-support (~> 3.0.0)
rspec-support (3.0.2)
rspec-support (3.0.4)
rubocop (0.37.0)
parser (>= 2.3.0.2, < 3.0)
parser (>= 2.3.3.1, < 3.0)
powerpack (~> 0.1)
rainbow (>= 1.99.1, < 3.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 0.3)
unicode-display_width (~> 1.0, >= 1.0.1)
ruby-oembed (0.8.14)
ruby-openid (2.5.0)
ruby-progressbar (1.7.5)
ruby-progressbar (1.8.1)
rubyzip (1.2.1)
safe_yaml (1.0.4)
sass (3.2.19)
@ -489,10 +493,11 @@ GEM
dante (>= 0.2.0)
multi_json (>= 1.0.0)
stripe (>= 1.31.0, <= 1.43)
sysexits (1.2.0)
term-ansicolor (1.3.2)
tins (~> 1.0)
thor (0.19.1)
thread_safe (0.3.5)
thread_safe (0.3.6)
tilt (1.4.1)
timecop (0.7.1)
timers (1.1.0)
@ -501,14 +506,14 @@ GEM
ttfunk (1.1.1)
turbolinks (2.5.3)
coffee-rails
tzinfo (1.2.2)
tzinfo (1.2.3)
thread_safe (~> 0.1)
uglifier (3.0.0)
execjs (>= 0.3.0, < 3)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.2)
unicode-display_width (0.3.1)
unicode-display_width (1.1.3)
unicode_utils (1.4.0)
unobtrusive_flash (3.1.0)
railties
@ -574,6 +579,7 @@ DEPENDENCIES
gravtastic
guard-rspec (~> 4.2.8)
haml-rails
haml_lint (~> 0.24.0)
hoptoad_notifier (~> 2.3)
iso-639
jquery-datatables-rails (~> 2.2.1)
@ -637,4 +643,4 @@ DEPENDENCIES
whenever
BUNDLED WITH
1.14.3
1.14.5