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
5bc5188a
Commit
5bc5188a
authored
May 05, 2015
by
Sullivan SENECHAL
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix missing button types
parent
b1c331a4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
4 deletions
+6
-4
_issue_context.html.haml
app/views/projects/issues/_issue_context.html.haml
+1
-1
_context.html.haml
app/views/projects/merge_requests/show/_context.html.haml
+1
-1
_mr_accept.html.haml
app/views/projects/merge_requests/show/_mr_accept.html.haml
+2
-2
_clone_panel.html.haml
app/views/shared/_clone_panel.html.haml
+2
-0
No files found.
app/views/projects/issues/_issue_context.html.haml
View file @
5bc5188a
...
...
@@ -32,7 +32,7 @@
.issuable-context-title
%label
Subscription:
%button
.btn.btn-block.subscribe-button
%button
.btn.btn-block.subscribe-button
{
:type
=>
'button'
}
%i
.fa.fa-eye
%span
=
@issue
.
subscribed?
(
current_user
)
?
"Unsubscribe"
:
"Subscribe"
-
subscribtion_status
=
@issue
.
subscribed?
(
current_user
)
?
"subscribed"
:
"unsubscribed"
...
...
app/views/projects/merge_requests/show/_context.html.haml
View file @
5bc5188a
...
...
@@ -34,7 +34,7 @@
.issuable-context-title
%label
Subscription:
%button
.btn.btn-block.subscribe-button
%button
.btn.btn-block.subscribe-button
{
:type
=>
'button'
}
%i
.fa.fa-eye
%span
=
@merge_request
.
subscribed?
(
current_user
)
?
"Unsubscribe"
:
"Subscribe"
-
subscribtion_status
=
@merge_request
.
subscribed?
(
current_user
)
?
"subscribed"
:
"unsubscribed"
...
...
app/views/projects/merge_requests/show/_mr_accept.html.haml
View file @
5bc5188a
...
...
@@ -53,7 +53,7 @@
command line
%p
%button
.btn.disabled
%button
.btn.disabled
{
:type
=>
'button'
}
%i
.fa.fa-warning
Accept Merge Request
...
...
@@ -64,7 +64,7 @@
This request can't be merged because it is marked a
<strong>
Work In Progress
</strong>
.
%p
%button
.btn.disabled
%button
.btn.disabled
{
:type
=>
'button'
}
%i
.fa.fa-warning
Accept Merge Request
...
...
app/views/shared/_clone_panel.html.haml
View file @
5bc5188a
...
...
@@ -2,6 +2,7 @@
.git-clone-holder.input-group
.input-group-btn
%button
{
|
:type
=>
'button'
,
|
class:
"btn #{ 'active' if default_clone_protocol == 'ssh' }#{ ' has_tooltip' if current_user && current_user.require_ssh_key? }"
,
|
:"data-clone"
=>
project
.
ssh_url_to_repo
,
|
:"data-title"
=>
"Add an SSH key to your profile<br> to pull or push via SSH"
,
...
...
@@ -9,6 +10,7 @@
:"data-container"
=>
"body"
}
SSH
%button
{
|
:type
=>
'button'
,
|
class:
"btn #{ 'active' if default_clone_protocol == 'http' }#{ ' has_tooltip' if current_user && current_user.require_password? }"
,
|
:"data-clone"
=>
project
.
http_url_to_repo
,
|
:"data-title"
=>
"Set a password on your account<br> to pull or push via #{gitlab_config.protocol.upcase}"
,
...
...
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