diff options
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/sections/merge_requests.scss | 2 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/_form.html.haml | 2 |
4 files changed, 5 insertions, 5 deletions
@@ -137,7 +137,7 @@ group :assets do gem "modernizr", "2.6.2" gem "raphael-rails", git: "https://github.com/gitlabhq/raphael-rails.git" gem 'bootstrap-sass' - gem "font-awesome-rails", "~> 3.1.1" + gem "font-awesome-rails" gem "gemoji", "~> 1.2.1", require: 'emoji/railtie' gem "gon" end diff --git a/Gemfile.lock b/Gemfile.lock index 5d13837b61f..6eedadc74c6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -143,7 +143,7 @@ GEM net-ssh (>= 2.1.3) nokogiri (~> 1.5.0) ruby-hmac - font-awesome-rails (3.1.1.3) + font-awesome-rails (3.2.1.2) railties (>= 3.2, < 5.0) foreman (0.63.0) dotenv (>= 0.7) @@ -560,7 +560,7 @@ DEPENDENCIES factory_girl_rails ffaker fog (~> 1.3.1) - font-awesome-rails (~> 3.1.1) + font-awesome-rails foreman gemoji (~> 1.2.1) github-linguist diff --git a/app/assets/stylesheets/sections/merge_requests.scss b/app/assets/stylesheets/sections/merge_requests.scss index 24efdf5f78d..083c330b1cd 100644 --- a/app/assets/stylesheets/sections/merge_requests.scss +++ b/app/assets/stylesheets/sections/merge_requests.scss @@ -115,6 +115,6 @@ margin-top: 45px; } -.merge-request-info { +.merge-request-form-info { padding: 15px 0; } diff --git a/app/views/projects/merge_requests/_form.html.haml b/app/views/projects/merge_requests/_form.html.haml index 9327f4689ae..86c442142bf 100644 --- a/app/views/projects/merge_requests/_form.html.haml +++ b/app/views/projects/merge_requests/_form.html.haml @@ -30,7 +30,7 @@ %h3.page-title %i.icon-paper-clip Details - .merge-request-info + .merge-request-form-info .clearfix = f.label :title do %strong= "Title *" |