diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-12-09 01:04:52 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2015-12-09 01:04:52 +0300 |
| commit | e6668f8e341e422cae752e3371631b50eeb696b2 (patch) | |
| tree | 428ff5903dbd995082a4e6874aacfbd131a02287 /app/controllers/projects/application_controller.rb | |
| parent | 275e8e7309604831485a1f0179f98f41c06f5a8c (diff) | |
| parent | 0f89e6905db6fe821332013e8ddb2707079e0ba4 (diff) | |
Merge branch 'edit-in-patch-branch' into 'master'
Default target branch to patch-n when editing file in protected branch
Fixes #3441
See merge request !2021
Diffstat (limited to 'app/controllers/projects/application_controller.rb')
| -rw-r--r-- | app/controllers/projects/application_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/application_controller.rb b/app/controllers/projects/application_controller.rb index c2aaf094e68..7d0d57858e0 100644 --- a/app/controllers/projects/application_controller.rb +++ b/app/controllers/projects/application_controller.rb @@ -21,7 +21,7 @@ class Projects::ApplicationController < ApplicationController unless @repository.branch_names.include?(@ref) redirect_to( namespace_project_tree_path(@project.namespace, @project, @ref), - notice: "This action is not allowed unless you are on top of a branch" + notice: "This action is not allowed unless you are on a branch" ) end end |