kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Removed class 'small' for some buttons. Fixed issue creation

Browse source
This commit is contained in:
randx 2012-08-30 20:00:16 +03:00
parent d246a68a24
commit 92137b7beb
7 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/assets/stylesheets/sections/merge_requests.scss
View file

@ -38,6 +38,7 @@
background: #CEB;
.accept_merge_request {
font-size:13px;
float:left;
}
.remove_branch_holder {

8
app/controllers/issues_controller.rb
View file

@ -60,7 +60,13 @@ class IssuesController < ApplicationController
@issue.save
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
end
end

6
app/views/admin/users/_form.html.haml
View file

@ -73,8 +73,8 @@
.span6
.span6
.actions
= f.submit 'Save', class: "btn primary"
= f.submit 'Save', class: "btn save-btn"
- if @admin_user.new_record?
= link_to 'Cancel', admin_users_path, class: "btn"
= link_to 'Cancel', admin_users_path, class: "btn cancel-btn"
- else
= link_to 'Cancel', admin_user_path(@admin_user), class: "btn"
= link_to 'Cancel', admin_user_path(@admin_user), class: "btn cancel-btn"

2
app/views/issues/index.html.haml
View file

@ -6,7 +6,7 @@
.right
.span5
- 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
New Issue
= form_tag search_project_issues_path(@project), method: :get, remote: true, id: "issue_search_form", class: :right do

2
app/views/keys/index.html.haml
View file

@ -1,6 +1,6 @@
%h3.page_title
SSH Keys
= link_to "Add new", new_key_path, class: "btn small right"
= link_to "Add new", new_key_path, class: "btn right"
%hr
%p.slead

2
app/views/merge_requests/index.html.haml
View file

@ -1,7 +1,7 @@
%h3.page_title
Merge Requests
- 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
%br

2
app/views/refs/_tree_item.html.haml
View file

@ -2,7 +2,7 @@
%tr{ class: "tree-item #{tree_hex_class(content)}", url: tree_file_project_ref_path(@project, @ref, file) }
%td.tree-item-file-name
= 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
- if index == 1
%span.log_loading