Commit cb77d0c0 authored by Valery Sizov's avatar Valery Sizov

Merge branch 'easy_commit' into ce_upstream

parents 03a6d379 7cf6f50f
......@@ -131,6 +131,7 @@ v 8.10.0 (unreleased)
- Render only commit message title in builds (Katarzyna Kobierska Ula Budziszewska)
- Allow bulk (un)subscription from issues in issue index
- Fix MR diff encoding issues exporting GitLab projects
- Fix of 'Commits being passed to custom hooks are already reachable when using the UI'
v 8.9.6
- Fix importing of events under notes for GitLab projects. !5154
......
GIT
remote: https://gitlab.com/gitlab-org/gitlab_git.git
revision: 0df0cdd9bb1164a7595f1f69f5dfa79489e3eaf1
branch: optional_branch_update
specs:
gitlab_git (10.3.0)
activesupport (~> 4.0)
charlock_holmes (~> 0.7.3)
github-linguist (~> 4.7.0)
rugged (~> 0.24.0)
GEM
remote: https://rubygems.org/
specs:
......
......@@ -858,7 +858,7 @@ class Repository
raise "Invalid merge target" if our_commit.nil?
raise "Invalid merge source" if their_commit.nil?
commit_with_hooks(user, target_branch) do |ref|
commit_with_hooks(user, target_branch) do
source_sha
end
end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment