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
Jérome Perrin
gitlab-ce
Commits
26055b16
Commit
26055b16
authored
Jul 05, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Highlight empty lines
Closes #19484
parent
79b02e40
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
6 deletions
+12
-6
app/assets/stylesheets/framework/highlight.scss
app/assets/stylesheets/framework/highlight.scss
+8
-2
app/views/projects/blob/_editor.html.haml
app/views/projects/blob/_editor.html.haml
+1
-1
spec/features/projects/files/project_owner_creates_license_file_spec.rb
...projects/files/project_owner_creates_license_file_spec.rb
+2
-2
spec/features/projects/files/project_owner_sees_link_to_create_license_file_in_empty_project_spec.rb
...sees_link_to_create_license_file_in_empty_project_spec.rb
+1
-1
No files found.
app/assets/stylesheets/framework/highlight.scss
View file @
26055b16
...
...
@@ -6,11 +6,11 @@
table-layout
:
fixed
;
pre
{
padding
:
10px
;
padding
:
10px
0
;
border
:
none
;
border-radius
:
0
;
font-family
:
$monospace_font
;
font-size
:
$code_font_size
!
important
;
font-size
:
0
;
line-height
:
$code_line_height
!
important
;
margin
:
0
;
overflow
:
auto
;
...
...
@@ -21,12 +21,18 @@
code
{
font-family
:
$monospace_font
;
font-size
:
0
;
white-space
:
pre
;
word-wrap
:
normal
;
padding
:
0
;
.line
{
display
:
inline-block
;
width
:
100%
;
min-height
:
19px
;
padding-left
:
10px
;
padding-right
:
10px
;
font-size
:
$code_font_size
;
}
}
}
...
...
app/views/projects/blob/_editor.html.haml
View file @
26055b16
...
...
@@ -24,7 +24,7 @@
.encoding-selector
=
select_tag
:encoding
,
options_for_select
([
"base64"
,
"text"
],
"text"
),
class:
'select2'
.file-
content
.code
.file-
editor
.code
%pre
.js-edit-mode-pane
#editor
#{
params
[
:content
]
||
local_assigns
[
:blob_data
]
}
-
if
local_assigns
[
:path
]
.js-edit-mode-pane
#preview
.hide
...
...
spec/features/projects/files/project_owner_creates_license_file_spec.rb
View file @
26055b16
...
...
@@ -23,7 +23,7 @@ feature 'project owner creates a license file', feature: true, js: true do
select_template
(
'MIT License'
)
file_content
=
fi
nd
(
'.file-content
'
)
file_content
=
fi
rst
(
'.file-editor
'
)
expect
(
file_content
).
to
have_content
(
'The MIT License (MIT)'
)
expect
(
file_content
).
to
have_content
(
"Copyright (c)
#{
Time
.
now
.
year
}
#{
project
.
namespace
.
human_name
}
"
)
...
...
@@ -46,7 +46,7 @@ feature 'project owner creates a license file', feature: true, js: true do
select_template
(
'MIT License'
)
file_content
=
fi
nd
(
'.file-content
'
)
file_content
=
fi
rst
(
'.file-editor
'
)
expect
(
file_content
).
to
have_content
(
'The MIT License (MIT)'
)
expect
(
file_content
).
to
have_content
(
"Copyright (c)
#{
Time
.
now
.
year
}
#{
project
.
namespace
.
human_name
}
"
)
...
...
spec/features/projects/files/project_owner_sees_link_to_create_license_file_in_empty_project_spec.rb
View file @
26055b16
...
...
@@ -22,7 +22,7 @@ feature 'project owner sees a link to create a license file in empty project', f
select_template
(
'MIT License'
)
file_content
=
fi
nd
(
'.file-content
'
)
file_content
=
fi
rst
(
'.file-editor
'
)
expect
(
file_content
).
to
have_content
(
'The MIT License (MIT)'
)
expect
(
file_content
).
to
have_content
(
"Copyright (c)
#{
Time
.
now
.
year
}
#{
project
.
namespace
.
human_name
}
"
)
...
...
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