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
92137b7b
Commit
92137b7b
authored
Aug 30, 2012
by
randx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed class 'small' for some buttons. Fixed issue creation
parent
d246a68a
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
15 additions
and
8 deletions
+15
-8
app/assets/stylesheets/sections/merge_requests.scss
app/assets/stylesheets/sections/merge_requests.scss
+1
-0
app/controllers/issues_controller.rb
app/controllers/issues_controller.rb
+7
-1
app/views/admin/users/_form.html.haml
app/views/admin/users/_form.html.haml
+3
-3
app/views/issues/index.html.haml
app/views/issues/index.html.haml
+1
-1
app/views/keys/index.html.haml
app/views/keys/index.html.haml
+1
-1
app/views/merge_requests/index.html.haml
app/views/merge_requests/index.html.haml
+1
-1
app/views/refs/_tree_item.html.haml
app/views/refs/_tree_item.html.haml
+1
-1
No files found.
app/assets/stylesheets/sections/merge_requests.scss
View file @
92137b7b
...
@@ -38,6 +38,7 @@
...
@@ -38,6 +38,7 @@
background
:
#CEB
;
background
:
#CEB
;
.accept_merge_request
{
.accept_merge_request
{
font-size
:
13px
;
float
:left
;
float
:left
;
}
}
.remove_branch_holder
{
.remove_branch_holder
{
...
...
app/controllers/issues_controller.rb
View file @
92137b7b
...
@@ -60,7 +60,13 @@ class IssuesController < ApplicationController
...
@@ -60,7 +60,13 @@ class IssuesController < ApplicationController
@issue
.
save
@issue
.
save
respond_to
do
|
format
|
respond_to
do
|
format
|
format
.
html
{
redirect_to
project_issue_path
(
@project
,
@issue
)
}
format
.
html
do
if
@issue
.
valid?
redirect_to
project_issue_path
(
@project
,
@issue
)
else
render
:new
end
end
format
.
js
format
.
js
end
end
end
end
...
...
app/views/admin/users/_form.html.haml
View file @
92137b7b
...
@@ -73,8 +73,8 @@
...
@@ -73,8 +73,8 @@
.span6
.span6
.span6
.span6
.actions
.actions
=
f
.
submit
'Save'
,
class:
"btn
primary
"
=
f
.
submit
'Save'
,
class:
"btn
save-btn
"
-
if
@admin_user
.
new_record?
-
if
@admin_user
.
new_record?
=
link_to
'Cancel'
,
admin_users_path
,
class:
"btn"
=
link_to
'Cancel'
,
admin_users_path
,
class:
"btn
cancel-btn
"
-
else
-
else
=
link_to
'Cancel'
,
admin_user_path
(
@admin_user
),
class:
"btn"
=
link_to
'Cancel'
,
admin_user_path
(
@admin_user
),
class:
"btn
cancel-btn
"
app/views/issues/index.html.haml
View file @
92137b7b
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
.right
.right
.span5
.span5
-
if
can?
current_user
,
:write_issue
,
@project
-
if
can?
current_user
,
:write_issue
,
@project
=
link_to
new_project_issue_path
(
@project
),
class:
"right btn
small
"
,
title:
"New Issue"
,
remote:
true
do
=
link_to
new_project_issue_path
(
@project
),
class:
"right btn"
,
title:
"New Issue"
,
remote:
true
do
%i
.icon-plus
%i
.icon-plus
New Issue
New Issue
=
form_tag
search_project_issues_path
(
@project
),
method: :get
,
remote:
true
,
id:
"issue_search_form"
,
class: :right
do
=
form_tag
search_project_issues_path
(
@project
),
method: :get
,
remote:
true
,
id:
"issue_search_form"
,
class: :right
do
...
...
app/views/keys/index.html.haml
View file @
92137b7b
%h3
.page_title
%h3
.page_title
SSH Keys
SSH Keys
=
link_to
"Add new"
,
new_key_path
,
class:
"btn
small
right"
=
link_to
"Add new"
,
new_key_path
,
class:
"btn right"
%hr
%hr
%p
.slead
%p
.slead
...
...
app/views/merge_requests/index.html.haml
View file @
92137b7b
%h3
.page_title
%h3
.page_title
Merge Requests
Merge Requests
-
if
can?
current_user
,
:write_issue
,
@project
-
if
can?
current_user
,
:write_issue
,
@project
=
link_to
new_project_merge_request_path
(
@project
),
class:
"right btn
small
"
,
title:
"New Merge Request"
do
=
link_to
new_project_merge_request_path
(
@project
),
class:
"right btn"
,
title:
"New Merge Request"
do
New Merge Request
New Merge Request
%br
%br
...
...
app/views/refs/_tree_item.html.haml
View file @
92137b7b
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
%tr
{
class:
"tree-item #{tree_hex_class(content)}"
,
url:
tree_file_project_ref_path
(
@project
,
@ref
,
file
)
}
%tr
{
class:
"tree-item #{tree_hex_class(content)}"
,
url:
tree_file_project_ref_path
(
@project
,
@ref
,
file
)
}
%td
.tree-item-file-name
%td
.tree-item-file-name
=
tree_icon
(
content
)
=
tree_icon
(
content
)
=
link_to
truncate
(
content
.
name
,
length:
40
),
tree_file_project_ref_path
(
@project
,
@ref
||
@commit
.
id
,
file
),
remote: :true
%strong
=
link_to
truncate
(
content
.
name
,
length:
40
),
tree_file_project_ref_path
(
@project
,
@ref
||
@commit
.
id
,
file
),
remote: :true
%td
.tree_time_ago.cgray
%td
.tree_time_ago.cgray
-
if
index
==
1
-
if
index
==
1
%span
.log_loading
%span
.log_loading
...
...
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