Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
cb77d0c0
Commit
cb77d0c0
authored
Jul 19, 2016
by
Valery Sizov
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'easy_commit' into ce_upstream
parents
03a6d379
7cf6f50f
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
1 deletion
+13
-1
CHANGELOG
CHANGELOG
+1
-0
Gemfile.lock
Gemfile.lock
+11
-0
app/models/repository.rb
app/models/repository.rb
+1
-1
No files found.
CHANGELOG
View file @
cb77d0c0
...
@@ -131,6 +131,7 @@ v 8.10.0 (unreleased)
...
@@ -131,6 +131,7 @@ v 8.10.0 (unreleased)
- Render only commit message title in builds (Katarzyna Kobierska Ula Budziszewska)
- Render only commit message title in builds (Katarzyna Kobierska Ula Budziszewska)
- Allow bulk (un)subscription from issues in issue index
- Allow bulk (un)subscription from issues in issue index
- Fix MR diff encoding issues exporting GitLab projects
- 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
v 8.9.6
- Fix importing of events under notes for GitLab projects. !5154
- Fix importing of events under notes for GitLab projects. !5154
...
...
Gemfile.lock
View file @
cb77d0c0
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
GEM
remote: https://rubygems.org/
remote: https://rubygems.org/
specs:
specs:
...
...
app/models/repository.rb
View file @
cb77d0c0
...
@@ -858,7 +858,7 @@ class Repository
...
@@ -858,7 +858,7 @@ class Repository
raise
"Invalid merge target"
if
our_commit
.
nil?
raise
"Invalid merge target"
if
our_commit
.
nil?
raise
"Invalid merge source"
if
their_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
source_sha
end
end
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment