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
b6ed64c2
Commit
b6ed64c2
authored
Apr 29, 2016
by
Gabriel Mazetto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't try to check if is mergeable, and display read-only warning
parent
75136cc0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
2 deletions
+7
-2
app/models/merge_request.rb
app/models/merge_request.rb
+1
-1
app/views/projects/merge_requests/widget/_open.html.haml
app/views/projects/merge_requests/widget/_open.html.haml
+3
-1
app/views/projects/merge_requests/widget/open/_geo.html.haml
app/views/projects/merge_requests/widget/open/_geo.html.haml
+3
-0
No files found.
app/models/merge_request.rb
View file @
b6ed64c2
...
...
@@ -258,7 +258,7 @@ class MergeRequest < ActiveRecord::Base
end
def
check_if_can_be_merged
return
unless
unchecked?
return
unless
unchecked?
&&
!
Gitlab
::
Geo
.
secondary?
can_be_merged
=
!
broken?
&&
project
.
repository
.
can_be_merged?
(
source_sha
,
target_branch
)
...
...
app/views/projects/merge_requests/widget/_open.html.haml
View file @
b6ed64c2
.mr-state-widget
=
render
'projects/merge_requests/widget/heading'
.mr-widget-body
-
if
@project
.
archived?
-
if
Gitlab
::
Geo
.
secondary?
=
render
'projects/merge_requests/widget/open/geo'
-
elsif
@project
.
archived?
=
render
'projects/merge_requests/widget/open/archived'
-
elsif
@merge_request
.
commits
.
blank?
=
render
'projects/merge_requests/widget/open/nothing'
...
...
app/views/projects/merge_requests/widget/open/_geo.html.haml
0 → 100644
View file @
b6ed64c2
%h4
=
icon
(
'exclamation-triangle'
)
Merge requests are read-only in a secondary Geo node
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