Changeset [da13b7d25c781b8cc2052e90b977d699e6c384fd] by Marnen Laibow-Koser
Revision da13b7d25c781b8cc2052e90b977d699e6c384fd,
committed by Marnen Laibow-Koser
· January 10th, 2015 @ 02:23 AM
Merge branch 'deprecations' into 84-rails-4.0
https://github.com/marnen/quorum2/commit/da13b7d25c781b8cc2052e90b9...
21 changed files
-
A
features/support/fast_gettext.rb -
R
features/support/additional_cucumber_setup.rb -
M
Gemfile -
M
Gemfile.lock -
M
app/controllers/admin_controller.rb -
M
app/controllers/calendars_controller.rb -
M
app/controllers/events_controller.rb -
M
app/controllers/permissions_controller.rb -
M
app/models/event.rb -
M
app/models/user.rb -
M
app/views/calendars/users.html.haml -
M
app/views/events/_form.html.haml -
M
app/views/users/new.html.haml -
M
features/step_definitions/calendar_steps.rb -
M
features/step_definitions/extra_web_steps.rb -
M
features/step_definitions/web_steps.rb -
M
spec/controllers/events_controller_spec.rb -
M
spec/factories.rb -
M
spec/lib/resource_params_spec.rb -
M
spec/models/event_spec.rb -
M
spec/views/events/_event.html.haml_spec.rb