rebase fixes

This commit is contained in:
Stella Rouzi 2014-07-27 08:53:12 +03:00
parent 723c6aaafc
commit cb0e82c88f
2 changed files with 9 additions and 9 deletions

View file

@ -56,7 +56,7 @@ class ProposalController < ApplicationController
registration = current_user.registrations.where(conference_id: @conference.id).first
ahoy.track 'Event submission', title: 'New submission'
if registration.nil?
redirect_to(register_conference_path(@conference.short_title),
redirect_to(conference_register_path(@conference.short_title),
alert: 'Event was successfully submitted.
You should register for the conference now.')
else