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
633314b6
Commit
633314b6
authored
Nov 27, 2017
by
Nick Thomas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix viewing default push rules on a Geo secondary
parent
be8905b8
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
2 deletions
+7
-2
changelogs/unreleased-ee/4110-fix-push-rules-on-geo-secondary.yml
...gs/unreleased-ee/4110-fix-push-rules-on-geo-secondary.yml
+5
-0
ee/app/controllers/admin/push_rules_controller.rb
ee/app/controllers/admin/push_rules_controller.rb
+1
-1
ee/app/views/admin/push_rules/show.html.haml
ee/app/views/admin/push_rules/show.html.haml
+1
-1
spec/ee/spec/controllers/admin/push_rules_controller_spec.rb
spec/ee/spec/controllers/admin/push_rules_controller_spec.rb
+0
-0
No files found.
changelogs/unreleased-ee/4110-fix-push-rules-on-geo-secondary.yml
0 → 100644
View file @
633314b6
---
title
:
Fix viewing default push rules on a Geo secondary
merge_request
:
3559
author
:
type
:
fixed
ee/app/controllers/admin/push_rules_controller.rb
View file @
633314b6
...
...
@@ -40,6 +40,6 @@ class Admin::PushRulesController < Admin::ApplicationController
end
def
push_rule
@push_rule
||=
PushRule
.
find_or_
creat
e_by
(
is_sample:
true
)
@push_rule
||=
PushRule
.
find_or_
initializ
e_by
(
is_sample:
true
)
end
end
ee/app/views/admin/push_rules/show.html.haml
View file @
633314b6
...
...
@@ -6,7 +6,7 @@
%hr
.clearfix
=
form_for
[
:admin
,
@push_rule
]
do
|
f
|
=
form_for
@push_rule
,
url:
admin_push_rule_path
,
method: :put
do
|
f
|
-
if
@push_rule
.
errors
.
any?
.alert.alert-danger
-
@push_rule
.
errors
.
full_messages
.
each
do
|
msg
|
...
...
spec/controllers/admin/push_rules_controller_spec.rb
→
spec/
ee/spec/
controllers/admin/push_rules_controller_spec.rb
View file @
633314b6
File moved
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