BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
22285b1d
Commit
22285b1d
authored
Aug 09, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into check-out-branch-button
parents
5ac504e3
b833f208
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
48 additions
and
18 deletions
+48
-18
CHANGELOG
CHANGELOG
+1
-0
msapplication-tile.png
app/assets/images/msapplication-tile.png
+0
-0
merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+5
-2
tree.scss
app/assets/stylesheets/pages/tree.scss
+5
-1
new.html.haml
app/views/abuse_reports/new.html.haml
+1
-1
_event.html.haml
app/views/events/_event.html.haml
+3
-5
_created_project.html.haml
app/views/events/event/_created_project.html.haml
+2
-2
_push.html.haml
app/views/events/event/_push.html.haml
+3
-2
_head.html.haml
app/views/layouts/_head.html.haml
+3
-1
_user_styles.html.haml
app/views/layouts/_user_styles.html.haml
+24
-0
_tree_commit_column.html.haml
app/views/projects/tree/_tree_commit_column.html.haml
+1
-4
No files found.
CHANGELOG
View file @
22285b1d
...
...
@@ -44,6 +44,7 @@ v 7.14.0 (unreleased)
- Remove satellites
- Remove comments and email addresses when publicly exposing ssh keys (Zeger-Jan van de Weg)
- Add "Check out branch" button to the MR page.
- Cache all events
v 7.13.3
- Fix bug causing Bitbucket importer to crash when OAuth application had been removed.
...
...
app/assets/images/msapplication-tile.png
View replaced file @
5ac504e3
View file @
22285b1d
5.96 KB
|
W:
|
H:
5.66 KB
|
W:
|
H:
2-up
Swipe
Onion skin
app/assets/stylesheets/pages/merge_requests.scss
View file @
22285b1d
...
...
@@ -91,8 +91,6 @@
@media
(
min-width
:
$screen-sm-max
)
{
.merge-request
.merge-request-tabs
{
margin
:
20px
0
;
li
{
a
{
padding
:
15px
40px
;
...
...
@@ -102,6 +100,11 @@
}
}
.merge-request
.merge-request-tabs
{
margin-top
:
30px
;
margin-bottom
:
20px
;
}
.mr_source_commit
,
.mr_target_commit
{
.commit
{
...
...
app/assets/stylesheets/pages/tree.scss
View file @
22285b1d
...
...
@@ -60,7 +60,11 @@
}
.tree_author
{
padding-left
:
8px
;
padding-right
:
8px
;
.commit-author-name
{
color
:
gray
;
}
}
.tree_commit
{
...
...
app/views/abuse_reports/new.html.haml
View file @
22285b1d
-
page_title
"Report abuse"
%h3
.page-title
Report abuse
%p
Please use this form to report users who create spam issues
or comments or who otherwise
behave inappropriately.
%p
Please use this form to report users who create spam issues
, comments or
behave inappropriately.
%hr
=
form_for
@abuse_report
,
html:
{
class:
'form-horizontal'
}
do
|
f
|
=
f
.
hidden_field
:user_id
...
...
app/views/events/_event.html.haml
View file @
22285b1d
...
...
@@ -3,13 +3,11 @@
.event-item-timestamp
#{
time_ago_with_tooltip
(
event
.
created_at
)
}
-
if
event
.
created_project?
=
cache
[
event
,
current_user
]
do
=
cache
event
,
"v1"
do
=
image_tag
avatar_icon
(
event
.
author_email
,
24
),
class:
"avatar s24"
,
alt
:''
-
if
event
.
created_project?
=
render
"events/event/created_project"
,
event:
event
-
else
=
image_tag
avatar_icon
(
event
.
author_email
,
24
),
class:
"avatar s24"
,
alt
:''
-
if
event
.
push?
-
elsif
event
.
push?
=
render
"events/event/push"
,
event:
event
-
elsif
event
.
commented?
=
render
"events/event/note"
,
event:
event
...
...
app/views/events/event/_created_project.html.haml
View file @
22285b1d
...
...
@@ -8,8 +8,8 @@
-
else
=
event
.
project_name
-
if
current_user
==
event
.
author
&&
!
event
.
project
.
private?
&&
twitter_sharing_enabled?
.event-body
-
if
!
event
.
project
.
private?
&&
twitter_sharing_enabled?
.event-body
{
"data-user-is"
=>
event
.
author_id
}
.event-note
.md
%p
...
...
app/views/events/event/_push.html.haml
View file @
22285b1d
...
...
@@ -17,7 +17,7 @@
-
few_commits
.
each
do
|
commit
|
=
render
"events/commit"
,
commit:
commit
,
project:
project
-
create_mr
=
current_user
==
event
.
author
&&
event
.
new_ref?
&&
create_mr_button?
(
event
.
project
.
default_branch
,
event
.
ref_name
,
event
.
project
)
-
create_mr
=
event
.
new_ref?
&&
create_mr_button?
(
event
.
project
.
default_branch
,
event
.
ref_name
,
event
.
project
)
-
if
event
.
commits_count
>
1
%li
.commits-stat
-
if
event
.
commits_count
>
2
...
...
@@ -34,10 +34,11 @@
Compare
#{
from_label
}
...
#{
truncate_sha
(
event
.
commit_to
)
}
-
if
create_mr
%span
{
"data-user-is"
=>
event
.
author_id
,
"data-display"
=>
"inline"
}
or
=
link_to
create_mr_path
(
event
.
project
.
default_branch
,
event
.
ref_name
,
event
.
project
)
do
create a merge request
-
elsif
create_mr
%li
.commits-stat
%li
.commits-stat
{
"data-user-is"
=>
event
.
author_id
}
=
link_to
create_mr_path
(
event
.
project
.
default_branch
,
event
.
ref_name
,
event
.
project
)
do
Create Merge Request
app/views/layouts/_head.html.haml
View file @
22285b1d
...
...
@@ -27,7 +27,7 @@
=
favicon_link_tag
'touch-icon-ipad-retina.png'
,
rel:
'apple-touch-icon'
,
sizes:
'152x152'
-# Windows 8 pinned site tile
%meta
{
name:
'msapplication-TileImage'
,
content:
image_
url
(
'msapplication-tile.png'
)}
%meta
{
name:
'msapplication-TileImage'
,
content:
image_
path
(
'msapplication-tile.png'
)}
%meta
{
name:
'msapplication-TileColor'
,
content:
'#30353E'
}
=
yield
:meta_tags
...
...
@@ -35,3 +35,5 @@
=
render
'layouts/google_analytics'
if
extra_config
.
has_key?
(
'google_analytics_id'
)
=
render
'layouts/piwik'
if
extra_config
.
has_key?
(
'piwik_url'
)
&&
extra_config
.
has_key?
(
'piwik_site_id'
)
=
render
'layouts/bootlint'
if
Rails
.
env
.
development?
=
render
'layouts/user_styles'
app/views/layouts/_user_styles.html.haml
0 → 100644
View file @
22285b1d
:css
[
data-user-is
]
{
display
:
none
!important
;
}
[
data-user-is
=
"
#{
current_user
.
try
(
:id
)
}
"
]
{
display
:
block
!important
;
}
[
data-user-is
=
"
#{
current_user
.
try
(
:id
)
}
"][data-display="
inline
"
]
{
display
:
inline
!important
;
}
[
data-user-is-not
]
{
display
:
block
!important
;
}
[
data-user-is-not
][
data-display
=
"inline"
]
{
display
:
inline
!important
;
}
[
data-user-is-not
=
"
#{
current_user
.
try
(
:id
)
}
"
]
{
display
:
none
!important
;
}
app/views/projects/tree/_tree_commit_column.html.haml
View file @
22285b1d
%span
.str-truncated
%span
.tree_author
=
commit_author_link
(
commit
,
avatar:
true
,
size:
16
)
=
link_to_gfm
commit
.
title
,
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
commit
.
id
),
class:
"tree-commit-link"
%span
.tree_author
[
commit_author_link(commit, avatar: false)
]
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