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
b0349915
Commit
b0349915
authored
Oct 02, 2014
by
Sytse Sijbrandij
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
parents
cd9a31c2
e2073f28
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
app/views/layouts/_head.html.haml
app/views/layouts/_head.html.haml
+1
-2
app/views/projects/blame/show.html.haml
app/views/projects/blame/show.html.haml
+1
-1
app/views/projects/new_tree/show.html.haml
app/views/projects/new_tree/show.html.haml
+2
-1
No files found.
app/views/layouts/_head.html.haml
View file @
b0349915
...
...
@@ -18,8 +18,7 @@
=
javascript_include_tag
"application"
=
csrf_meta_tags
=
include_gon
:erb
<meta
name=
"viewport"
content=
"width=device-width, initial-scale=1.0"
>
%meta
{
name:
'viewport'
,
content:
'width=device-width, initial-scale=1.0'
}
=
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'
)
...
...
app/views/projects/blame/show.html.haml
View file @
b0349915
...
...
@@ -30,5 +30,5 @@
%code
{
class:
highlightjs_class
(
@blob
.
name
)
}
:erb
<%
lines
.
each
do
|
line
|
%>
<%=
line
%>
<%=
line
%>
<%
end
%>
app/views/projects/new_tree/show.html.haml
View file @
b0349915
...
...
@@ -25,7 +25,8 @@
Commit message
.col-sm-10
=
render
'shared/commit_message_container'
,
{
textarea:
text_area_tag
(
'commit_message'
,
params
[
:commit_message
],
placeholder:
"Added new file"
,
required:
true
,
rows:
3
,
class:
'form-control'
)}
params
[
:commit_message
],
placeholder:
'Add new file'
,
required:
true
,
rows:
3
,
class:
'form-control'
)}
.file-holder
.file-title
...
...
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