Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
5a34d3bd
Commit
5a34d3bd
authored
Apr 16, 2018
by
George Tsiolis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix size and position for fork icon
parent
2cc78c0b
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
145 additions
and
144 deletions
+145
-144
Gemfile.lock
Gemfile.lock
+137
-142
app/assets/stylesheets/framework/wells.scss
app/assets/stylesheets/framework/wells.scss
+1
-0
app/assets/stylesheets/pages/commits.scss
app/assets/stylesheets/pages/commits.scss
+1
-1
app/helpers/commits_helper.rb
app/helpers/commits_helper.rb
+1
-1
changelogs/unreleased/fix-size-and-position-for-fork-icon.yml
...gelogs/unreleased/fix-size-and-position-for-fork-icon.yml
+5
-0
No files found.
Gemfile.lock
View file @
5a34d3bd
...
@@ -3,7 +3,7 @@ GEM
...
@@ -3,7 +3,7 @@ GEM
specs:
specs:
RedCloth (4.3.2)
RedCloth (4.3.2)
abstract_type (0.0.7)
abstract_type (0.0.7)
ace-rails-ap (4.1.
2
)
ace-rails-ap (4.1.
4
)
actionmailer (4.2.10)
actionmailer (4.2.10)
actionpack (= 4.2.10)
actionpack (= 4.2.10)
actionview (= 4.2.10)
actionview (= 4.2.10)
...
@@ -51,7 +51,7 @@ GEM
...
@@ -51,7 +51,7 @@ GEM
akismet (2.0.0)
akismet (2.0.0)
allocations (1.0.5)
allocations (1.0.5)
arel (6.0.4)
arel (6.0.4)
asana (0.6.
0
)
asana (0.6.
3
)
faraday (~> 0.9)
faraday (~> 0.9)
faraday_middleware (~> 0.9)
faraday_middleware (~> 0.9)
faraday_middleware-multi_json (~> 0.0)
faraday_middleware-multi_json (~> 0.0)
...
@@ -68,10 +68,9 @@ GEM
...
@@ -68,10 +68,9 @@ GEM
atomic (1.1.99)
atomic (1.1.99)
attr_encrypted (3.1.0)
attr_encrypted (3.1.0)
encryptor (~> 3.0.0)
encryptor (~> 3.0.0)
attr_required (1.0.
0
)
attr_required (1.0.
1
)
autoprefixer-rails (
6.2.3
)
autoprefixer-rails (
8.3.0
)
execjs
execjs
json
awesome_print (1.2.0)
awesome_print (1.2.0)
axiom-types (0.1.1)
axiom-types (0.1.1)
descendants_tracker (~> 0.0.4)
descendants_tracker (~> 0.0.4)
...
@@ -88,15 +87,15 @@ GEM
...
@@ -88,15 +87,15 @@ GEM
erubis (>= 2.6.6)
erubis (>= 2.6.6)
rack (>= 0.9.0)
rack (>= 0.9.0)
bindata (2.4.3)
bindata (2.4.3)
binding_of_caller (0.7.
2
)
binding_of_caller (0.7.
3
)
debug_inspector (>= 0.0.1)
debug_inspector (>= 0.0.1)
blankslate (2.1.2.4)
blankslate (2.1.2.4)
bootstrap-sass (3.3.
6
)
bootstrap-sass (3.3.
7
)
autoprefixer-rails (>= 5.2.1)
autoprefixer-rails (>= 5.2.1)
sass (>= 3.3.4)
sass (>= 3.3.4)
bootstrap_form (2.7.0)
bootstrap_form (2.7.0)
brakeman (4.2.1)
brakeman (4.2.1)
browser (2.
2.0
)
browser (2.
5.3
)
builder (3.2.3)
builder (3.2.3)
bullet (5.5.1)
bullet (5.5.1)
activesupport (>= 3.0.0)
activesupport (>= 3.0.0)
...
@@ -105,34 +104,33 @@ GEM
...
@@ -105,34 +104,33 @@ GEM
bundler (~> 1.2)
bundler (~> 1.2)
thor (~> 0.18)
thor (~> 0.18)
byebug (9.0.6)
byebug (9.0.6)
capybara (2.1
5.1
)
capybara (2.1
8.0
)
addressable
addressable
mini_mime (>= 0.1.3)
mini_mime (>= 0.1.3)
nokogiri (>= 1.3.3)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
rack-test (>= 0.5.4)
xpath (
~> 2
.0)
xpath (
>= 2.0, < 4
.0)
capybara-screenshot (1.0.1
4
)
capybara-screenshot (1.0.1
9
)
capybara (>= 1.0, <
3
)
capybara (>= 1.0, <
4
)
launchy
launchy
carrierwave (1.2.
1
)
carrierwave (1.2.
2
)
activemodel (>= 4.0.0)
activemodel (>= 4.0.0)
activesupport (>= 4.0.0)
activesupport (>= 4.0.0)
mime-types (>= 1.16)
mime-types (>= 1.16)
cause (0.1)
charlock_holmes (0.7.6)
charlock_holmes (0.7.6)
childprocess (0.
7
.0)
childprocess (0.
9
.0)
ffi (~> 1.0, >= 1.0.11)
ffi (~> 1.0, >= 1.0.11)
chronic (0.10.2)
chronic (0.10.2)
chronic_duration (0.10.6)
chronic_duration (0.10.6)
numerizer (~> 0.1.1)
numerizer (~> 0.1.1)
chunky_png (1.3.
5
)
chunky_png (1.3.
10
)
citrus (3.0.2)
citrus (3.0.2)
coderay (1.1.
1
)
coderay (1.1.
2
)
coercible (1.0.0)
coercible (1.0.0)
descendants_tracker (~> 0.0.1)
descendants_tracker (~> 0.0.1)
colorize (0.
7.7
)
colorize (0.
8.1
)
commonmarker (0.17.
8
)
commonmarker (0.17.
9
)
ruby-enum (~> 0.5)
ruby-enum (~> 0.5)
concord (0.1.5)
concord (0.1.5)
adamantium (~> 0.2.0)
adamantium (~> 0.2.0)
...
@@ -143,49 +141,49 @@ GEM
...
@@ -143,49 +141,49 @@ GEM
connection_pool (2.2.1)
connection_pool (2.2.1)
crack (0.4.3)
crack (0.4.3)
safe_yaml (~> 1.0.0)
safe_yaml (~> 1.0.0)
crass (1.0.
3
)
crass (1.0.
4
)
creole (0.5.0)
creole (0.5.0)
css_parser (1.
5
.0)
css_parser (1.
6
.0)
addressable
addressable
d3_rails (3.5.1
1
)
d3_rails (3.5.1
7
)
railties (>= 3.1.0)
railties (>= 3.1.0)
daemons (1.2.
3
)
daemons (1.2.
6
)
database_cleaner (1.5.3)
database_cleaner (1.5.3)
debug_inspector (0.0.
2
)
debug_inspector (0.0.
3
)
debugger-ruby_core_source (1.3.8)
debugger-ruby_core_source (1.3.8)
deckar01-task_list (2.0.0)
deckar01-task_list (2.0.0)
html-pipeline
html-pipeline
declarative (0.0.10)
declarative (0.0.10)
declarative-option (0.1.0)
declarative-option (0.1.0)
default_value_for (3.0.
2
)
default_value_for (3.0.
5
)
activerecord (>= 3.2.0, < 5.
1
)
activerecord (>= 3.2.0, < 5.
2
)
descendants_tracker (0.0.4)
descendants_tracker (0.0.4)
thread_safe (~> 0.3, >= 0.3.1)
thread_safe (~> 0.3, >= 0.3.1)
devise (4.
2.0
)
devise (4.
4.3
)
bcrypt (~> 3.0)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
orm_adapter (~> 0.1)
railties (>= 4.1.0, <
5.1
)
railties (>= 4.1.0, <
6.0
)
responders
responders
warden (~> 1.2.3)
warden (~> 1.2.3)
devise-two-factor (3.0.
0
)
devise-two-factor (3.0.
3
)
activesupport
activesupport
(< 5.3)
attr_encrypted (>= 1.3, < 4, != 2)
attr_encrypted (>= 1.3, < 4, != 2)
devise (~> 4.0)
devise (~> 4.0)
railties
railties
(< 5.3)
rotp (~> 2.0)
rotp (~> 2.0)
diff-lcs (1.3)
diff-lcs (1.3)
diffy (3.1.0)
diffy (3.1.0)
docile (1.1.5)
docile (1.1.5)
domain_name (0.5.20170404)
domain_name (0.5.20170404)
unf (>= 0.0.5, < 1.0.0)
unf (>= 0.0.5, < 1.0.0)
doorkeeper (4.3.
1
)
doorkeeper (4.3.
2
)
railties (>= 4.2)
railties (>= 4.2)
doorkeeper-openid_connect (1.3.0)
doorkeeper-openid_connect (1.3.0)
doorkeeper (~> 4.3)
doorkeeper (~> 4.3)
json-jwt (~> 1.6)
json-jwt (~> 1.6)
dropzonejs-rails (0.7.
2
)
dropzonejs-rails (0.7.
4
)
rails (> 3.1)
rails (> 3.1)
email_reply_trimmer (0.1.
6
)
email_reply_trimmer (0.1.
11
)
email_spec (1.6.0)
email_spec (1.6.0)
launchy (~> 2.1)
launchy (~> 2.1)
mail (~> 2.2)
mail (~> 2.2)
...
@@ -193,11 +191,11 @@ GEM
...
@@ -193,11 +191,11 @@ GEM
equalizer (0.0.11)
equalizer (0.0.11)
erubis (2.7.0)
erubis (2.7.0)
escape_utils (1.1.1)
escape_utils (1.1.1)
et-orbi (1.
0.3
)
et-orbi (1.
1.0
)
tzinfo
tzinfo
eventmachine (1.
0.8
)
eventmachine (1.
2.5
)
excon (0.6
0
.0)
excon (0.6
2
.0)
execjs (2.
6
.0)
execjs (2.
7
.0)
expression_parser (0.9.0)
expression_parser (0.9.0)
factory_bot (4.8.2)
factory_bot (4.8.2)
activesupport (>= 3.0.0)
activesupport (>= 3.0.0)
...
@@ -213,8 +211,8 @@ GEM
...
@@ -213,8 +211,8 @@ GEM
multi_json
multi_json
fast_blank (1.0.0)
fast_blank (1.0.0)
fast_gettext (1.6.0)
fast_gettext (1.6.0)
ffaker (2.
4
.0)
ffaker (2.
9
.0)
ffi (1.9.
18
)
ffi (1.9.
23
)
flay (2.10.0)
flay (2.10.0)
erubis (~> 2.7.0)
erubis (~> 2.7.0)
path_expander (~> 1.0)
path_expander (~> 1.0)
...
@@ -230,7 +228,7 @@ GEM
...
@@ -230,7 +228,7 @@ GEM
flowdock (0.7.1)
flowdock (0.7.1)
httparty (~> 0.7)
httparty (~> 0.7)
multi_json
multi_json
fog-aliyun (0.2.
0
)
fog-aliyun (0.2.
1
)
fog-core (~> 1.27)
fog-core (~> 1.27)
fog-json (~> 1.0)
fog-json (~> 1.0)
ipaddress (~> 0.8)
ipaddress (~> 0.8)
...
@@ -252,13 +250,13 @@ GEM
...
@@ -252,13 +250,13 @@ GEM
fog-json (1.0.2)
fog-json (1.0.2)
fog-core (~> 1.0)
fog-core (~> 1.0)
multi_json (~> 1.10)
multi_json (~> 1.10)
fog-local (0.
3.1
)
fog-local (0.
5.0
)
fog-core (
~> 1.27
)
fog-core (
>= 1.27, < 3.0
)
fog-openstack (0.1.2
1
)
fog-openstack (0.1.2
5
)
fog-core (
>=
1.40)
fog-core (
~>
1.40)
fog-json (>= 1.0)
fog-json (>= 1.0)
ipaddress (>= 0.8)
ipaddress (>= 0.8)
fog-rackspace (0.1.
1
)
fog-rackspace (0.1.
5
)
fog-core (>= 1.35)
fog-core (>= 1.35)
fog-json (>= 1.0)
fog-json (>= 1.0)
fog-xml (>= 0.1)
fog-xml (>= 0.1)
...
@@ -266,8 +264,8 @@ GEM
...
@@ -266,8 +264,8 @@ GEM
fog-xml (0.1.3)
fog-xml (0.1.3)
fog-core
fog-core
nokogiri (>= 1.5.11, < 2.0.0)
nokogiri (>= 1.5.11, < 2.0.0)
font-awesome-rails (4.7.0.
1
)
font-awesome-rails (4.7.0.
4
)
railties (>= 3.2, <
5.1
)
railties (>= 3.2, <
6.0
)
foreman (0.84.0)
foreman (0.84.0)
thor (~> 0.19.1)
thor (~> 0.19.1)
formatador (0.2.5)
formatador (0.2.5)
...
@@ -278,7 +276,7 @@ GEM
...
@@ -278,7 +276,7 @@ GEM
rugged (~> 0.21)
rugged (~> 0.21)
gemojione (3.3.0)
gemojione (3.3.0)
json
json
get_process_mem (0.2.
0
)
get_process_mem (0.2.
1
)
gettext (3.2.9)
gettext (3.2.9)
locale (>= 2.0.5)
locale (>= 2.0.5)
text (>= 1.3.0)
text (>= 1.3.0)
...
@@ -331,9 +329,9 @@ GEM
...
@@ -331,9 +329,9 @@ GEM
rubyntlm (~> 0.5)
rubyntlm (~> 0.5)
globalid (0.4.1)
globalid (0.4.1)
activesupport (>= 4.2.0)
activesupport (>= 4.2.0)
goldiloader (2.
0.1
)
goldiloader (2.
1.0
)
activerecord (>= 4.2, < 5.
2
)
activerecord (>= 4.2, < 5.
3
)
activesupport (>= 4.2, < 5.
2
)
activesupport (>= 4.2, < 5.
3
)
gollum-grit_adapter (1.0.1)
gollum-grit_adapter (1.0.1)
gitlab-grit (~> 2.7, >= 2.7.1)
gitlab-grit (~> 2.7, >= 2.7.1)
gon (6.1.0)
gon (6.1.0)
...
@@ -359,8 +357,8 @@ GEM
...
@@ -359,8 +357,8 @@ GEM
multi_json (~> 1.11)
multi_json (~> 1.11)
os (~> 0.9)
os (~> 0.9)
signet (~> 0.7)
signet (~> 0.7)
gpgme (2.0.1
3
)
gpgme (2.0.1
6
)
mini_portile2 (~> 2.
1
)
mini_portile2 (~> 2.
3
)
grape (1.0.2)
grape (1.0.2)
activesupport
activesupport
builder
builder
...
@@ -389,23 +387,23 @@ GEM
...
@@ -389,23 +387,23 @@ GEM
rake (>= 10, < 13)
rake (>= 10, < 13)
rubocop (>= 0.49.0)
rubocop (>= 0.49.0)
sysexits (~> 1.1)
sysexits (~> 1.1)
hamlit (2.6.
1
)
hamlit (2.6.
2
)
temple (~> 0.7.6)
temple (~> 0.7.6)
thor
thor
tilt
tilt
hashdiff (0.3.
4
)
hashdiff (0.3.
7
)
hashie (3.5.7)
hashie (3.5.7)
hashie-forbidden_attributes (0.1.1)
hashie-forbidden_attributes (0.1.1)
hashie (>= 3.0)
hashie (>= 3.0)
health_check (2.6.0)
health_check (2.6.0)
rails (>= 4.0)
rails (>= 4.0)
hipchat (1.5.
2
)
hipchat (1.5.
4
)
httparty
httparty
mimemagic
mimemagic
html-pipeline (2.7.1)
html-pipeline (2.7.1)
activesupport (>= 2)
activesupport (>= 2)
nokogiri (>= 1.4)
nokogiri (>= 1.4)
html2text (0.2.
0
)
html2text (0.2.
1
)
nokogiri (~> 1.6)
nokogiri (~> 1.6)
htmlentities (4.3.4)
htmlentities (4.3.4)
http (2.2.2)
http (2.2.2)
...
@@ -424,11 +422,9 @@ GEM
...
@@ -424,11 +422,9 @@ GEM
i18n (0.9.5)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
concurrent-ruby (~> 1.0)
ice_nine (0.11.2)
ice_nine (0.11.2)
influxdb (0.2.3)
influxdb (0.5.3)
cause
json
ipaddress (0.8.3)
ipaddress (0.8.3)
jira-ruby (1.
4.1
)
jira-ruby (1.
5.0
)
activesupport
activesupport
multipart-post
multipart-post
oauth (~> 0.5, >= 0.5.0)
oauth (~> 0.5, >= 0.5.0)
...
@@ -443,31 +439,30 @@ GEM
...
@@ -443,31 +439,30 @@ GEM
json-schema (2.8.0)
json-schema (2.8.0)
addressable (>= 2.4)
addressable (>= 2.4)
jwt (1.5.6)
jwt (1.5.6)
kaminari (1.
0
.1)
kaminari (1.
1
.1)
activesupport (>= 4.1.0)
activesupport (>= 4.1.0)
kaminari-actionview (= 1.
0
.1)
kaminari-actionview (= 1.
1
.1)
kaminari-activerecord (= 1.
0
.1)
kaminari-activerecord (= 1.
1
.1)
kaminari-core (= 1.
0
.1)
kaminari-core (= 1.
1
.1)
kaminari-actionview (1.
0
.1)
kaminari-actionview (1.
1
.1)
actionview
actionview
kaminari-core (= 1.
0
.1)
kaminari-core (= 1.
1
.1)
kaminari-activerecord (1.
0
.1)
kaminari-activerecord (1.
1
.1)
activerecord
activerecord
kaminari-core (= 1.
0
.1)
kaminari-core (= 1.
1
.1)
kaminari-core (1.
0
.1)
kaminari-core (1.
1
.1)
kgio (2.1
0.0
)
kgio (2.1
1.2
)
knapsack (1.16.0)
knapsack (1.16.0)
rake
rake
timecop (>= 0.1.0)
kubeclient (3.0.0)
kubeclient (3.0.0)
http (~> 2.2.2)
http (~> 2.2.2)
recursive-open-struct (~> 1.0.4)
recursive-open-struct (~> 1.0.4)
rest-client (~> 2.0)
rest-client (~> 2.0)
launchy (2.4.3)
launchy (2.4.3)
addressable (~> 2.3)
addressable (~> 2.3)
letter_opener (1.
4.1
)
letter_opener (1.
6.0
)
launchy (~> 2.2)
launchy (~> 2.2)
letter_opener_web (1.3.
0
)
letter_opener_web (1.3.
4
)
actionmailer (>= 3.2)
actionmailer (>= 3.2)
letter_opener (~> 1.0)
letter_opener (~> 1.0)
railties (>= 3.2)
railties (>= 3.2)
...
@@ -486,10 +481,11 @@ GEM
...
@@ -486,10 +481,11 @@ GEM
logging (2.2.2)
logging (2.2.2)
little-plugger (~> 1.1)
little-plugger (~> 1.1)
multi_json (~> 1.10)
multi_json (~> 1.10)
lograge (0.5.1)
lograge (0.10.0)
actionpack (>= 4, < 5.2)
actionpack (>= 4)
activesupport (>= 4, < 5.2)
activesupport (>= 4)
railties (>= 4, < 5.2)
railties (>= 4)
request_store (~> 1.0)
loofah (2.2.2)
loofah (2.2.2)
crass (~> 1.0.2)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
nokogiri (>= 1.5.9)
...
@@ -499,11 +495,11 @@ GEM
...
@@ -499,11 +495,11 @@ GEM
memoist (0.16.0)
memoist (0.16.0)
memoizable (0.4.2)
memoizable (0.4.2)
thread_safe (~> 0.3, >= 0.3.1)
thread_safe (~> 0.3, >= 0.3.1)
method_source (0.
8.2
)
method_source (0.
9.0
)
mime-types (3.1)
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mime-types-data (3.2016.0521)
mimemagic (0.3.
0
)
mimemagic (0.3.
2
)
mini_mime (1.0.0)
mini_mime (1.0.0)
mini_portile2 (2.3.0)
mini_portile2 (2.3.0)
minitest (5.7.0)
minitest (5.7.0)
...
@@ -515,7 +511,7 @@ GEM
...
@@ -515,7 +511,7 @@ GEM
mustermann-grape (1.0.0)
mustermann-grape (1.0.0)
mustermann (~> 1.0.0)
mustermann (~> 1.0.0)
mysql2 (0.4.10)
mysql2 (0.4.10)
net-ldap (0.16.
0
)
net-ldap (0.16.
1
)
net-ssh (4.2.0)
net-ssh (4.2.0)
netrc (0.11.0)
netrc (0.11.0)
nokogiri (1.8.2)
nokogiri (1.8.2)
...
@@ -550,7 +546,7 @@ GEM
...
@@ -550,7 +546,7 @@ GEM
omniauth-github (1.1.2)
omniauth-github (1.1.2)
omniauth (~> 1.0)
omniauth (~> 1.0)
omniauth-oauth2 (~> 1.1)
omniauth-oauth2 (~> 1.1)
omniauth-gitlab (1.0.
2
)
omniauth-gitlab (1.0.
3
)
omniauth (~> 1.0)
omniauth (~> 1.0)
omniauth-oauth2 (~> 1.0)
omniauth-oauth2 (~> 1.0)
omniauth-google-oauth2 (0.5.3)
omniauth-google-oauth2 (0.5.3)
...
@@ -571,7 +567,7 @@ GEM
...
@@ -571,7 +567,7 @@ GEM
omniauth-oauth2 (1.5.0)
omniauth-oauth2 (1.5.0)
oauth2 (~> 1.1)
oauth2 (~> 1.1)
omniauth (~> 1.2)
omniauth (~> 1.2)
omniauth-oauth2-generic (0.2.
2
)
omniauth-oauth2-generic (0.2.
4
)
omniauth-oauth2 (~> 1.0)
omniauth-oauth2 (~> 1.0)
omniauth-saml (1.10.0)
omniauth-saml (1.10.0)
omniauth (~> 1.3, >= 1.3.2)
omniauth (~> 1.3, >= 1.3.2)
...
@@ -594,7 +590,7 @@ GEM
...
@@ -594,7 +590,7 @@ GEM
ast (~> 2.4.0)
ast (~> 2.4.0)
parslet (1.5.0)
parslet (1.5.0)
blankslate (~> 2.0)
blankslate (~> 2.0)
path_expander (1.0.
2
)
path_expander (1.0.
3
)
peek (1.0.1)
peek (1.0.1)
concurrent-ruby (>= 0.9.0)
concurrent-ruby (>= 0.9.0)
concurrent-ruby-ext (>= 0.9.0)
concurrent-ruby-ext (>= 0.9.0)
...
@@ -628,9 +624,9 @@ GEM
...
@@ -628,9 +624,9 @@ GEM
json (>= 1.6.0)
json (>= 1.6.0)
posix-spawn (0.3.13)
posix-spawn (0.3.13)
powerpack (0.1.1)
powerpack (0.1.1)
premailer (1.1
0.4
)
premailer (1.1
1.1
)
addressable
addressable
css_parser (>= 1.
4.1
0)
css_parser (>= 1.
6.
0)
htmlentities (>= 4.0.0)
htmlentities (>= 4.0.0)
premailer-rails (1.9.7)
premailer-rails (1.9.7)
actionmailer (>= 3, < 6)
actionmailer (>= 3, < 6)
...
@@ -641,15 +637,14 @@ GEM
...
@@ -641,15 +637,14 @@ GEM
unparser
unparser
procto (0.0.3)
procto (0.0.3)
prometheus-client-mmap (0.9.1)
prometheus-client-mmap (0.9.1)
pry (0.1
0.4
)
pry (0.1
1.3
)
coderay (~> 1.1.0)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
method_source (~> 0.9.0)
slop (~> 3.4)
pry-byebug (3.4.3)
pry-byebug (3.4.2)
byebug (>= 9.0, < 9.1)
byebug (~> 9.0)
pry (~> 0.10)
pry (~> 0.10)
pry-rails (0.3.
5
)
pry-rails (0.3.
6
)
pry (>= 0.
9.10
)
pry (>= 0.
10.4
)
public_suffix (3.0.2)
public_suffix (3.0.2)
pyu-ruby-sasl (0.0.3.3)
pyu-ruby-sasl (0.0.3.3)
rack (1.6.9)
rack (1.6.9)
...
@@ -666,7 +661,7 @@ GEM
...
@@ -666,7 +661,7 @@ GEM
rack (>= 1.1)
rack (>= 1.1)
rack-protection (2.0.1)
rack-protection (2.0.1)
rack
rack
rack-proxy (0.6.
0
)
rack-proxy (0.6.
4
)
rack
rack
rack-test (0.6.3)
rack-test (0.6.3)
rack (>= 1.0)
rack (>= 1.0)
...
@@ -699,21 +694,20 @@ GEM
...
@@ -699,21 +694,20 @@ GEM
thor (>= 0.18.1, < 2.0)
thor (>= 0.18.1, < 2.0)
rainbow (2.2.2)
rainbow (2.2.2)
rake
rake
raindrops (0.1
8
.0)
raindrops (0.1
9
.0)
rake (12.3.
0
)
rake (12.3.
1
)
rb-fsevent (0.10.
2
)
rb-fsevent (0.10.
3
)
rb-inotify (0.9.10)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
ffi (>= 0.5.0, < 2)
rblineprof (0.3.
6
)
rblineprof (0.3.
7
)
debugger-ruby_core_source (~> 1.3)
debugger-ruby_core_source (~> 1.3)
rbnacl (4.0.2)
rbnacl (4.0.2)
ffi
ffi
rbnacl-libsodium (1.0.1
1
)
rbnacl-libsodium (1.0.1
6
)
rbnacl (>= 3.0.1)
rbnacl (>= 3.0.1)
rdoc (4.2.2)
rdoc (4.3.0)
json (~> 1.4)
re2 (1.1.1)
re2 (1.1.1)
recaptcha (3.
0
.0)
recaptcha (3.
4
.0)
json
json
recursive-open-struct (1.0.5)
recursive-open-struct (1.0.5)
redcarpet (3.4.0)
redcarpet (3.4.0)
...
@@ -725,7 +719,7 @@ GEM
...
@@ -725,7 +719,7 @@ GEM
redis-activesupport (5.0.4)
redis-activesupport (5.0.4)
activesupport (>= 3, < 6)
activesupport (>= 3, < 6)
redis-store (>= 1.3, < 2)
redis-store (>= 1.3, < 2)
redis-namespace (1.5.
2
)
redis-namespace (1.5.
3
)
redis (~> 3.0, >= 3.0.4)
redis (~> 3.0, >= 3.0.4)
redis-rack (2.0.4)
redis-rack (2.0.4)
rack (>= 1.5, < 3)
rack (>= 1.5, < 3)
...
@@ -734,25 +728,27 @@ GEM
...
@@ -734,25 +728,27 @@ GEM
redis-actionpack (>= 5.0, < 6)
redis-actionpack (>= 5.0, < 6)
redis-activesupport (>= 5.0, < 6)
redis-activesupport (>= 5.0, < 6)
redis-store (>= 1.2, < 2)
redis-store (>= 1.2, < 2)
redis-store (1.
4.1
)
redis-store (1.
5.0
)
redis (>= 2.2, < 5)
redis (>= 2.2, < 5)
representable (3.0.4)
representable (3.0.4)
declarative (< 0.1.0)
declarative (< 0.1.0)
declarative-option (< 0.2.0)
declarative-option (< 0.2.0)
uber (< 0.2.0)
uber (< 0.2.0)
request_store (1.3.1)
request_store (1.4.1)
responders (2.3.0)
rack (>= 1.4)
railties (>= 4.2.0, < 5.1)
responders (2.4.0)
actionpack (>= 4.2.0, < 5.3)
railties (>= 4.2.0, < 5.3)
rest-client (2.0.2)
rest-client (2.0.2)
http-cookie (>= 1.0.2, < 2.0)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
netrc (~> 0.8)
retriable (3.1.1)
retriable (3.1.1)
rinku (2.0.
0
)
rinku (2.0.
4
)
rotp (2.1.2)
rotp (2.1.2)
rouge (2.2.1)
rouge (2.2.1)
rqrcode (0.
7.0
)
rqrcode (0.
10.1
)
chunky_png
chunky_png
(~> 1.0)
rqrcode-rails3 (0.1.7)
rqrcode-rails3 (0.1.7)
rqrcode (>= 0.4.2)
rqrcode (>= 0.4.2)
rspec (3.6.0)
rspec (3.6.0)
...
@@ -773,7 +769,7 @@ GEM
...
@@ -773,7 +769,7 @@ GEM
proc_to_ast
proc_to_ast
rspec (>= 2.13, < 4)
rspec (>= 2.13, < 4)
unparser
unparser
rspec-rails (3.6.
0
)
rspec-rails (3.6.
1
)
actionpack (>= 3.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
railties (>= 3.0)
...
@@ -781,7 +777,7 @@ GEM
...
@@ -781,7 +777,7 @@ GEM
rspec-expectations (~> 3.6.0)
rspec-expectations (~> 3.6.0)
rspec-mocks (~> 3.6.0)
rspec-mocks (~> 3.6.0)
rspec-support (~> 3.6.0)
rspec-support (~> 3.6.0)
rspec-retry (0.4.
5
)
rspec-retry (0.4.
6
)
rspec-core
rspec-core
rspec-set (0.1.3)
rspec-set (0.1.3)
rspec-support (3.6.0)
rspec-support (3.6.0)
...
@@ -799,7 +795,7 @@ GEM
...
@@ -799,7 +795,7 @@ GEM
unicode-display_width (~> 1.0, >= 1.0.1)
unicode-display_width (~> 1.0, >= 1.0.1)
rubocop-gitlab-security (0.1.1)
rubocop-gitlab-security (0.1.1)
rubocop (>= 0.51)
rubocop (>= 0.51)
rubocop-rspec (1.22.
1
)
rubocop-rspec (1.22.
2
)
rubocop (>= 0.52.1)
rubocop (>= 0.52.1)
ruby-enum (0.7.2)
ruby-enum (0.7.2)
i18n
i18n
...
@@ -809,23 +805,23 @@ GEM
...
@@ -809,23 +805,23 @@ GEM
ruby-progressbar (1.9.0)
ruby-progressbar (1.9.0)
ruby-saml (1.7.2)
ruby-saml (1.7.2)
nokogiri (>= 1.5.10)
nokogiri (>= 1.5.10)
ruby_parser (3.
9
.0)
ruby_parser (3.
11
.0)
sexp_processor (~> 4.
1
)
sexp_processor (~> 4.
9
)
rubyntlm (0.6.2)
rubyntlm (0.6.2)
rubypants (0.
2
.0)
rubypants (0.
7
.0)
rubyzip (1.2.1)
rubyzip (1.2.1)
rufus-scheduler (3.4.
0
)
rufus-scheduler (3.4.
2
)
et-orbi (~> 1.0)
et-orbi (~> 1.0)
rugged (0.27.0)
rugged (0.27.0)
safe_yaml (1.0.4)
safe_yaml (1.0.4)
sanitize (2.1.0)
sanitize (2.1.0)
nokogiri (>= 1.4.4)
nokogiri (>= 1.4.4)
sass (3.5.
5
)
sass (3.5.
6
)
sass-listen (~> 4.0.0)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
rb-inotify (~> 0.9, >= 0.9.7)
sass-rails (5.0.
6
)
sass-rails (5.0.
7
)
railties (>= 4.0.0, < 6)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets (>= 2.8, < 4.0)
...
@@ -838,28 +834,28 @@ GEM
...
@@ -838,28 +834,28 @@ GEM
rake (>= 0.9, < 13)
rake (>= 0.9, < 13)
sass (~> 3.5.3)
sass (~> 3.5.3)
securecompare (1.0.0)
securecompare (1.0.0)
seed-fu (2.3.
7
)
seed-fu (2.3.
9
)
activerecord (>= 3.1)
activerecord (>= 3.1)
activesupport (>= 3.1)
activesupport (>= 3.1)
select2-rails (3.5.
9.3
)
select2-rails (3.5.
10
)
thor (~> 0.14)
thor (~> 0.14)
selenium-webdriver (3.
5
.0)
selenium-webdriver (3.
11
.0)
childprocess (~> 0.5)
childprocess (~> 0.5)
rubyzip (~> 1.
0
)
rubyzip (~> 1.
2
)
sentry-raven (2.7.2)
sentry-raven (2.7.2)
faraday (>= 0.7.6, < 1.0)
faraday (>= 0.7.6, < 1.0)
settingslogic (2.0.9)
settingslogic (2.0.9)
sexp_processor (4.
9
.0)
sexp_processor (4.
11
.0)
sham_rack (1.3.6)
sham_rack (1.3.6)
rack
rack
shoulda-matchers (3.1.2)
shoulda-matchers (3.1.2)
activesupport (>= 4.0.0)
activesupport (>= 4.0.0)
sidekiq (5.
0.5
)
sidekiq (5.
1.3
)
concurrent-ruby (~> 1.0)
concurrent-ruby (~> 1.0)
connection_pool (~> 2.2, >= 2.2.0)
connection_pool (~> 2.2, >= 2.2.0)
rack-protection (>= 1.5.0)
rack-protection (>= 1.5.0)
redis (>= 3.3.
4
, < 5)
redis (>= 3.3.
5
, < 5)
sidekiq-cron (0.6.
0
)
sidekiq-cron (0.6.
3
)
rufus-scheduler (>= 3.3.0)
rufus-scheduler (>= 3.3.0)
sidekiq (>= 4.2.1)
sidekiq (>= 4.2.1)
sidekiq-limit_fetch (3.4.0)
sidekiq-limit_fetch (3.4.0)
...
@@ -869,15 +865,14 @@ GEM
...
@@ -869,15 +865,14 @@ GEM
faraday (~> 0.9)
faraday (~> 0.9)
jwt (>= 1.5, < 3.0)
jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
multi_json (~> 1.10)
simple_po_parser (1.1.
2
)
simple_po_parser (1.1.
3
)
simplecov (0.14.1)
simplecov (0.14.1)
docile (~> 1.1.0)
docile (~> 1.1.0)
json (>= 1.8, < 3)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.
0
)
simplecov-html (0.10.
2
)
slack-notifier (1.5.1)
slack-notifier (1.5.1)
slop (3.6.0)
spinach (0.10.1)
spinach (0.8.10)
colorize
colorize
gherkin-ruby (>= 0.3.2)
gherkin-ruby (>= 0.3.2)
json
json
...
@@ -887,7 +882,7 @@ GEM
...
@@ -887,7 +882,7 @@ GEM
spinach (>= 0.4)
spinach (>= 0.4)
spinach-rerun-reporter (0.0.2)
spinach-rerun-reporter (0.0.2)
spinach (~> 0.8)
spinach (~> 0.8)
spring (2.0.
1
)
spring (2.0.
2
)
activesupport (>= 4.2)
activesupport (>= 4.2)
spring-commands-rspec (1.0.4)
spring-commands-rspec (1.0.4)
spring (>= 0.9.1)
spring (>= 0.9.1)
...
@@ -902,7 +897,7 @@ GEM
...
@@ -902,7 +897,7 @@ GEM
sprockets (>= 3.0.0)
sprockets (>= 3.0.0)
sqlite3 (1.3.13)
sqlite3 (1.3.13)
sshkey (1.9.0)
sshkey (1.9.0)
stackprof (0.2.1
0
)
stackprof (0.2.1
1
)
state_machines (0.5.0)
state_machines (0.5.0)
state_machines-activemodel (0.5.1)
state_machines-activemodel (0.5.1)
activemodel (>= 4.1, < 6.0)
activemodel (>= 4.1, < 6.0)
...
@@ -911,7 +906,7 @@ GEM
...
@@ -911,7 +906,7 @@ GEM
activerecord (>= 4.1, < 6.0)
activerecord (>= 4.1, < 6.0)
state_machines-activemodel (>= 0.5.0)
state_machines-activemodel (>= 0.5.0)
stringex (2.8.4)
stringex (2.8.4)
sys-filesystem (1.1.
6
)
sys-filesystem (1.1.
9
)
ffi
ffi
sysexits (1.2.0)
sysexits (1.2.0)
temple (0.7.7)
temple (0.7.7)
...
@@ -919,13 +914,13 @@ GEM
...
@@ -919,13 +914,13 @@ GEM
test_after_commit (1.1.0)
test_after_commit (1.1.0)
activerecord (>= 3.2)
activerecord (>= 3.2)
text (1.3.1)
text (1.3.1)
thin (1.7.
0
)
thin (1.7.
2
)
daemons (~> 1.0, >= 1.0.9)
daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0, >= 1.0.4)
eventmachine (~> 1.0, >= 1.0.4)
rack (>= 1, < 3)
rack (>= 1, < 3)
thor (0.19.4)
thor (0.19.4)
thread_safe (0.3.6)
thread_safe (0.3.6)
tilt (2.0.
6
)
tilt (2.0.
8
)
timecop (0.8.1)
timecop (0.8.1)
timfel-krb5-auth (0.8.3)
timfel-krb5-auth (0.8.3)
toml (0.1.2)
toml (0.1.2)
...
@@ -962,7 +957,7 @@ GEM
...
@@ -962,7 +957,7 @@ GEM
parser (>= 2.3.1.2, < 2.6)
parser (>= 2.3.1.2, < 2.6)
procto (~> 0.0.2)
procto (~> 0.0.2)
url_safe_base64 (0.2.2)
url_safe_base64 (0.2.2)
validates_hostname (1.0.
6
)
validates_hostname (1.0.
8
)
activerecord (>= 3.0)
activerecord (>= 3.0)
activesupport (>= 3.0)
activesupport (>= 3.0)
version_sorter (2.1.0)
version_sorter (2.1.0)
...
@@ -972,13 +967,13 @@ GEM
...
@@ -972,13 +967,13 @@ GEM
descendants_tracker (~> 0.0, >= 0.0.3)
descendants_tracker (~> 0.0, >= 0.0.3)
equalizer (~> 0.0, >= 0.0.9)
equalizer (~> 0.0, >= 0.0.9)
vmstat (2.3.0)
vmstat (2.3.0)
warden (1.2.
6
)
warden (1.2.
7
)
rack (>= 1.0)
rack (>= 1.0)
webmock (2.3.2)
webmock (2.3.2)
addressable (>= 2.3.6)
addressable (>= 2.3.6)
crack (>= 0.3.2)
crack (>= 0.3.2)
hashdiff
hashdiff
webpack-rails (0.9.1
0
)
webpack-rails (0.9.1
1
)
railties (>= 3.2.0)
railties (>= 3.2.0)
wikicloth (0.8.1)
wikicloth (0.8.1)
builder
builder
...
@@ -986,8 +981,8 @@ GEM
...
@@ -986,8 +981,8 @@ GEM
rinku
rinku
with_env (1.1.0)
with_env (1.1.0)
xml-simple (1.1.5)
xml-simple (1.1.5)
xpath (
2.1
.0)
xpath (
3.0
.0)
nokogiri (~> 1.
3
)
nokogiri (~> 1.
8
)
PLATFORMS
PLATFORMS
ruby
ruby
...
...
app/assets/stylesheets/framework/wells.scss
View file @
5a34d3bd
...
@@ -19,6 +19,7 @@
...
@@ -19,6 +19,7 @@
.fork-svg
{
.fork-svg
{
margin-right
:
4px
;
margin-right
:
4px
;
vertical-align
:
bottom
;
}
}
}
}
...
...
app/assets/stylesheets/pages/commits.scss
View file @
5a34d3bd
...
@@ -70,7 +70,7 @@
...
@@ -70,7 +70,7 @@
}
}
.branch-info
.commit-icon
{
.branch-info
.commit-icon
{
margin-right
:
3
px
;
margin-right
:
8
px
;
svg
{
svg
{
top
:
3px
;
top
:
3px
;
...
...
app/helpers/commits_helper.rb
View file @
5a34d3bd
...
@@ -63,7 +63,7 @@ module CommitsHelper
...
@@ -63,7 +63,7 @@ module CommitsHelper
# Returns a link formatted as a commit branch link
# Returns a link formatted as a commit branch link
def
commit_branch_link
(
url
,
text
)
def
commit_branch_link
(
url
,
text
)
link_to
(
url
,
class:
'label label-gray ref-name branch-link'
)
do
link_to
(
url
,
class:
'label label-gray ref-name branch-link'
)
do
sprite_icon
(
'fork'
,
size:
1
6
,
css_class:
'fork-svg'
)
+
"
#{
text
}
"
sprite_icon
(
'fork'
,
size:
1
2
,
css_class:
'fork-svg'
)
+
"
#{
text
}
"
end
end
end
end
...
...
changelogs/unreleased/fix-size-and-position-for-fork-icon.yml
0 → 100644
View file @
5a34d3bd
---
title
:
Fix size and position for fork icon
merge_request
:
18399
author
:
George Tsiolis
type
:
fixed
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment