diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-10-24 07:52:21 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-10-24 07:52:21 +0000 |
| commit | f7bdfe5098c9a5a3a426344ba1d7dd668212cf7e (patch) | |
| tree | 5a1cb2a90b0a2b5114f6f23712b68724b3e8a7e0 /app/controllers/projects/application_controller.rb | |
| parent | 9cd528aa7ac5066570cb50b909951a6c6b723935 (diff) | |
| parent | e16add2267648d3d3ef1d98f9b53f67a29428791 (diff) | |
| download | gitlab-ce-es-module-autosave.tar.gz | |
Merge branch 'master' into 'es-module-autosave'es-module-autosave
# Conflicts:
# app/assets/javascripts/issuable_form.js
# app/assets/javascripts/notes.js
Diffstat (limited to 'app/controllers/projects/application_controller.rb')
| -rw-r--r-- | app/controllers/projects/application_controller.rb | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/app/controllers/projects/application_controller.rb b/app/controllers/projects/application_controller.rb index d7dd8ddcb7d..9e79852e378 100644 --- a/app/controllers/projects/application_controller.rb +++ b/app/controllers/projects/application_controller.rb @@ -2,7 +2,6 @@ class Projects::ApplicationController < ApplicationController include RoutableActions skip_before_action :authenticate_user! - before_action :redirect_git_extension before_action :project before_action :repository layout 'project' @@ -11,15 +10,6 @@ class Projects::ApplicationController < ApplicationController private - def redirect_git_extension - # Redirect from - # localhost/group/project.git - # to - # localhost/group/project - # - redirect_to url_for(params.merge(format: nil)) if params[:format] == 'git' - end - def project return @project if @project return nil unless params[:project_id] || params[:id] |