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
44dc9aa6
Commit
44dc9aa6
authored
Jan 07, 2016
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix typo in js method and some repeating css
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
4443a5f3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
7 deletions
+16
-7
app/assets/javascripts/commits.js.coffee
app/assets/javascripts/commits.js.coffee
+3
-3
app/assets/stylesheets/framework/blocks.scss
app/assets/stylesheets/framework/blocks.scss
+9
-0
app/views/projects/commits/show.html.haml
app/views/projects/commits/show.html.haml
+4
-4
No files found.
app/assets/javascripts/commits.js.coffee
View file @
44dc9aa6
...
@@ -24,19 +24,19 @@ class @CommitsList
...
@@ -24,19 +24,19 @@ class @CommitsList
form
=
$
(
".commits-search-form"
)
form
=
$
(
".commits-search-form"
)
search
=
@
searchField
.
val
()
search
=
@
searchField
.
val
()
commitsUrl
=
form
.
attr
(
"action"
)
+
'?'
+
form
.
serialize
()
commitsUrl
=
form
.
attr
(
"action"
)
+
'?'
+
form
.
serialize
()
@
setOpacit
i
y
(
0.5
)
@
setOpacity
(
0.5
)
$
.
ajax
$
.
ajax
type
:
"GET"
type
:
"GET"
url
:
form
.
attr
(
"action"
)
url
:
form
.
attr
(
"action"
)
data
:
form
.
serialize
()
data
:
form
.
serialize
()
complete
:
=>
complete
:
=>
@
setOpacit
i
y
(
1.0
)
@
setOpacity
(
1.0
)
success
:
(
data
)
=>
success
:
(
data
)
=>
@
content
.
html
(
data
.
html
)
@
content
.
html
(
data
.
html
)
# Change url so if user reload a page - search results are saved
# Change url so if user reload a page - search results are saved
history
.
replaceState
{
page
:
commitsUrl
},
document
.
title
,
commitsUrl
history
.
replaceState
{
page
:
commitsUrl
},
document
.
title
,
commitsUrl
dataType
:
"json"
dataType
:
"json"
@
setOpacit
i
y
:
(
opacity
)
->
@
setOpacity
:
(
opacity
)
->
@
content
.
css
(
"opacity"
,
opacity
)
@
content
.
css
(
"opacity"
,
opacity
)
app/assets/stylesheets/framework/blocks.scss
View file @
44dc9aa6
...
@@ -72,6 +72,15 @@
...
@@ -72,6 +72,15 @@
>
p
:last-child
{
>
p
:last-child
{
margin-bottom
:
0
;
margin-bottom
:
0
;
}
}
.block-controls
{
float
:
right
;
.control
{
float
:
left
;
margin-left
:
10px
;
}
}
}
}
.cover-block
{
.cover-block
{
...
...
app/views/projects/commits/show.html.haml
View file @
44dc9aa6
...
@@ -10,19 +10,19 @@
...
@@ -10,19 +10,19 @@
.tree-ref-holder
.tree-ref-holder
=
render
'shared/ref_switcher'
,
destination:
'commits'
=
render
'shared/ref_switcher'
,
destination:
'commits'
.
pull-right
.hidden-xs.hidden-sm
.
block-controls
.hidden-xs.hidden-sm
-
if
create_mr_button?
(
@repository
.
root_ref
,
@ref
)
-
if
create_mr_button?
(
@repository
.
root_ref
,
@ref
)
.
pull-left.prepend-left-10
.
control
=
link_to
create_mr_path
(
@repository
.
root_ref
,
@ref
),
class:
'btn btn-success'
do
=
link_to
create_mr_path
(
@repository
.
root_ref
,
@ref
),
class:
'btn btn-success'
do
=
icon
(
'plus'
)
=
icon
(
'plus'
)
Create Merge Request
Create Merge Request
.
pull-left.prepend-left-10
.
control
=
form_tag
(
namespace_project_commits_path
(
@project
.
namespace
,
@project
,
@id
),
method: :get
,
class:
'pull-left commits-search-form'
)
do
=
form_tag
(
namespace_project_commits_path
(
@project
.
namespace
,
@project
,
@id
),
method: :get
,
class:
'pull-left commits-search-form'
)
do
=
search_field_tag
:search
,
params
[
:search
],
{
placeholder:
'Filter by commit message'
,
id:
'commits-search'
,
class:
'form-control search-text-input'
,
spellcheck:
false
}
=
search_field_tag
:search
,
params
[
:search
],
{
placeholder:
'Filter by commit message'
,
id:
'commits-search'
,
class:
'form-control search-text-input'
,
spellcheck:
false
}
-
if
current_user
&&
current_user
.
private_token
-
if
current_user
&&
current_user
.
private_token
.
pull-left.prepend-left-10
.
control
=
link_to
namespace_project_commits_path
(
@project
.
namespace
,
@project
,
@ref
,
{
format: :atom
,
private_token:
current_user
.
private_token
}),
title:
"Commits Feed"
,
class:
'btn'
do
=
link_to
namespace_project_commits_path
(
@project
.
namespace
,
@project
,
@ref
,
{
format: :atom
,
private_token:
current_user
.
private_token
}),
title:
"Commits Feed"
,
class:
'btn'
do
=
icon
(
"rss"
)
=
icon
(
"rss"
)
...
...
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