summaryrefslogtreecommitdiff
path: root/lib/api
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-04-03 14:33:34 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-04-03 14:33:34 +0300
commit207f34b890b58c09281850a37477948ec75e0ef4 (patch)
tree1e4f0559f1355b1034a8fdf21034a949c9ac14df /lib/api
parent6594ce1de042491a8ce27899b9ed1c00d0d3e684 (diff)
parent8b35b208372e2394953226b7e4342d860a695f84 (diff)
downloadgitlab-ce-207f34b890b58c09281850a37477948ec75e0ef4.tar.gz
Merge pull request #6190 from Popl7/add-better-branch-protection-against-history-rewrite-and-deletion
protect protected branched to force updates
Diffstat (limited to 'lib/api')
-rw-r--r--lib/api/internal.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/api/internal.rb b/lib/api/internal.rb
index bcf97574673..06c66ba0b35 100644
--- a/lib/api/internal.rb
+++ b/lib/api/internal.rb
@@ -10,6 +10,7 @@ module API
# project - project path with namespace
# action - git action (git-upload-pack or git-receive-pack)
# ref - branch name
+ # forced_push - forced_push
#
get "/allowed" do
# Check for *.wiki repositories.
@@ -35,7 +36,8 @@ module API
project,
params[:ref],
params[:oldrev],
- params[:newrev]
+ params[:newrev],
+ params[:forced_push]
)
end