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
c1cc7005
Commit
c1cc7005
authored
Jun 09, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added limited width container to project settings
parent
529eede8
Changes
12
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
52 additions
and
50 deletions
+52
-50
app/assets/stylesheets/pages/members.scss
app/assets/stylesheets/pages/members.scss
+0
-4
app/views/projects/edit.html.haml
app/views/projects/edit.html.haml
+34
-32
app/views/projects/hooks/_index.html.haml
app/views/projects/hooks/_index.html.haml
+2
-2
app/views/projects/pipelines_settings/_badge.html.haml
app/views/projects/pipelines_settings/_badge.html.haml
+2
-2
app/views/projects/pipelines_settings/_show.html.haml
app/views/projects/pipelines_settings/_show.html.haml
+2
-2
app/views/projects/project_members/_index.html.haml
app/views/projects/project_members/_index.html.haml
+2
-2
app/views/projects/services/_index.html.haml
app/views/projects/services/_index.html.haml
+2
-2
app/views/projects/settings/ci_cd/show.html.haml
app/views/projects/settings/ci_cd/show.html.haml
+1
-0
app/views/projects/settings/integrations/show.html.haml
app/views/projects/settings/integrations/show.html.haml
+1
-0
app/views/projects/settings/members/show.html.haml
app/views/projects/settings/members/show.html.haml
+2
-0
app/views/projects/triggers/_index.html.haml
app/views/projects/triggers/_index.html.haml
+2
-2
app/views/projects/variables/_index.html.haml
app/views/projects/variables/_index.html.haml
+2
-2
No files found.
app/assets/stylesheets/pages/members.scss
View file @
c1cc7005
...
...
@@ -136,10 +136,6 @@
width
:
250px
;
}
@media
(
min-width
:
$screen-md-min
)
{
width
:
350px
;
}
&
.input-short
{
@media
(
min-width
:
$screen-md-min
)
{
width
:
170px
;
...
...
app/views/projects/edit.html.haml
View file @
c1cc7005
-
@content_class
=
"limit-container-width"
unless
fluid_layout
=
render
"projects/settings/head"
.project-edit-container
.row.prepend-top-default
.col-lg-
3
.profile-settings-sidebar
.col-lg-
4
.profile-settings-sidebar
%h4
.prepend-top-0
Project settings
.col-lg-
9
.col-lg-
8
.project-edit-errors
=
form_for
[
@project
.
namespace
.
becomes
(
Namespace
),
@project
],
remote:
true
,
html:
{
multipart:
true
,
class:
"edit-project"
},
authenticity_token:
true
do
|
f
|
%fieldset
...
...
@@ -39,66 +41,66 @@
Sharing
&
Permissions
.form_group.prepend-top-20.sharing-and-permissions
.row.js-visibility-select
.col-md-
9
.col-md-
8
.label-light
=
label_tag
:project_visibility
,
'Project Visibility'
,
class:
'label-light'
,
for: :project_visibility_level
=
link_to
icon
(
'question-circle'
),
help_page_path
(
"public_access/public_access"
)
%span
.help-block
.col-md-
3
.visibility-select-container
.col-md-
4
.visibility-select-container
=
render
(
'projects/visibility_select'
,
model_method: :visibility_level
,
form:
f
,
selected_level:
@project
.
visibility_level
)
=
f
.
fields_for
:project_feature
do
|
feature_fields
|
%fieldset
.features
.row
.col-md-
9
.project-feature
.col-md-
8
.project-feature
=
feature_fields
.
label
:repository_access_level
,
"Repository"
,
class:
'label-light'
%span
.help-block
View and edit files in this project
.col-md-
3
.js-repo-access-level
.col-md-
4
.js-repo-access-level
=
project_feature_access_select
(
:repository_access_level
)
.row
.col-md-
9
.project-feature.nested
.col-md-
8
.project-feature.nested
=
feature_fields
.
label
:merge_requests_access_level
,
"Merge requests"
,
class:
'label-light'
%span
.help-block
Submit changes to be merged upstream
.col-md-
3
.col-md-
4
=
project_feature_access_select
(
:merge_requests_access_level
)
.row
.col-md-
9
.project-feature.nested
.col-md-
8
.project-feature.nested
=
feature_fields
.
label
:builds_access_level
,
"Pipelines"
,
class:
'label-light'
%span
.help-block
Build, test, and deploy your changes
.col-md-
3
.col-md-
4
=
project_feature_access_select
(
:builds_access_level
)
.row
.col-md-
9
.project-feature
.col-md-
8
.project-feature
=
feature_fields
.
label
:snippets_access_level
,
"Snippets"
,
class:
'label-light'
%span
.help-block
Share code pastes with others out of Git repository
.col-md-
3
.col-md-
4
=
project_feature_access_select
(
:snippets_access_level
)
.row
.col-md-
9
.project-feature
.col-md-
8
.project-feature
=
feature_fields
.
label
:issues_access_level
,
"Issues"
,
class:
'label-light'
%span
.help-block
Lightweight issue tracking system for this project
.col-md-
3
.col-md-
4
=
project_feature_access_select
(
:issues_access_level
)
.row
.col-md-
9
.project-feature
.col-md-
8
.project-feature
=
feature_fields
.
label
:wiki_access_level
,
"Wiki"
,
class:
'label-light'
%span
.help-block
Pages for project documentation
.col-md-
3
.col-md-
4
=
project_feature_access_select
(
:wiki_access_level
)
.form-group
=
render
'shared/allow_request_access'
,
form:
f
-
if
Gitlab
.
config
.
lfs
.
enabled
&&
current_user
.
admin?
.row.js-lfs-enabled
.col-md-
9
.col-md-
8
=
f
.
label
:lfs_enabled
,
'LFS'
,
class:
'label-light'
%span
.help-block
Git Large File Storage
=
link_to
icon
(
'question-circle'
),
help_page_path
(
'workflow/lfs/manage_large_binaries_with_git_lfs'
)
.col-md-
3
.col-md-
4
.select-wrapper
=
f
.
select
:lfs_enabled
,
[
%w(Enabled true)
,
%w(Disabled false)
],
{},
selected:
@project
.
lfs_enabled?
,
class:
'pull-right form-control project-repo-select select-control'
,
data:
{
field:
'lfs_enabled'
}
=
icon
(
'chevron-down'
)
...
...
@@ -138,19 +140,19 @@
.row.prepend-top-default
%hr
.row.prepend-top-default
.col-lg-
3
.col-lg-
4
%h4
.prepend-top-0
Housekeeping
%p
.append-bottom-0
%p
Runs a number of housekeeping tasks within the current repository,
such as compressing file revisions and removing unreachable objects.
.col-lg-
9
.col-lg-
8
=
link_to
'Housekeeping'
,
housekeeping_namespace_project_path
(
@project
.
namespace
,
@project
),
method: :post
,
class:
"btn btn-default"
%hr
.row.prepend-top-default
.col-lg-
3
.col-lg-
4
%h4
.prepend-top-0
Export project
%p
.append-bottom-0
...
...
@@ -159,7 +161,7 @@
%p
Once the exported file is ready, you will receive a notification email with a download link.
.col-lg-
9
.col-lg-
8
-
if
@project
.
export_project_path
=
link_to
'Download export'
,
download_export_namespace_project_path
(
@project
.
namespace
,
@project
),
...
...
@@ -190,7 +192,7 @@
-
if
can?
current_user
,
:archive_project
,
@project
%hr
.row.prepend-top-default
.col-lg-
3
.col-lg-
4
%h4
.warning-title.prepend-top-0
-
if
@project
.
archived?
Unarchive project
...
...
@@ -201,7 +203,7 @@
Unarchiving the project will mark its repository as active. The project can be committed to.
-
else
Archiving the project will mark its repository as read-only. It is hidden from the dashboard and doesn't show up in searches.
.col-lg-
9
.col-lg-
8
-
if
@project
.
archived?
%p
%strong
Once active this project shows up in the search and on the dashboard.
...
...
@@ -216,10 +218,10 @@
method: :post
,
class:
"btn btn-warning"
%hr
.row.prepend-top-default
.col-lg-
3
.col-lg-
4
%h4
.prepend-top-0.warning-title
Rename repository
.col-lg-
9
.col-lg-
8
=
render
'projects/errors'
=
form_for
([
@project
.
namespace
.
becomes
(
Namespace
),
@project
])
do
|
f
|
.form-group.project_name_holder
...
...
@@ -244,12 +246,12 @@
-
if
can?
(
current_user
,
:change_namespace
,
@project
)
%hr
.row.prepend-top-default
.col-lg-
3
.col-lg-
4
%h4
.prepend-top-0.danger-title
Transfer project to new group
%p
.append-bottom-0
Please select the group you want to transfer this project to in the dropdown to the right.
.col-lg-
9
.col-lg-
8
=
form_for
([
@project
.
namespace
.
becomes
(
Namespace
),
@project
],
url:
transfer_namespace_project_path
(
@project
.
namespace
,
@project
),
method: :put
,
remote:
true
,
html:
{
class:
'js-project-transfer-form'
}
)
do
|
f
|
.form-group
=
label_tag
:new_namespace_id
,
nil
,
class:
'label-light'
do
...
...
@@ -265,7 +267,7 @@
-
if
@project
.
forked?
&&
can?
(
current_user
,
:remove_fork_project
,
@project
)
%hr
.row.prepend-top-default.append-bottom-default
.col-lg-
3
.col-lg-
4
%h4
.prepend-top-0.danger-title
Remove fork relationship
%p
.append-bottom-0
...
...
@@ -273,7 +275,7 @@
This will remove the fork relationship to source project
=
succeed
"."
do
=
link_to
@project
.
forked_from_project
.
name_with_namespace
,
project_path
(
@project
.
forked_from_project
)
.col-lg-
9
.col-lg-
8
=
form_for
([
@project
.
namespace
.
becomes
(
Namespace
),
@project
],
url:
remove_fork_namespace_project_path
(
@project
.
namespace
,
@project
),
method: :delete
,
remote:
true
,
html:
{
class:
'transfer-project'
})
do
|
f
|
%p
%strong
Once removed, the fork relationship cannot be restored and you will no longer be able to send merge requests to the source.
...
...
@@ -281,12 +283,12 @@
-
if
can?
(
current_user
,
:remove_project
,
@project
)
%hr
.row.prepend-top-default.append-bottom-default
.col-lg-
3
.col-lg-
4
%h4
.prepend-top-0.danger-title
Remove project
%p
.append-bottom-0
Removing the project will delete its repository and all related resources including issues, merge requests etc.
.col-lg-
9
.col-lg-
8
=
form_tag
(
namespace_project_path
(
@project
.
namespace
,
@project
),
method: :delete
)
do
%p
%strong
Removed projects cannot be restored!
...
...
app/views/projects/hooks/_index.html.haml
View file @
c1cc7005
.row.prepend-top-default
.col-lg-
3
.col-lg-
4
%h4
.prepend-top-0
=
page_title
%p
#{
link_to
'Webhooks'
,
help_page_path
(
'user/project/integrations/webhooks'
)
}
can be
used for binding events when something is happening within the project.
.col-lg-
9
.append-bottom-default
.col-lg-
8
.append-bottom-default
=
form_for
@hook
,
as: :hook
,
url:
polymorphic_path
([
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
:hooks
])
do
|
f
|
=
render
partial:
'shared/web_hooks/form'
,
locals:
{
form:
f
,
hook:
@hook
}
=
f
.
submit
'Add webhook'
,
class:
'btn btn-create'
...
...
app/views/projects/pipelines_settings/_badge.html.haml
View file @
c1cc7005
%div
{
class:
badge
.
title
.
gsub
(
' '
,
'-'
)
}
.col-lg-
3
.profile-settings-sidebar
.col-lg-
4
.profile-settings-sidebar
%h4
.prepend-top-0
=
badge
.
title
.
capitalize
.col-lg-
9
.col-lg-
8
.prepend-top-10
.panel.panel-default
.panel-heading
...
...
app/views/projects/pipelines_settings/_show.html.haml
View file @
c1cc7005
.row.prepend-top-default
.col-lg-
3
.profile-settings-sidebar
.col-lg-
4
.profile-settings-sidebar
%h4
.prepend-top-0
Pipelines
.col-lg-
9
.col-lg-
8
=
form_for
@project
,
url:
namespace_project_pipelines_settings_path
(
@project
.
namespace
.
becomes
(
Namespace
),
@project
)
do
|
f
|
%fieldset
.builds-feature
-
unless
@repository
.
gitlab_ci_yml
...
...
app/views/projects/project_members/_index.html.haml
View file @
c1cc7005
.row.prepend-top-default
.col-lg-
3
.settings-sidebar
.col-lg-
4
.settings-sidebar
%h4
.prepend-top-0
Project members
-
if
can?
(
current_user
,
:admin_project_member
,
@project
)
...
...
@@ -13,7 +13,7 @@
%i
Masters
or
%i
Owners
.col-lg-
9
.col-lg-
8
.light
-
if
can?
(
current_user
,
:admin_project_member
,
@project
)
%ul
.nav-links.project-member-tabs
{
role:
'tablist'
}
...
...
app/views/projects/services/_index.html.haml
View file @
c1cc7005
.row.prepend-top-default.append-bottom-default
.col-lg-
3
.col-lg-
4
%h4
.prepend-top-0
Project services
%p
Project services allow you to integrate GitLab with other applications
.col-lg-
9
.col-lg-
8
%table
.table
%colgroup
%col
...
...
app/views/projects/settings/ci_cd/show.html.haml
View file @
c1cc7005
-
@content_class
=
"limit-container-width"
unless
fluid_layout
-
page_title
"Pipelines"
=
render
"projects/settings/head"
...
...
app/views/projects/settings/integrations/show.html.haml
View file @
c1cc7005
-
@content_class
=
"limit-container-width"
unless
fluid_layout
-
page_title
'Integrations'
=
render
"projects/settings/head"
=
render
'projects/hooks/index'
...
...
app/views/projects/settings/members/show.html.haml
View file @
c1cc7005
-
@content_class
=
"limit-container-width"
unless
fluid_layout
-
page_title
"Members"
=
render
"projects/settings/head"
...
...
app/views/projects/triggers/_index.html.haml
View file @
c1cc7005
.row.prepend-top-default.append-bottom-default.triggers-container
.col-lg-
3
.col-lg-
4
=
render
"projects/triggers/content"
.col-lg-
9
.col-lg-
8
.panel.panel-default
.panel-heading
%h4
.panel-title
...
...
app/views/projects/variables/_index.html.haml
View file @
c1cc7005
.row.prepend-top-default.append-bottom-default
.col-lg-
3
.col-lg-
4
=
render
"projects/variables/content"
.col-lg-
9
.col-lg-
8
%h5
.prepend-top-0
Add a variable
=
render
"projects/variables/form"
,
btn_text:
"Add new variable"
...
...
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