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
0
Merge Requests
0
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
Tatuya Kamada
gitlab-ce
Commits
3bfedbd2
Commit
3bfedbd2
authored
Dec 10, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'rs-snippets-clipboard'
parents
bdc62d70
cbac31d9
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
6 deletions
+14
-6
CHANGELOG
CHANGELOG
+1
-0
app/assets/stylesheets/pages/snippets.scss
app/assets/stylesheets/pages/snippets.scss
+6
-0
app/views/projects/snippets/show.html.haml
app/views/projects/snippets/show.html.haml
+2
-2
app/views/shared/_file_highlight.html.haml
app/views/shared/_file_highlight.html.haml
+3
-2
app/views/snippets/show.html.haml
app/views/snippets/show.html.haml
+2
-2
No files found.
CHANGELOG
View file @
3bfedbd2
...
@@ -27,6 +27,7 @@ v 8.3.0 (unreleased)
...
@@ -27,6 +27,7 @@ v 8.3.0 (unreleased)
- Improve wording on project visibility levels (Zeger-Jan van de Weg)
- Improve wording on project visibility levels (Zeger-Jan van de Weg)
- Automatically select default clone protocol based on user preferences (Eirik Lygre)
- Automatically select default clone protocol based on user preferences (Eirik Lygre)
- Make Network page as sub tab of Commits
- Make Network page as sub tab of Commits
- Add copy-to-clipboard button for Snippets
v 8.2.3
v 8.2.3
- Fix application settings cache not expiring after changes (Stan Hu)
- Fix application settings cache not expiring after changes (Stan Hu)
...
...
app/assets/stylesheets/pages/snippets.scss
View file @
3bfedbd2
...
@@ -32,6 +32,12 @@
...
@@ -32,6 +32,12 @@
.file-holder
{
.file-holder
{
border-top
:
0
;
border-top
:
0
;
}
}
.file-actions
{
.btn-clipboard
{
@extend
.btn
;
}
}
}
}
.snippet-box
{
.snippet-box
{
...
...
app/views/projects/snippets/show.html.haml
View file @
3bfedbd2
...
@@ -10,8 +10,8 @@
...
@@ -10,8 +10,8 @@
%strong
%strong
=
@snippet
.
file_name
=
@snippet
.
file_name
.file-actions.hidden-xs
.file-actions.hidden-xs
.btn-group.tree-btn-group
=
clipboard_button
(
clipboard_target:
".blob-content[data-blob-id='
#{
@snippet
.
id
}
']"
)
=
link_to
'Raw'
,
raw_namespace_project_snippet_path
(
@project
.
namespace
,
@project
,
@snippet
),
class:
"btn btn-sm"
,
target:
"_blank"
=
link_to
'Raw'
,
raw_namespace_project_snippet_path
(
@project
.
namespace
,
@project
,
@snippet
),
class:
"btn btn-sm"
,
target:
"_blank"
=
render
'shared/snippets/blob'
=
render
'shared/snippets/blob'
...
...
app/views/shared/_file_highlight.html.haml
View file @
3bfedbd2
...
@@ -8,5 +8,6 @@
...
@@ -8,5 +8,6 @@
%a
{
href:
"#L#{i}"
,
id:
"L#{i}"
,
'data-line-number'
=>
i
}
%a
{
href:
"#L#{i}"
,
id:
"L#{i}"
,
'data-line-number'
=>
i
}
%i
.fa.fa-link
%i
.fa.fa-link
=
i
=
i
:preserve
.blob-content
{
data:
{
blob_id:
blob
.
id
}}
#{
highlight
(
blob
.
name
,
blob
.
data
)
}
:preserve
#{
highlight
(
blob
.
name
,
blob
.
data
)
}
app/views/snippets/show.html.haml
View file @
3bfedbd2
...
@@ -9,6 +9,6 @@
...
@@ -9,6 +9,6 @@
%strong
%strong
=
@snippet
.
file_name
=
@snippet
.
file_name
.file-actions.hidden-xs
.file-actions.hidden-xs
.btn-group.tree-btn-group
=
clipboard_button
(
clipboard_target:
".blob-content[data-blob-id='
#{
@snippet
.
id
}
']"
)
=
link_to
'Raw'
,
raw_snippet_path
(
@snippet
),
class:
"btn btn-sm"
,
target:
"_blank"
=
link_to
'Raw'
,
raw_snippet_path
(
@snippet
),
class:
"btn btn-sm"
,
target:
"_blank"
=
render
'shared/snippets/blob'
=
render
'shared/snippets/blob'
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