Download as
Browse Code »

Commit 92137b7bebb2b6f9c5225776e3f30d0e5dfab9e6

Authored by randx
1 parent d246a68a
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

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

Showing 7 changed files with 15 additions and 8 deletions   Show diff stats
app/assets/stylesheets/sections/merge_requests.scss
  Diff comments   View file @92137b7
@@ -38,6 +38,7 @@ @@ -38,6 +38,7 @@
38 background: #CEB; 38 background: #CEB;
39 39
40 .accept_merge_request { 40 .accept_merge_request {
  41 + font-size:13px;
41 float:left; 42 float:left;
42 } 43 }
43 .remove_branch_holder { 44 .remove_branch_holder {
app/controllers/issues_controller.rb
  Diff comments   View file @92137b7
@@ -60,7 +60,13 @@ class IssuesController < ApplicationController @@ -60,7 +60,13 @@ class IssuesController < ApplicationController
60 @issue.save 60 @issue.save
61 61
62 respond_to do |format| 62 respond_to do |format|
63 - format.html { redirect_to project_issue_path(@project, @issue) } 63 + format.html do
  64 + if @issue.valid?
  65 + redirect_to project_issue_path(@project, @issue)
  66 + else
  67 + render :new
  68 + end
  69 + end
64 format.js 70 format.js
65 end 71 end
66 end 72 end
app/views/admin/users/_form.html.haml
  Diff comments   View file @92137b7
@@ -73,8 +73,8 @@ @@ -73,8 +73,8 @@
73 .span6 73 .span6
74 .span6 74 .span6
75 .actions 75 .actions
76 - = f.submit 'Save', class: "btn primary" 76 + = f.submit 'Save', class: "btn save-btn"
77 - if @admin_user.new_record? 77 - if @admin_user.new_record?
78 - = link_to 'Cancel', admin_users_path, class: "btn" 78 + = link_to 'Cancel', admin_users_path, class: "btn cancel-btn"
79 - else 79 - else
80 - = link_to 'Cancel', admin_user_path(@admin_user), class: "btn" 80 + = link_to 'Cancel', admin_user_path(@admin_user), class: "btn cancel-btn"
app/views/issues/index.html.haml
  Diff comments   View file @92137b7
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 .right 6 .right
7 .span5 7 .span5
8 - if can? current_user, :write_issue, @project 8 - if can? current_user, :write_issue, @project
9 - = link_to new_project_issue_path(@project), class: "right btn small", title: "New Issue", remote: true do 9 + = link_to new_project_issue_path(@project), class: "right btn", title: "New Issue", remote: true do
10 %i.icon-plus 10 %i.icon-plus
11 New Issue 11 New Issue
12 = form_tag search_project_issues_path(@project), method: :get, remote: true, id: "issue_search_form", class: :right do 12 = form_tag search_project_issues_path(@project), method: :get, remote: true, id: "issue_search_form", class: :right do
app/views/keys/index.html.haml
  Diff comments   View file @92137b7
1 %h3.page_title 1 %h3.page_title
2 SSH Keys 2 SSH Keys
3 - = link_to "Add new", new_key_path, class: "btn small right" 3 + = link_to "Add new", new_key_path, class: "btn right"
4 4
5 %hr 5 %hr
6 %p.slead 6 %p.slead
app/views/merge_requests/index.html.haml
  Diff comments   View file @92137b7
1 %h3.page_title 1 %h3.page_title
2 Merge Requests 2 Merge Requests
3 - if can? current_user, :write_issue, @project 3 - if can? current_user, :write_issue, @project
4 - = link_to new_project_merge_request_path(@project), class: "right btn small", title: "New Merge Request" do 4 + = link_to new_project_merge_request_path(@project), class: "right btn", title: "New Merge Request" do
5 New Merge Request 5 New Merge Request
6 6
7 %br 7 %br
app/views/refs/_tree_item.html.haml
  Diff comments   View file @92137b7
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 %tr{ class: "tree-item #{tree_hex_class(content)}", url: tree_file_project_ref_path(@project, @ref, file) } 2 %tr{ class: "tree-item #{tree_hex_class(content)}", url: tree_file_project_ref_path(@project, @ref, file) }
3 %td.tree-item-file-name 3 %td.tree-item-file-name
4 = tree_icon(content) 4 = tree_icon(content)
5 - = link_to truncate(content.name, length: 40), tree_file_project_ref_path(@project, @ref || @commit.id, file), remote: :true 5 + %strong= link_to truncate(content.name, length: 40), tree_file_project_ref_path(@project, @ref || @commit.id, file), remote: :true
6 %td.tree_time_ago.cgray 6 %td.tree_time_ago.cgray
7 - if index == 1 7 - if index == 1
8 %span.log_loading 8 %span.log_loading