Skip to content

Commit

Permalink
Merge branch 'release/0.17.0.19'
Browse files Browse the repository at this point in the history
  • Loading branch information
kalashnikovisme committed Apr 3, 2017
2 parents fef5d22 + e1da5dc commit a8275b5
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions app/controllers/application_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ def redirect_to_another_main_page
unless Rails.env.test?
if request.host.include?('it-way.pro') && request.path != main_page_of('it-way.pro')
redirect_to main_page_of 'it-way.pro'
#elsif request.host.include?('ul-lider.ru') && request.path != activity_lines_lider_ya_lider_path(15)
#redirect_to activity_lines_lider_ya_lider_path(15), status: :moved_permanently
elsif request.host.include?('ul-lider.ru') && request.path == ''
redirect_to activity_lines_lider_ya_lider_path(15), status: :moved_permanently
end
end
end
Expand Down

0 comments on commit a8275b5

Please sign in to comment.