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
332fd782
Commit
332fd782
authored
Jul 03, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'adjust-readme-repo-width' into 'master'
Adjust readme repo width See merge request !12585
parents
8bb00c44
59f49bbf
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
6 deletions
+11
-6
app/assets/stylesheets/framework/files.scss
app/assets/stylesheets/framework/files.scss
+2
-0
app/assets/stylesheets/pages/projects.scss
app/assets/stylesheets/pages/projects.scss
+2
-1
app/views/projects/show.html.haml
app/views/projects/show.html.haml
+1
-1
app/views/shared/members/_access_request_buttons.html.haml
app/views/shared/members/_access_request_buttons.html.haml
+6
-4
No files found.
app/assets/stylesheets/framework/files.scss
View file @
332fd782
...
...
@@ -17,6 +17,8 @@
max-width
:
$limited-layout-width-sm
;
margin-left
:
auto
;
margin-right
:
auto
;
padding-top
:
64px
;
padding-bottom
:
64px
;
}
}
...
...
app/assets/stylesheets/pages/projects.scss
View file @
332fd782
...
...
@@ -483,11 +483,12 @@ a.deploy-project-label {
.project-stats
{
font-size
:
0
;
text-align
:
center
;
max-width
:
100%
;
border-bottom
:
1px
solid
$border-color
;
.nav
{
padding-top
:
12px
;
padding-bottom
:
12px
;
border-bottom
:
1px
solid
$border-color
;
}
.nav
>
li
{
...
...
app/views/projects/show.html.haml
View file @
332fd782
...
...
@@ -73,7 +73,7 @@
=
link_to
add_special_file_path
(
@project
,
file_name:
'.gitlab-ci.yml'
,
commit_message:
'Set up auto deploy'
,
branch_name:
'auto-deploy'
,
context:
'autodeploy'
)
do
#{
_
(
'Set up auto deploy'
)
}
%div
{
class:
container_class
}
%div
{
class:
[
container_class
,
(
"limit-container-width"
unless
fluid_layout
)]
}
-
if
@project
.
archived?
.text-warning.center.prepend-top-20
%p
...
...
app/views/shared/members/_access_request_buttons.html.haml
View file @
332fd782
-
model_name
=
source
.
model_name
.
to_s
.
downcase
.project-action-button.inline
-
if
can?
(
current_user
,
:"destroy_
#{
model_name
}
_member"
,
source
.
members
.
find_by
(
user_id:
current_user
.
id
))
-
if
can?
(
current_user
,
:"destroy_
#{
model_name
}
_member"
,
source
.
members
.
find_by
(
user_id:
current_user
.
id
))
.project-action-button.inline
-
link_text
=
source
.
is_a?
(
Group
)
?
_
(
'Leave group'
)
:
_
(
'Leave project'
)
=
link_to
link_text
,
polymorphic_path
([
:leave
,
source
,
:members
]),
method: :delete
,
data:
{
confirm:
leave_confirmation_message
(
source
)
},
class:
'btn'
-
elsif
requester
=
source
.
requesters
.
find_by
(
user_id:
current_user
.
id
)
-
elsif
requester
=
source
.
requesters
.
find_by
(
user_id:
current_user
.
id
)
.project-action-button.inline
=
link_to
_
(
'Withdraw Access Request'
),
polymorphic_path
([
:leave
,
source
,
:members
]),
method: :delete
,
data:
{
confirm:
remove_member_message
(
requester
)
},
class:
'btn'
-
elsif
source
.
request_access_enabled
&&
can?
(
current_user
,
:request_access
,
source
)
-
elsif
source
.
request_access_enabled
&&
can?
(
current_user
,
:request_access
,
source
)
.project-action-button.inline
=
link_to
_
(
'Request Access'
),
polymorphic_path
([
:request_access
,
source
,
:members
]),
method: :post
,
class:
'btn'
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