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
2175f7e9
Commit
2175f7e9
authored
May 16, 2019
by
Luke Bennett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve CE/EE diffs in group general settings
Part of single codebase changes.
parent
2cdb7824
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
8 deletions
+9
-8
app/views/groups/settings/_general.html.haml
app/views/groups/settings/_general.html.haml
+1
-1
app/views/projects/settings/_general.html.haml
app/views/projects/settings/_general.html.haml
+1
-1
ee/app/views/shared/_repository_size_limit_setting.html.haml
ee/app/views/shared/_repository_size_limit_setting.html.haml
+7
-6
No files found.
app/views/groups/settings/_general.html.haml
View file @
2175f7e9
...
...
@@ -17,7 +17,7 @@
=
f
.
label
:description
,
_
(
'Group description (optional)'
),
class:
'label-bold'
=
f
.
text_area
:description
,
class:
'form-control'
,
rows:
3
,
maxlength:
250
.row
=
render_if_exists
'shared/repository_size_limit_setting'
,
form:
f
,
type: :group
=
render_if_exists
'shared/repository_size_limit_setting'
,
form:
f
,
type: :group
.form-group.prepend-top-default.append-bottom-20
.avatar-container.rect-avatar.s90
...
...
app/views/projects/settings/_general.html.haml
View file @
2175f7e9
...
...
@@ -27,7 +27,7 @@
.row
=
render_if_exists
'projects/classification_policy_settings'
,
f:
f
.row
=
render_if_exists
'shared/repository_size_limit_setting'
,
form:
f
,
type: :project
=
render_if_exists
'shared/repository_size_limit_setting'
,
form:
f
,
type: :project
.form-group.prepend-top-default.append-bottom-20
.avatar-container.s90
...
...
ee/app/views/shared/_repository_size_limit_setting.html.haml
View file @
2175f7e9
...
...
@@ -3,9 +3,10 @@
-
form
=
local_assigns
.
fetch
(
:form
)
-
is_project
=
local_assigns
.
fetch
(
:type
)
==
:project
.form-group.col-md-9
=
form
.
label
:repository_size_limit
,
class:
'label-bold'
do
Repository size limit (MB)
=
form
.
number_field
:repository_size_limit
,
value:
form
.
object
.
repository_size_limit
.
try
(
:to_mb
),
class:
'form-control'
,
min:
0
%span
.form-text.text-muted
#repository_size_limit_help_block
=
is_project
?
size_limit_message
(
@project
)
:
size_limit_message_for_group
(
@group
)
.row
.form-group.col-md-9
=
form
.
label
:repository_size_limit
,
class:
'label-bold'
do
Repository size limit (MB)
=
form
.
number_field
:repository_size_limit
,
value:
form
.
object
.
repository_size_limit
.
try
(
:to_mb
),
class:
'form-control'
,
min:
0
%span
.form-text.text-muted
#repository_size_limit_help_block
=
is_project
?
size_limit_message
(
@project
)
:
size_limit_message_for_group
(
@group
)
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