diff options
author | George Tsiolis <tsiolis.g@gmail.com> | 2018-04-16 16:44:34 +0300 |
---|---|---|
committer | George Tsiolis <tsiolis.g@gmail.com> | 2018-04-18 00:05:50 +0300 |
commit | 5a34d3bd162e51169e13f02c58eaf32c92a8e9ea (patch) | |
tree | 32d483a584e7f19e53eab76e84dd04a97931287a | |
parent | 2cc78c0b03d9468e25bbf4805fe1d55e414840ff (diff) |
Fix size and position for fork icon
-rw-r--r-- | Gemfile.lock | 279 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/wells.scss | 1 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/commits.scss | 2 | ||||
-rw-r--r-- | app/helpers/commits_helper.rb | 2 | ||||
-rw-r--r-- | changelogs/unreleased/fix-size-and-position-for-fork-icon.yml | 5 |
5 files changed, 145 insertions, 144 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 7f243491c90..add9e11a4d2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,7 +3,7 @@ GEM specs: RedCloth (4.3.2) abstract_type (0.0.7) - ace-rails-ap (4.1.2) + ace-rails-ap (4.1.4) actionmailer (4.2.10) actionpack (= 4.2.10) actionview (= 4.2.10) @@ -51,7 +51,7 @@ GEM akismet (2.0.0) allocations (1.0.5) arel (6.0.4) - asana (0.6.0) + asana (0.6.3) faraday (~> 0.9) faraday_middleware (~> 0.9) faraday_middleware-multi_json (~> 0.0) @@ -68,10 +68,9 @@ GEM atomic (1.1.99) attr_encrypted (3.1.0) encryptor (~> 3.0.0) - attr_required (1.0.0) - autoprefixer-rails (6.2.3) + attr_required (1.0.1) + autoprefixer-rails (8.3.0) execjs - json awesome_print (1.2.0) axiom-types (0.1.1) descendants_tracker (~> 0.0.4) @@ -88,15 +87,15 @@ GEM erubis (>= 2.6.6) rack (>= 0.9.0) bindata (2.4.3) - binding_of_caller (0.7.2) + binding_of_caller (0.7.3) debug_inspector (>= 0.0.1) blankslate (2.1.2.4) - bootstrap-sass (3.3.6) + bootstrap-sass (3.3.7) autoprefixer-rails (>= 5.2.1) sass (>= 3.3.4) bootstrap_form (2.7.0) brakeman (4.2.1) - browser (2.2.0) + browser (2.5.3) builder (3.2.3) bullet (5.5.1) activesupport (>= 3.0.0) @@ -105,34 +104,33 @@ GEM bundler (~> 1.2) thor (~> 0.18) byebug (9.0.6) - capybara (2.15.1) + capybara (2.18.0) addressable mini_mime (>= 0.1.3) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) - xpath (~> 2.0) - capybara-screenshot (1.0.14) - capybara (>= 1.0, < 3) + xpath (>= 2.0, < 4.0) + capybara-screenshot (1.0.19) + capybara (>= 1.0, < 4) launchy - carrierwave (1.2.1) + carrierwave (1.2.2) activemodel (>= 4.0.0) activesupport (>= 4.0.0) mime-types (>= 1.16) - cause (0.1) charlock_holmes (0.7.6) - childprocess (0.7.0) + childprocess (0.9.0) ffi (~> 1.0, >= 1.0.11) chronic (0.10.2) chronic_duration (0.10.6) numerizer (~> 0.1.1) - chunky_png (1.3.5) + chunky_png (1.3.10) citrus (3.0.2) - coderay (1.1.1) + coderay (1.1.2) coercible (1.0.0) descendants_tracker (~> 0.0.1) - colorize (0.7.7) - commonmarker (0.17.8) + colorize (0.8.1) + commonmarker (0.17.9) ruby-enum (~> 0.5) concord (0.1.5) adamantium (~> 0.2.0) @@ -143,49 +141,49 @@ GEM connection_pool (2.2.1) crack (0.4.3) safe_yaml (~> 1.0.0) - crass (1.0.3) + crass (1.0.4) creole (0.5.0) - css_parser (1.5.0) + css_parser (1.6.0) addressable - d3_rails (3.5.11) + d3_rails (3.5.17) railties (>= 3.1.0) - daemons (1.2.3) + daemons (1.2.6) database_cleaner (1.5.3) - debug_inspector (0.0.2) + debug_inspector (0.0.3) debugger-ruby_core_source (1.3.8) deckar01-task_list (2.0.0) html-pipeline declarative (0.0.10) declarative-option (0.1.0) - default_value_for (3.0.2) - activerecord (>= 3.2.0, < 5.1) + default_value_for (3.0.5) + activerecord (>= 3.2.0, < 5.2) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - devise (4.2.0) + devise (4.4.3) bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (>= 4.1.0, < 5.1) + railties (>= 4.1.0, < 6.0) responders warden (~> 1.2.3) - devise-two-factor (3.0.0) - activesupport + devise-two-factor (3.0.3) + activesupport (< 5.3) attr_encrypted (>= 1.3, < 4, != 2) devise (~> 4.0) - railties + railties (< 5.3) rotp (~> 2.0) diff-lcs (1.3) diffy (3.1.0) docile (1.1.5) domain_name (0.5.20170404) unf (>= 0.0.5, < 1.0.0) - doorkeeper (4.3.1) + doorkeeper (4.3.2) railties (>= 4.2) doorkeeper-openid_connect (1.3.0) doorkeeper (~> 4.3) json-jwt (~> 1.6) - dropzonejs-rails (0.7.2) + dropzonejs-rails (0.7.4) rails (> 3.1) - email_reply_trimmer (0.1.6) + email_reply_trimmer (0.1.11) email_spec (1.6.0) launchy (~> 2.1) mail (~> 2.2) @@ -193,11 +191,11 @@ GEM equalizer (0.0.11) erubis (2.7.0) escape_utils (1.1.1) - et-orbi (1.0.3) + et-orbi (1.1.0) tzinfo - eventmachine (1.0.8) - excon (0.60.0) - execjs (2.6.0) + eventmachine (1.2.5) + excon (0.62.0) + execjs (2.7.0) expression_parser (0.9.0) factory_bot (4.8.2) activesupport (>= 3.0.0) @@ -213,8 +211,8 @@ GEM multi_json fast_blank (1.0.0) fast_gettext (1.6.0) - ffaker (2.4.0) - ffi (1.9.18) + ffaker (2.9.0) + ffi (1.9.23) flay (2.10.0) erubis (~> 2.7.0) path_expander (~> 1.0) @@ -230,7 +228,7 @@ GEM flowdock (0.7.1) httparty (~> 0.7) multi_json - fog-aliyun (0.2.0) + fog-aliyun (0.2.1) fog-core (~> 1.27) fog-json (~> 1.0) ipaddress (~> 0.8) @@ -252,13 +250,13 @@ GEM fog-json (1.0.2) fog-core (~> 1.0) multi_json (~> 1.10) - fog-local (0.3.1) - fog-core (~> 1.27) - fog-openstack (0.1.21) - fog-core (>= 1.40) + fog-local (0.5.0) + fog-core (>= 1.27, < 3.0) + fog-openstack (0.1.25) + fog-core (~> 1.40) fog-json (>= 1.0) ipaddress (>= 0.8) - fog-rackspace (0.1.1) + fog-rackspace (0.1.5) fog-core (>= 1.35) fog-json (>= 1.0) fog-xml (>= 0.1) @@ -266,8 +264,8 @@ GEM fog-xml (0.1.3) fog-core nokogiri (>= 1.5.11, < 2.0.0) - font-awesome-rails (4.7.0.1) - railties (>= 3.2, < 5.1) + font-awesome-rails (4.7.0.4) + railties (>= 3.2, < 6.0) foreman (0.84.0) thor (~> 0.19.1) formatador (0.2.5) @@ -278,7 +276,7 @@ GEM rugged (~> 0.21) gemojione (3.3.0) json - get_process_mem (0.2.0) + get_process_mem (0.2.1) gettext (3.2.9) locale (>= 2.0.5) text (>= 1.3.0) @@ -331,9 +329,9 @@ GEM rubyntlm (~> 0.5) globalid (0.4.1) activesupport (>= 4.2.0) - goldiloader (2.0.1) - activerecord (>= 4.2, < 5.2) - activesupport (>= 4.2, < 5.2) + goldiloader (2.1.0) + activerecord (>= 4.2, < 5.3) + activesupport (>= 4.2, < 5.3) gollum-grit_adapter (1.0.1) gitlab-grit (~> 2.7, >= 2.7.1) gon (6.1.0) @@ -359,8 +357,8 @@ GEM multi_json (~> 1.11) os (~> 0.9) signet (~> 0.7) - gpgme (2.0.13) - mini_portile2 (~> 2.1) + gpgme (2.0.16) + mini_portile2 (~> 2.3) grape (1.0.2) activesupport builder @@ -389,23 +387,23 @@ GEM rake (>= 10, < 13) rubocop (>= 0.49.0) sysexits (~> 1.1) - hamlit (2.6.1) + hamlit (2.6.2) temple (~> 0.7.6) thor tilt - hashdiff (0.3.4) + hashdiff (0.3.7) hashie (3.5.7) hashie-forbidden_attributes (0.1.1) hashie (>= 3.0) health_check (2.6.0) rails (>= 4.0) - hipchat (1.5.2) + hipchat (1.5.4) httparty mimemagic html-pipeline (2.7.1) activesupport (>= 2) nokogiri (>= 1.4) - html2text (0.2.0) + html2text (0.2.1) nokogiri (~> 1.6) htmlentities (4.3.4) http (2.2.2) @@ -424,11 +422,9 @@ GEM i18n (0.9.5) concurrent-ruby (~> 1.0) ice_nine (0.11.2) - influxdb (0.2.3) - cause - json + influxdb (0.5.3) ipaddress (0.8.3) - jira-ruby (1.4.1) + jira-ruby (1.5.0) activesupport multipart-post oauth (~> 0.5, >= 0.5.0) @@ -443,31 +439,30 @@ GEM json-schema (2.8.0) addressable (>= 2.4) jwt (1.5.6) - kaminari (1.0.1) + kaminari (1.1.1) activesupport (>= 4.1.0) - kaminari-actionview (= 1.0.1) - kaminari-activerecord (= 1.0.1) - kaminari-core (= 1.0.1) - kaminari-actionview (1.0.1) + kaminari-actionview (= 1.1.1) + kaminari-activerecord (= 1.1.1) + kaminari-core (= 1.1.1) + kaminari-actionview (1.1.1) actionview - kaminari-core (= 1.0.1) - kaminari-activerecord (1.0.1) + kaminari-core (= 1.1.1) + kaminari-activerecord (1.1.1) activerecord - kaminari-core (= 1.0.1) - kaminari-core (1.0.1) - kgio (2.10.0) + kaminari-core (= 1.1.1) + kaminari-core (1.1.1) + kgio (2.11.2) knapsack (1.16.0) rake - timecop (>= 0.1.0) kubeclient (3.0.0) http (~> 2.2.2) recursive-open-struct (~> 1.0.4) rest-client (~> 2.0) launchy (2.4.3) addressable (~> 2.3) - letter_opener (1.4.1) + letter_opener (1.6.0) launchy (~> 2.2) - letter_opener_web (1.3.0) + letter_opener_web (1.3.4) actionmailer (>= 3.2) letter_opener (~> 1.0) railties (>= 3.2) @@ -486,10 +481,11 @@ GEM logging (2.2.2) little-plugger (~> 1.1) multi_json (~> 1.10) - lograge (0.5.1) - actionpack (>= 4, < 5.2) - activesupport (>= 4, < 5.2) - railties (>= 4, < 5.2) + lograge (0.10.0) + actionpack (>= 4) + activesupport (>= 4) + railties (>= 4) + request_store (~> 1.0) loofah (2.2.2) crass (~> 1.0.2) nokogiri (>= 1.5.9) @@ -499,11 +495,11 @@ GEM memoist (0.16.0) memoizable (0.4.2) thread_safe (~> 0.3, >= 0.3.1) - method_source (0.8.2) + method_source (0.9.0) mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) - mimemagic (0.3.0) + mimemagic (0.3.2) mini_mime (1.0.0) mini_portile2 (2.3.0) minitest (5.7.0) @@ -515,7 +511,7 @@ GEM mustermann-grape (1.0.0) mustermann (~> 1.0.0) mysql2 (0.4.10) - net-ldap (0.16.0) + net-ldap (0.16.1) net-ssh (4.2.0) netrc (0.11.0) nokogiri (1.8.2) @@ -550,7 +546,7 @@ GEM omniauth-github (1.1.2) omniauth (~> 1.0) omniauth-oauth2 (~> 1.1) - omniauth-gitlab (1.0.2) + omniauth-gitlab (1.0.3) omniauth (~> 1.0) omniauth-oauth2 (~> 1.0) omniauth-google-oauth2 (0.5.3) @@ -571,7 +567,7 @@ GEM omniauth-oauth2 (1.5.0) oauth2 (~> 1.1) omniauth (~> 1.2) - omniauth-oauth2-generic (0.2.2) + omniauth-oauth2-generic (0.2.4) omniauth-oauth2 (~> 1.0) omniauth-saml (1.10.0) omniauth (~> 1.3, >= 1.3.2) @@ -594,7 +590,7 @@ GEM ast (~> 2.4.0) parslet (1.5.0) blankslate (~> 2.0) - path_expander (1.0.2) + path_expander (1.0.3) peek (1.0.1) concurrent-ruby (>= 0.9.0) concurrent-ruby-ext (>= 0.9.0) @@ -628,9 +624,9 @@ GEM json (>= 1.6.0) posix-spawn (0.3.13) powerpack (0.1.1) - premailer (1.10.4) + premailer (1.11.1) addressable - css_parser (>= 1.4.10) + css_parser (>= 1.6.0) htmlentities (>= 4.0.0) premailer-rails (1.9.7) actionmailer (>= 3, < 6) @@ -641,15 +637,14 @@ GEM unparser procto (0.0.3) prometheus-client-mmap (0.9.1) - pry (0.10.4) + pry (0.11.3) coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - pry-byebug (3.4.2) - byebug (~> 9.0) + method_source (~> 0.9.0) + pry-byebug (3.4.3) + byebug (>= 9.0, < 9.1) pry (~> 0.10) - pry-rails (0.3.5) - pry (>= 0.9.10) + pry-rails (0.3.6) + pry (>= 0.10.4) public_suffix (3.0.2) pyu-ruby-sasl (0.0.3.3) rack (1.6.9) @@ -666,7 +661,7 @@ GEM rack (>= 1.1) rack-protection (2.0.1) rack - rack-proxy (0.6.0) + rack-proxy (0.6.4) rack rack-test (0.6.3) rack (>= 1.0) @@ -699,21 +694,20 @@ GEM thor (>= 0.18.1, < 2.0) rainbow (2.2.2) rake - raindrops (0.18.0) - rake (12.3.0) - rb-fsevent (0.10.2) + raindrops (0.19.0) + rake (12.3.1) + rb-fsevent (0.10.3) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) - rblineprof (0.3.6) + rblineprof (0.3.7) debugger-ruby_core_source (~> 1.3) rbnacl (4.0.2) ffi - rbnacl-libsodium (1.0.11) + rbnacl-libsodium (1.0.16) rbnacl (>= 3.0.1) - rdoc (4.2.2) - json (~> 1.4) + rdoc (4.3.0) re2 (1.1.1) - recaptcha (3.0.0) + recaptcha (3.4.0) json recursive-open-struct (1.0.5) redcarpet (3.4.0) @@ -725,7 +719,7 @@ GEM redis-activesupport (5.0.4) activesupport (>= 3, < 6) redis-store (>= 1.3, < 2) - redis-namespace (1.5.2) + redis-namespace (1.5.3) redis (~> 3.0, >= 3.0.4) redis-rack (2.0.4) rack (>= 1.5, < 3) @@ -734,25 +728,27 @@ GEM redis-actionpack (>= 5.0, < 6) redis-activesupport (>= 5.0, < 6) redis-store (>= 1.2, < 2) - redis-store (1.4.1) + redis-store (1.5.0) redis (>= 2.2, < 5) representable (3.0.4) declarative (< 0.1.0) declarative-option (< 0.2.0) uber (< 0.2.0) - request_store (1.3.1) - responders (2.3.0) - railties (>= 4.2.0, < 5.1) + request_store (1.4.1) + rack (>= 1.4) + responders (2.4.0) + actionpack (>= 4.2.0, < 5.3) + railties (>= 4.2.0, < 5.3) rest-client (2.0.2) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) retriable (3.1.1) - rinku (2.0.0) + rinku (2.0.4) rotp (2.1.2) rouge (2.2.1) - rqrcode (0.7.0) - chunky_png + rqrcode (0.10.1) + chunky_png (~> 1.0) rqrcode-rails3 (0.1.7) rqrcode (>= 0.4.2) rspec (3.6.0) @@ -773,7 +769,7 @@ GEM proc_to_ast rspec (>= 2.13, < 4) unparser - rspec-rails (3.6.0) + rspec-rails (3.6.1) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) @@ -781,7 +777,7 @@ GEM rspec-expectations (~> 3.6.0) rspec-mocks (~> 3.6.0) rspec-support (~> 3.6.0) - rspec-retry (0.4.5) + rspec-retry (0.4.6) rspec-core rspec-set (0.1.3) rspec-support (3.6.0) @@ -799,7 +795,7 @@ GEM unicode-display_width (~> 1.0, >= 1.0.1) rubocop-gitlab-security (0.1.1) rubocop (>= 0.51) - rubocop-rspec (1.22.1) + rubocop-rspec (1.22.2) rubocop (>= 0.52.1) ruby-enum (0.7.2) i18n @@ -809,23 +805,23 @@ GEM ruby-progressbar (1.9.0) ruby-saml (1.7.2) nokogiri (>= 1.5.10) - ruby_parser (3.9.0) - sexp_processor (~> 4.1) + ruby_parser (3.11.0) + sexp_processor (~> 4.9) rubyntlm (0.6.2) - rubypants (0.2.0) + rubypants (0.7.0) rubyzip (1.2.1) - rufus-scheduler (3.4.0) + rufus-scheduler (3.4.2) et-orbi (~> 1.0) rugged (0.27.0) safe_yaml (1.0.4) sanitize (2.1.0) nokogiri (>= 1.4.4) - sass (3.5.5) + sass (3.5.6) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - sass-rails (5.0.6) + sass-rails (5.0.7) railties (>= 4.0.0, < 6) sass (~> 3.1) sprockets (>= 2.8, < 4.0) @@ -838,28 +834,28 @@ GEM rake (>= 0.9, < 13) sass (~> 3.5.3) securecompare (1.0.0) - seed-fu (2.3.7) + seed-fu (2.3.9) activerecord (>= 3.1) activesupport (>= 3.1) - select2-rails (3.5.9.3) + select2-rails (3.5.10) thor (~> 0.14) - selenium-webdriver (3.5.0) + selenium-webdriver (3.11.0) childprocess (~> 0.5) - rubyzip (~> 1.0) + rubyzip (~> 1.2) sentry-raven (2.7.2) faraday (>= 0.7.6, < 1.0) settingslogic (2.0.9) - sexp_processor (4.9.0) + sexp_processor (4.11.0) sham_rack (1.3.6) rack shoulda-matchers (3.1.2) activesupport (>= 4.0.0) - sidekiq (5.0.5) + sidekiq (5.1.3) concurrent-ruby (~> 1.0) connection_pool (~> 2.2, >= 2.2.0) rack-protection (>= 1.5.0) - redis (>= 3.3.4, < 5) - sidekiq-cron (0.6.0) + redis (>= 3.3.5, < 5) + sidekiq-cron (0.6.3) rufus-scheduler (>= 3.3.0) sidekiq (>= 4.2.1) sidekiq-limit_fetch (3.4.0) @@ -869,15 +865,14 @@ GEM faraday (~> 0.9) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) - simple_po_parser (1.1.2) + simple_po_parser (1.1.3) simplecov (0.14.1) docile (~> 1.1.0) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) - simplecov-html (0.10.0) + simplecov-html (0.10.2) slack-notifier (1.5.1) - slop (3.6.0) - spinach (0.8.10) + spinach (0.10.1) colorize gherkin-ruby (>= 0.3.2) json @@ -887,7 +882,7 @@ GEM spinach (>= 0.4) spinach-rerun-reporter (0.0.2) spinach (~> 0.8) - spring (2.0.1) + spring (2.0.2) activesupport (>= 4.2) spring-commands-rspec (1.0.4) spring (>= 0.9.1) @@ -902,7 +897,7 @@ GEM sprockets (>= 3.0.0) sqlite3 (1.3.13) sshkey (1.9.0) - stackprof (0.2.10) + stackprof (0.2.11) state_machines (0.5.0) state_machines-activemodel (0.5.1) activemodel (>= 4.1, < 6.0) @@ -911,7 +906,7 @@ GEM activerecord (>= 4.1, < 6.0) state_machines-activemodel (>= 0.5.0) stringex (2.8.4) - sys-filesystem (1.1.6) + sys-filesystem (1.1.9) ffi sysexits (1.2.0) temple (0.7.7) @@ -919,13 +914,13 @@ GEM test_after_commit (1.1.0) activerecord (>= 3.2) text (1.3.1) - thin (1.7.0) + thin (1.7.2) daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) thor (0.19.4) thread_safe (0.3.6) - tilt (2.0.6) + tilt (2.0.8) timecop (0.8.1) timfel-krb5-auth (0.8.3) toml (0.1.2) @@ -962,7 +957,7 @@ GEM parser (>= 2.3.1.2, < 2.6) procto (~> 0.0.2) url_safe_base64 (0.2.2) - validates_hostname (1.0.6) + validates_hostname (1.0.8) activerecord (>= 3.0) activesupport (>= 3.0) version_sorter (2.1.0) @@ -972,13 +967,13 @@ GEM descendants_tracker (~> 0.0, >= 0.0.3) equalizer (~> 0.0, >= 0.0.9) vmstat (2.3.0) - warden (1.2.6) + warden (1.2.7) rack (>= 1.0) webmock (2.3.2) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff - webpack-rails (0.9.10) + webpack-rails (0.9.11) railties (>= 3.2.0) wikicloth (0.8.1) builder @@ -986,8 +981,8 @@ GEM rinku with_env (1.1.0) xml-simple (1.1.5) - xpath (2.1.0) - nokogiri (~> 1.3) + xpath (3.0.0) + nokogiri (~> 1.8) PLATFORMS ruby diff --git a/app/assets/stylesheets/framework/wells.scss b/app/assets/stylesheets/framework/wells.scss index 2f3a80daa90..3fa7a260017 100644 --- a/app/assets/stylesheets/framework/wells.scss +++ b/app/assets/stylesheets/framework/wells.scss @@ -19,6 +19,7 @@ .fork-svg { margin-right: 4px; + vertical-align: bottom; } } diff --git a/app/assets/stylesheets/pages/commits.scss b/app/assets/stylesheets/pages/commits.scss index 86cdda0359e..327cb1f57ed 100644 --- a/app/assets/stylesheets/pages/commits.scss +++ b/app/assets/stylesheets/pages/commits.scss @@ -70,7 +70,7 @@ } .branch-info .commit-icon { - margin-right: 3px; + margin-right: 8px; svg { top: 3px; diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb index 98894b86551..e594a1d0ba3 100644 --- a/app/helpers/commits_helper.rb +++ b/app/helpers/commits_helper.rb @@ -63,7 +63,7 @@ module CommitsHelper # Returns a link formatted as a commit branch link def commit_branch_link(url, text) link_to(url, class: 'label label-gray ref-name branch-link') do - sprite_icon('fork', size: 16, css_class: 'fork-svg') + "#{text}" + sprite_icon('fork', size: 12, css_class: 'fork-svg') + "#{text}" end end diff --git a/changelogs/unreleased/fix-size-and-position-for-fork-icon.yml b/changelogs/unreleased/fix-size-and-position-for-fork-icon.yml new file mode 100644 index 00000000000..7fb7001e5ed --- /dev/null +++ b/changelogs/unreleased/fix-size-and-position-for-fork-icon.yml @@ -0,0 +1,5 @@ +--- +title: Fix size and position for fork icon +merge_request: 18399 +author: George Tsiolis +type: fixed |