Download as
Browse Code »

Commit fd033671933fcc0f472480d98c907aefde357416

Authored by Dmitriy Zaporozhets
1 parent b98f414a
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Update font-awesome. Use proper class for merge request form

Showing 4 changed files with 5 additions and 5 deletions   Show diff stats
@@ -137,7 +137,7 @@ group :assets do @@ -137,7 +137,7 @@ group :assets do
137 gem "modernizr", "2.6.2" 137 gem "modernizr", "2.6.2"
138 gem "raphael-rails", git: "https://github.com/gitlabhq/raphael-rails.git" 138 gem "raphael-rails", git: "https://github.com/gitlabhq/raphael-rails.git"
139 gem 'bootstrap-sass' 139 gem 'bootstrap-sass'
140 - gem "font-awesome-rails", "~> 3.1.1" 140 + gem "font-awesome-rails"
141 gem "gemoji", "~> 1.2.1", require: 'emoji/railtie' 141 gem "gemoji", "~> 1.2.1", require: 'emoji/railtie'
142 gem "gon" 142 gem "gon"
143 end 143 end
@@ -143,7 +143,7 @@ GEM @@ -143,7 +143,7 @@ GEM
143 net-ssh (>= 2.1.3) 143 net-ssh (>= 2.1.3)
144 nokogiri (~> 1.5.0) 144 nokogiri (~> 1.5.0)
145 ruby-hmac 145 ruby-hmac
146 - font-awesome-rails (3.1.1.3) 146 + font-awesome-rails (3.2.1.2)
147 railties (>= 3.2, < 5.0) 147 railties (>= 3.2, < 5.0)
148 foreman (0.63.0) 148 foreman (0.63.0)
149 dotenv (>= 0.7) 149 dotenv (>= 0.7)
@@ -560,7 +560,7 @@ DEPENDENCIES @@ -560,7 +560,7 @@ DEPENDENCIES
560 factory_girl_rails 560 factory_girl_rails
561 ffaker 561 ffaker
562 fog (~> 1.3.1) 562 fog (~> 1.3.1)
563 - font-awesome-rails (~> 3.1.1) 563 + font-awesome-rails
564 foreman 564 foreman
565 gemoji (~> 1.2.1) 565 gemoji (~> 1.2.1)
566 github-linguist 566 github-linguist
app/assets/stylesheets/sections/merge_requests.scss
  Diff comments   View file @fd03367
@@ -115,6 +115,6 @@ @@ -115,6 +115,6 @@
115 margin-top: 45px; 115 margin-top: 45px;
116 } 116 }
117 117
118 -.merge-request-info { 118 +.merge-request-form-info {
119 padding: 15px 0; 119 padding: 15px 0;
120 } 120 }
app/views/projects/merge_requests/_form.html.haml
  Diff comments   View file @fd03367
@@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
30 %h3.page-title 30 %h3.page-title
31 %i.icon-paper-clip 31 %i.icon-paper-clip
32 Details 32 Details
33 - .merge-request-info 33 + .merge-request-form-info
34 .clearfix 34 .clearfix
35 = f.label :title do 35 = f.label :title do
36 %strong= "Title *" 36 %strong= "Title *"