summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-10-19 11:40:13 +0200
committerDouwe Maan <douwe@gitlab.com>2015-10-19 11:40:13 +0200
commit157d891615bbc9d1176b2149cfa5193b9aa4773c (patch)
tree3f4bd1bd6dd90bc206312d6dc1b2e102c54d9f2f
parent8adeda37b55fc992e3cb15422cae5d9646640630 (diff)
downloadgitlab-ce-add-files-optionto-changelog.tar.gz
-rw-r--r--CHANGELOG1
-rw-r--r--app/controllers/projects_controller.rb2
2 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index f8daa6d246c..cfb7a581e81 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@ v 8.2.0 (unreleased)
- Show last project commit to default branch on project home page
- Highlight comment based on anchor in URL
- Adds ability to remove the forked relationship from project settings screen. (Han Loong Liauw)
+ - Allow users to select the Files view as default project view (Cristian Bica)
v 8.1.0 (unreleased)
- Fix bug preventing mentioned issued from being closed when MR is merged using fast-forward merge.
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 73200396ecc..9f0cce468b1 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -246,6 +246,8 @@ class ProjectsController < ApplicationController
project.repository_exists? && !project.empty_repo?
end
+ # Override get_id from ExtractsPath, which returns the branch and file path
+ # for the blob/tree, which in this case is just the root of the default branch.
def get_id
project.repository.root_ref
end