diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-07-26 10:55:02 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-07-26 10:55:02 +0300 |
| commit | 13b97d3f942be9a8575ae53facb0ad431f4d24f8 (patch) | |
| tree | 90ed6af8ad765e06acca8a25c7cf067ba1443f7e /app | |
| parent | 64661425add7308ddadcc5866e082b95b208c2c3 (diff) | |
| parent | 1dbf32d84bd73037675cd179a7c8a74d980f3939 (diff) | |
Merge branch '31576-redirect-commits-to-root-if-no-ref' into 'master'
Resolve "Define /commits/ behaviour"
Closes #31576
See merge request gitlab-org/gitlab-ce!20738
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/projects/commits_controller.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/app/controllers/projects/commits_controller.rb b/app/controllers/projects/commits_controller.rb index 9e495061f4e..36faea8056e 100644 --- a/app/controllers/projects/commits_controller.rb +++ b/app/controllers/projects/commits_controller.rb @@ -4,13 +4,17 @@ class Projects::CommitsController < Projects::ApplicationController include ExtractsPath include RendersCommits - before_action :whitelist_query_limiting + before_action :whitelist_query_limiting, except: :commits_root before_action :require_non_empty_project - before_action :assign_ref_vars + before_action :assign_ref_vars, except: :commits_root before_action :authorize_download_code! - before_action :set_commits + before_action :set_commits, except: :commits_root before_action :set_request_format, only: :show + def commits_root + redirect_to project_commits_path(@project, @project.default_branch) + end + def show @merge_request = MergeRequestsFinder.new(current_user, project_id: @project.id).execute.opened .find_by(source_project: @project, source_branch: @ref, target_branch: @repository.root_ref) |