Skip to content

G
gitlab-ce
Commit 1c7372ad authored by Amit Rathi's avatar Amit Rathi
Browse files
Options

Merge branch 'master' into certmanager-temp

parents 9737cc8a af1ed0e2
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 5264 additions and 3160 deletions
.gitlab-ci.yml
View file @ 1c7372ad
This diff is collapsed.
.gitlab/issue_templates/Test plan.md
View file @ 1c7372ad
......@@ -64,7 +64,7 @@ Some features might be simple enough that they only involve one Component, while
more complex features could involve multiple or even all.
Example (from https://gitlab.com/gitlab-org/gitlab-ce/issues/50353):
* Respository is
* Repository is
* Intuitive
* It's easy to select the desired file template
* It doesn't require unnecessary actions to save the change
......@@ -93,4 +93,4 @@ When adding new automated tests, please keep [testing levels](https://docs.gitla
in mind.
-->
/label ~Quality ~"test plan"
\ No newline at end of file
/label ~Quality ~"test plan"
Gemfile
View file @ 1c7372ad
# --- Special code for migrating to Rails 5.0 ---
def rails5?
%w[1 true].include?(ENV["RAILS5"])
!%w[0 false].include?(ENV["RAILS5"])
end
gem_versions = {}
gem_versions['activerecord_sane_schema_dumper'] = rails5? ? '1.0' : '0.2'
gem_versions['default_value_for'] = rails5? ? '~> 3.0.5' : '~> 3.0.0'
gem_versions['rails'] = rails5? ? '5.0.7' : '4.2.10'
gem_versions['rails-i18n'] = rails5? ? '~> 5.1' : '~> 4.0.9'
gem_versions['activerecord_sane_schema_dumper'] = rails5? ? '1.0' : '0.2'
gem_versions['rails'] = rails5? ? '5.0.7' : '4.2.10'
gem_versions['rails-i18n'] = rails5? ? '~> 5.1' : '~> 4.0.9'
# --- The end of special code for migrating to Rails 5.0 ---
source 'https://rubygems.org'
......@@ -15,13 +14,20 @@ source 'https://rubygems.org'
gem 'rails', gem_versions['rails']
gem 'rails-deprecated_sanitizer', '~> 1.0.3'
# Improves copy-on-write performance for MRI
gem 'nakayoshi_fork', '~> 0.0.4'
# Responders respond_to and respond_with
gem 'responders', '~> 2.0'
gem 'sprockets', '~> 3.7.0'
# Default values for AR models
gem 'default_value_for', gem_versions['default_value_for']
if rails5?
gem 'gitlab-default_value_for', '~> 3.1.1', require: 'default_value_for'
else
gem 'default_value_for', '~> 3.0.0'
end
# Supported DBs
gem 'mysql2', '~> 0.4.10', group: :mysql
......@@ -133,7 +139,7 @@ gem 'rdoc', '~> 6.0'
gem 'org-ruby', '~> 0.9.12'
gem 'creole', '~> 0.5.0'
gem 'wikicloth', '0.8.1'
gem 'asciidoctor', '~> 1.5.6'
gem 'asciidoctor', '~> 1.5.8'
gem 'asciidoctor-plantuml', '0.0.8'
gem 'rouge', '~> 3.1'
gem 'truncato', '~> 0.7.9'
......@@ -223,7 +229,7 @@ gem 'slack-notifier', '~> 1.5.1'
gem 'hangouts-chat', '~> 0.0.5'
# Asana integration
gem 'asana', '~> 0.6.0'
gem 'asana', '~> 0.8.1'
# FogBugz integration
gem 'ruby-fogbugz', '~> 0.2.1'
......@@ -315,7 +321,7 @@ group :development do
# Better errors handler
gem 'better_errors', '~> 2.1.0'
gem 'binding_of_caller', '~> 0.7.2'
gem 'binding_of_caller', '~> 0.8.0'
# thin instead webrick
gem 'thin', '~> 1.7.0'
......@@ -364,7 +370,7 @@ group :development, :test do
gem 'benchmark-ips', '~> 2.3.0', require: false
gem 'license_finder', '~> 5.4', require: false
gem 'knapsack', '~> 1.16'
gem 'knapsack', '~> 1.17'
gem 'activerecord_sane_schema_dumper', gem_versions['activerecord_sane_schema_dumper']
......
Gemfile.lock
View file @ 1c7372ad
......@@ -4,41 +4,44 @@ GEM
RedCloth (4.3.2)
abstract_type (0.0.7)
ace-rails-ap (4.1.2)
actionmailer (4.2.10)
actionpack (= 4.2.10)
actionview (= 4.2.10)
activejob (= 4.2.10)
actioncable (5.0.7)
actionpack (= 5.0.7)
nio4r (>= 1.2, < 3.0)
websocket-driver (~> 0.6.1)
actionmailer (5.0.7)
actionpack (= 5.0.7)
actionview (= 5.0.7)
activejob (= 5.0.7)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.10)
actionview (= 4.2.10)
activesupport (= 4.2.10)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-dom-testing (~> 2.0)
actionpack (5.0.7)
actionview (= 5.0.7)
activesupport (= 5.0.7)
rack (~> 2.0)
rack-test (~> 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (4.2.10)
activesupport (= 4.2.10)
actionview (5.0.7)
activesupport (= 5.0.7)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (4.2.10)
activesupport (= 4.2.10)
globalid (>= 0.3.0)
activemodel (4.2.10)
activesupport (= 4.2.10)
builder (~> 3.1)
activerecord (4.2.10)
activemodel (= 4.2.10)
activesupport (= 4.2.10)
arel (~> 6.0)
activerecord_sane_schema_dumper (0.2)
rails (>= 4, < 5)
activesupport (4.2.10)
i18n (~> 0.7)
activejob (5.0.7)
activesupport (= 5.0.7)
globalid (>= 0.3.6)
activemodel (5.0.7)
activesupport (= 5.0.7)
activerecord (5.0.7)
activemodel (= 5.0.7)
activesupport (= 5.0.7)
arel (~> 7.0)
activerecord_sane_schema_dumper (1.0)
rails (>= 5, < 6)
activesupport (5.0.7)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
acts-as-taggable-on (5.0.0)
activerecord (>= 4.2.8)
......@@ -49,13 +52,13 @@ GEM
public_suffix (>= 2.0.2, < 4.0)
aes_key_wrap (1.0.1)
akismet (2.0.0)
arel (6.0.4)
asana (0.6.0)
arel (7.1.4)
asana (0.8.1)
faraday (~> 0.9)
faraday_middleware (~> 0.9)
faraday_middleware-multi_json (~> 0.0)
oauth2 (~> 1.0)
asciidoctor (1.5.6.2)
asciidoctor (1.5.8)
asciidoctor-plantuml (0.0.8)
asciidoctor (~> 1.5)
ast (2.4.0)
......@@ -79,7 +82,7 @@ GEM
erubis (>= 2.6.6)
rack (>= 0.9.0)
bindata (2.4.3)
binding_of_caller (0.7.2)
binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
bootsnap (1.3.2)
msgpack (~> 1.0)
......@@ -137,14 +140,12 @@ GEM
addressable
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)
descendants_tracker (0.0.4)
thread_safe (~> 0.3, >= 0.3.1)
device_detector (1.0.0)
......@@ -274,6 +275,8 @@ GEM
gitaly-proto (0.123.0)
grpc (~> 1.0)
github-markup (1.7.0)
gitlab-default_value_for (3.1.1)
activerecord (>= 3.2.0, < 6.0)
gitlab-markup (1.6.5)
gitlab-sidekiq-fetcher (0.3.0)
sidekiq (~> 5)
......@@ -376,7 +379,7 @@ GEM
json (~> 1.8)
multi_xml (>= 0.5.2)
httpclient (2.8.3)
i18n (0.9.5)
i18n (1.1.0)
concurrent-ruby (~> 1.0)
icalendar (2.4.1)
ice_nine (0.11.2)
......@@ -412,7 +415,7 @@ GEM
kaminari-core (= 1.0.1)
kaminari-core (1.0.1)
kgio (2.10.0)
knapsack (1.16.0)
knapsack (1.17.0)
rake
kubeclient (3.1.0)
http (~> 2.2.2)
......@@ -467,9 +470,11 @@ GEM
mustermann-grape (1.0.0)
mustermann (~> 1.0.0)
mysql2 (0.4.10)
nakayoshi_fork (0.0.4)
net-ldap (0.16.0)
net-ssh (5.0.1)
netrc (0.11.0)
nio4r (2.3.1)
nokogiri (1.8.4)
mini_portile2 (~> 2.3.0)
nokogumbo (1.5.0)
......@@ -598,7 +603,7 @@ GEM
get_process_mem (~> 0.2)
puma (>= 2.7, < 4)
pyu-ruby-sasl (0.0.3.3)
rack (1.6.11)
rack (2.0.5)
rack-accept (0.4.5)
rack (>= 0.4)
rack-attack (4.4.1)
......@@ -616,31 +621,36 @@ GEM
rack
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.10)
actionmailer (= 4.2.10)
actionpack (= 4.2.10)
actionview (= 4.2.10)
activejob (= 4.2.10)
activemodel (= 4.2.10)
activerecord (= 4.2.10)
activesupport (= 4.2.10)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.10)
sprockets-rails
rails (5.0.7)
actioncable (= 5.0.7)
actionmailer (= 5.0.7)
actionpack (= 5.0.7)
actionview (= 5.0.7)
activejob (= 5.0.7)
activemodel (= 5.0.7)
activerecord (= 5.0.7)
activesupport (= 5.0.7)
bundler (>= 1.3.0)
railties (= 5.0.7)
sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.2)
actionpack (~> 5.x, >= 5.0.1)
actionview (~> 5.x, >= 5.0.1)
activesupport (~> 5.x)
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.9)
activesupport (>= 4.2.0, < 5.0)
nokogiri (~> 1.6)
rails-deprecated_sanitizer (>= 1.0.1)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
rails-i18n (4.0.9)
i18n (~> 0.7)
railties (~> 4.0)
railties (4.2.10)
actionpack (= 4.2.10)
activesupport (= 4.2.10)
rails-i18n (5.1.1)
i18n (>= 0.7, < 2)
railties (>= 5.0, < 6)
railties (5.0.7)
actionpack (= 5.0.7)
activesupport (= 5.0.7)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (3.0.0)
......@@ -731,8 +741,7 @@ GEM
rspec-core
rspec-set (0.1.3)
rspec-support (3.7.1)
rspec_junit_formatter (0.2.3)
builder (< 4)
rspec_junit_formatter (0.4.1)
rspec-core (>= 2, < 4, != 2.12.0)
rspec_profiling (0.0.5)
activerecord
......@@ -849,8 +858,6 @@ GEM
sysexits (1.2.0)
temple (0.8.0)
test-prof (0.2.5)
test_after_commit (1.1.0)
activerecord (>= 3.2)
text (1.3.1)
thin (1.7.2)
daemons (~> 1.0, >= 1.0.9)
......@@ -913,6 +920,9 @@ GEM
hashdiff
webpack-rails (0.9.11)
railties (>= 3.2.0)
websocket-driver (0.6.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.3)
wikicloth (0.8.1)
builder
expression_parser
......@@ -928,12 +938,12 @@ PLATFORMS
DEPENDENCIES
RedCloth (~> 4.3.2)
ace-rails-ap (~> 4.1.0)
activerecord_sane_schema_dumper (= 0.2)
activerecord_sane_schema_dumper (= 1.0)
acts-as-taggable-on (~> 5.0)
addressable (~> 2.5.2)
akismet (~> 2.0)
asana (~> 0.6.0)
asciidoctor (~> 1.5.6)
asana (~> 0.8.1)
asciidoctor (~> 1.5.8)
asciidoctor-plantuml (= 0.0.8)
attr_encrypted (~> 3.1.0)
awesome_print
......@@ -943,7 +953,7 @@ DEPENDENCIES
bcrypt_pbkdf (~> 1.0)
benchmark-ips (~> 2.3.0)
better_errors (~> 2.1.0)
binding_of_caller (~> 0.7.2)
binding_of_caller (~> 0.8.0)
bootsnap (~> 1.3)
bootstrap_form (~> 2.7.0)
brakeman (~> 4.2)
......@@ -962,7 +972,6 @@ DEPENDENCIES
creole (~> 0.5.0)
database_cleaner (~> 1.5.0)
deckar01-task_list (= 2.0.0)
default_value_for (~> 3.0.0)
device_detector
devise (~> 4.4)
devise-two-factor (~> 3.0.0)
......@@ -998,6 +1007,7 @@ DEPENDENCIES
gettext_i18n_rails_js (~> 1.3)
gitaly-proto (~> 0.123.0)
github-markup (~> 1.7.0)
gitlab-default_value_for (~> 3.1.1)
gitlab-markup (~> 1.6.5)
gitlab-sidekiq-fetcher
gitlab-styles (~> 2.4)
......@@ -1030,7 +1040,7 @@ DEPENDENCIES
json-schema (~> 2.8.0)
jwt (~> 1.5.6)
kaminari (~> 1.0)
knapsack (~> 1.16)
knapsack (~> 1.17)
kubeclient (~> 3.1.0)
letter_opener_web (~> 1.3.0)
license_finder (~> 5.4)
......@@ -1042,6 +1052,7 @@ DEPENDENCIES
mini_magick
minitest (~> 5.7.0)
mysql2 (~> 0.4.10)
nakayoshi_fork (~> 0.0.4)
net-ldap
net-ssh (~> 5.0)
nokogiri (~> 1.8.2)
......@@ -1080,9 +1091,10 @@ DEPENDENCIES
rack-cors (~> 1.0.0)
rack-oauth2 (~> 1.2.1)
rack-proxy (~> 0.6.0)
rails (= 4.2.10)
rails (= 5.0.7)
rails-controller-testing
rails-deprecated_sanitizer (~> 1.0.3)
rails-i18n (~> 4.0.9)
rails-i18n (~> 5.1)
rainbow (~> 3.0)
raindrops (~> 0.18)
rblineprof (~> 0.3.6)
......@@ -1135,7 +1147,6 @@ DEPENDENCIES
state_machines-activerecord (~> 0.5.1)
sys-filesystem (~> 1.1.6)
test-prof (~> 0.2.5)
test_after_commit (~> 1.1)
thin (~> 1.7.0)
timecop (~> 0.8.0)
toml-rb (~> 1.0.0)
......
Gemfile.rails5 → Gemfile.rails4
View file @ 1c7372ad
# BUNDLE_GEMFILE=Gemfile.rails5 bundle install
# BUNDLE_GEMFILE=Gemfile.rails4 bundle install
ENV["RAILS5"] = "true"
ENV["RAILS5"] = "false"
gemfile = File.expand_path("../Gemfile", __FILE__)
......
Gemfile.rails5.lock → Gemfile.rails4.lock
View file @ 1c7372ad
......@@ -4,44 +4,41 @@ GEM
RedCloth (4.3.2)
abstract_type (0.0.7)
ace-rails-ap (4.1.2)
actioncable (5.0.7)
actionpack (= 5.0.7)
nio4r (>= 1.2, < 3.0)
websocket-driver (~> 0.6.1)
actionmailer (5.0.7)
actionpack (= 5.0.7)
actionview (= 5.0.7)
activejob (= 5.0.7)
actionmailer (4.2.10)
actionpack (= 4.2.10)
actionview (= 4.2.10)
activejob (= 4.2.10)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.0.7)
actionview (= 5.0.7)
activesupport (= 5.0.7)
rack (~> 2.0)
rack-test (~> 0.6.3)
rails-dom-testing (~> 2.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.10)
actionview (= 4.2.10)
activesupport (= 4.2.10)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.0.7)
activesupport (= 5.0.7)
actionview (4.2.10)
activesupport (= 4.2.10)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 2.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.0.7)
activesupport (= 5.0.7)
globalid (>= 0.3.6)
activemodel (5.0.7)
activesupport (= 5.0.7)
activerecord (5.0.7)
activemodel (= 5.0.7)
activesupport (= 5.0.7)
arel (~> 7.0)
activerecord_sane_schema_dumper (1.0)
rails (>= 5, < 6)
activesupport (5.0.7)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
activejob (4.2.10)
activesupport (= 4.2.10)
globalid (>= 0.3.0)
activemodel (4.2.10)
activesupport (= 4.2.10)
builder (~> 3.1)
activerecord (4.2.10)
activemodel (= 4.2.10)
activesupport (= 4.2.10)
arel (~> 6.0)
activerecord_sane_schema_dumper (0.2)
rails (>= 4, < 5)
activesupport (4.2.10)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
acts-as-taggable-on (5.0.0)
activerecord (>= 4.2.8)
......@@ -52,13 +49,13 @@ GEM
public_suffix (>= 2.0.2, < 4.0)
aes_key_wrap (1.0.1)
akismet (2.0.0)
arel (7.1.4)
asana (0.6.0)
arel (6.0.4)
asana (0.8.1)
faraday (~> 0.9)
faraday_middleware (~> 0.9)
faraday_middleware-multi_json (~> 0.0)
oauth2 (~> 1.0)
asciidoctor (1.5.6.2)
asciidoctor (1.5.8)
asciidoctor-plantuml (0.0.8)
asciidoctor (~> 1.5)
ast (2.4.0)
......@@ -82,7 +79,7 @@ GEM
erubis (>= 2.6.6)
rack (>= 0.9.0)
bindata (2.4.3)
binding_of_caller (0.7.2)
binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
bootsnap (1.3.2)
msgpack (~> 1.0)
......@@ -140,14 +137,14 @@ GEM
addressable
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.5)
activerecord (>= 3.2.0, < 5.2)
default_value_for (3.0.2)
activerecord (>= 3.2.0, < 5.1)
descendants_tracker (0.0.4)
thread_safe (~> 0.3, >= 0.3.1)
device_detector (1.0.0)
......@@ -379,7 +376,7 @@ GEM
json (~> 1.8)
multi_xml (>= 0.5.2)
httpclient (2.8.3)
i18n (1.1.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
icalendar (2.4.1)
ice_nine (0.11.2)
......@@ -415,7 +412,7 @@ GEM
kaminari-core (= 1.0.1)
kaminari-core (1.0.1)
kgio (2.10.0)
knapsack (1.16.0)
knapsack (1.17.0)
rake
kubeclient (3.1.0)
http (~> 2.2.2)
......@@ -454,9 +451,9 @@ GEM
memoizable (0.4.2)
thread_safe (~> 0.3, >= 0.3.1)
method_source (0.9.0)
mime-types (3.1)
mime-types (3.2.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mime-types-data (3.2018.0812)
mimemagic (0.3.0)
mini_magick (4.8.0)
mini_mime (1.0.1)
......@@ -470,10 +467,10 @@ GEM
mustermann-grape (1.0.0)
mustermann (~> 1.0.0)
mysql2 (0.4.10)
nakayoshi_fork (0.0.4)
net-ldap (0.16.0)
net-ssh (5.0.1)
netrc (0.11.0)
nio4r (2.3.1)
nokogiri (1.8.4)
mini_portile2 (~> 2.3.0)
nokogumbo (1.5.0)
......@@ -602,7 +599,7 @@ GEM
get_process_mem (~> 0.2)
puma (>= 2.7, < 4)
pyu-ruby-sasl (0.0.3.3)
rack (2.0.5)
rack (1.6.11)
rack-accept (0.4.5)
rack (>= 0.4)
rack-attack (4.4.1)
......@@ -620,36 +617,31 @@ GEM
rack
rack-test (0.6.3)
rack (>= 1.0)
rails (5.0.7)
actioncable (= 5.0.7)
actionmailer (= 5.0.7)
actionpack (= 5.0.7)
actionview (= 5.0.7)
activejob (= 5.0.7)
activemodel (= 5.0.7)
activerecord (= 5.0.7)
activesupport (= 5.0.7)
bundler (>= 1.3.0)
railties (= 5.0.7)
sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.2)
actionpack (~> 5.x, >= 5.0.1)
actionview (~> 5.x, >= 5.0.1)
activesupport (~> 5.x)
rails (4.2.10)
actionmailer (= 4.2.10)
actionpack (= 4.2.10)
actionview (= 4.2.10)
activejob (= 4.2.10)
activemodel (= 4.2.10)
activerecord (= 4.2.10)
activesupport (= 4.2.10)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.10)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-dom-testing (1.0.9)
activesupport (>= 4.2.0, < 5.0)
nokogiri (~> 1.6)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
rails-i18n (5.1.1)
i18n (>= 0.7, < 2)
railties (>= 5.0, < 6)
railties (5.0.7)
actionpack (= 5.0.7)
activesupport (= 5.0.7)
method_source
rails-i18n (4.0.9)
i18n (~> 0.7)
railties (~> 4.0)
railties (4.2.10)
actionpack (= 4.2.10)
activesupport (= 4.2.10)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (3.0.0)
......@@ -740,7 +732,8 @@ GEM
rspec-core
rspec-set (0.1.3)
rspec-support (3.7.1)
rspec_junit_formatter (0.4.1)
rspec_junit_formatter (0.2.3)
builder (< 4)
rspec-core (>= 2, < 4, != 2.12.0)
rspec_profiling (0.0.5)
activerecord
......@@ -857,6 +850,8 @@ GEM
sysexits (1.2.0)
temple (0.8.0)
test-prof (0.2.5)
test_after_commit (1.1.0)
activerecord (>= 3.2)
text (1.3.1)
thin (1.7.2)
daemons (~> 1.0, >= 1.0.9)
......@@ -919,9 +914,6 @@ GEM
hashdiff
webpack-rails (0.9.11)
railties (>= 3.2.0)
websocket-driver (0.6.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.3)
wikicloth (0.8.1)
builder
expression_parser
......@@ -937,12 +929,12 @@ PLATFORMS
DEPENDENCIES
RedCloth (~> 4.3.2)
ace-rails-ap (~> 4.1.0)
activerecord_sane_schema_dumper (= 1.0)
activerecord_sane_schema_dumper (= 0.2)
acts-as-taggable-on (~> 5.0)
addressable (~> 2.5.2)
akismet (~> 2.0)
asana (~> 0.6.0)
asciidoctor (~> 1.5.6)
asana (~> 0.8.1)
asciidoctor (~> 1.5.8)
asciidoctor-plantuml (= 0.0.8)
attr_encrypted (~> 3.1.0)
awesome_print
......@@ -952,7 +944,7 @@ DEPENDENCIES
bcrypt_pbkdf (~> 1.0)
benchmark-ips (~> 2.3.0)
better_errors (~> 2.1.0)
binding_of_caller (~> 0.7.2)
binding_of_caller (~> 0.8.0)
bootsnap (~> 1.3)
bootstrap_form (~> 2.7.0)
brakeman (~> 4.2)
......@@ -971,7 +963,7 @@ DEPENDENCIES
creole (~> 0.5.0)
database_cleaner (~> 1.5.0)
deckar01-task_list (= 2.0.0)
default_value_for (~> 3.0.5)
default_value_for (~> 3.0.0)
device_detector
devise (~> 4.4)
devise-two-factor (~> 3.0.0)
......@@ -1039,7 +1031,7 @@ DEPENDENCIES
json-schema (~> 2.8.0)
jwt (~> 1.5.6)
kaminari (~> 1.0)
knapsack (~> 1.16)
knapsack (~> 1.17)
kubeclient (~> 3.1.0)
letter_opener_web (~> 1.3.0)
license_finder (~> 5.4)
......@@ -1051,6 +1043,7 @@ DEPENDENCIES
mini_magick
minitest (~> 5.7.0)
mysql2 (~> 0.4.10)
nakayoshi_fork (~> 0.0.4)
net-ldap
net-ssh (~> 5.0)
nokogiri (~> 1.8.2)
......@@ -1089,10 +1082,9 @@ DEPENDENCIES
rack-cors (~> 1.0.0)
rack-oauth2 (~> 1.2.1)
rack-proxy (~> 0.6.0)
rails (= 5.0.7)
rails-controller-testing
rails (= 4.2.10)
rails-deprecated_sanitizer (~> 1.0.3)
rails-i18n (~> 5.1)
rails-i18n (~> 4.0.9)
rainbow (~> 3.0)
raindrops (~> 0.18)
rblineprof (~> 0.3.6)
......@@ -1145,6 +1137,7 @@ DEPENDENCIES
state_machines-activerecord (~> 0.5.1)
sys-filesystem (~> 1.1.6)
test-prof (~> 0.2.5)
test_after_commit (~> 1.1)
thin (~> 1.7.0)
timecop (~> 0.8.0)
toml-rb (~> 1.0.0)
......
app/assets/javascripts/badges/components/badge.vue
View file @ 1c7372ad
<script>
import Icon from '~/vue_shared/components/icon.vue';
import Tooltip from '~/vue_shared/directives/tooltip';
import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
import { GlLoadingIcon } from '@gitlab/ui';
export default {
name: 'Badge',
......
app/assets/javascripts/badges/components/badge_form.vue
View file @ 1c7372ad
......@@ -4,7 +4,7 @@ import { mapActions, mapState } from 'vuex';
import createFlash from '~/flash';
import { s__, sprintf } from '~/locale';
import LoadingButton from '~/vue_shared/components/loading_button.vue';
import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
import { GlLoadingIcon } from '@gitlab/ui';
import createEmptyBadge from '../empty_badge';
import Badge from './badge.vue';
......
app/assets/javascripts/badges/components/badge_list.vue
View file @ 1c7372ad
<script>
import { mapState } from 'vuex';
import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
import { GlLoadingIcon } from '@gitlab/ui';
import BadgeListRow from './badge_list_row.vue';
import { GROUP_BADGE } from '../constants';
......
app/assets/javascripts/badges/components/badge_list_row.vue
View file @ 1c7372ad
......@@ -2,7 +2,7 @@
import { mapActions, mapState } from 'vuex';
import { s__ } from '~/locale';
import Icon from '~/vue_shared/components/icon.vue';
import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
import { GlLoadingIcon } from '@gitlab/ui';
import { PROJECT_BADGE } from '../constants';
import Badge from './badge.vue';
......
app/assets/javascripts/boards/components/board_list.vue
View file @ 1c7372ad
<script>
import Sortable from 'sortablejs';
import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
import { GlLoadingIcon } from '@gitlab/ui';
import boardNewIssue from './board_new_issue.vue';
import boardCard from './board_card.vue';
import eventHub from '../eventhub';
......
app/assets/javascripts/boards/components/board_new_issue.vue
View file @ 1c7372ad
<script>
import $ from 'jquery';
import { GlButton } from '@gitlab-org/gitlab-ui';
import { GlButton } from '@gitlab/ui';
import eventHub from '../eventhub';
import ProjectSelect from './project_select.vue';
import ListIssue from '../models/issue';
......
app/assets/javascripts/boards/components/issue_card_inner.vue
View file @ 1c7372ad
<script>
import { GlTooltipDirective } from '@gitlab-org/gitlab-ui';
import { GlTooltipDirective } from '@gitlab/ui';
import { sprintf, __ } from '~/locale';
import Icon from '~/vue_shared/components/icon.vue';
import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate.vue';
......@@ -231,7 +231,7 @@ export default {
>
<span class="js-assignee-tooltip">
<span class="bold d-block">Assignee</span>
{{ assignee.name }}
{{ assignee.name }}
<span class="text-white-50">@{{ assignee.username }}</span>
</span>
</user-avatar-link>
......
app/assets/javascripts/boards/components/issue_due_date.vue
View file @ 1c7372ad
<script>
import dateFormat from 'dateformat';
import { GlTooltip } from '@gitlab-org/gitlab-ui';
import { GlTooltip } from '@gitlab/ui';
import Icon from '~/vue_shared/components/icon.vue';
import { __ } from '~/locale';
import { getDayDifference, getTimeago, dateInWords } from '~/lib/utils/datetime_utility';
......
app/assets/javascripts/boards/components/issue_time_estimate.vue
View file @ 1c7372ad
<script>
import { GlTooltip } from '@gitlab-org/gitlab-ui';
import { GlTooltip } from '@gitlab/ui';
import Icon from '~/vue_shared/components/icon.vue';
import { parseSeconds, stringifyTime } from '~/lib/utils/datetime_utility';
......
app/assets/javascripts/boards/components/modal/index.vue
View file @ 1c7372ad
......@@ -6,7 +6,7 @@ import ModalList from './list.vue';
import ModalFooter from './footer.vue';
import EmptyState from './empty_state.vue';
import ModalStore from '../../stores/modal_store';
import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
import { GlLoadingIcon } from '@gitlab/ui';
export default {
components: {
......
app/assets/javascripts/boards/components/modal/lists_dropdown.vue
View file @ 1c7372ad
<script>
import { GlLink } from '@gitlab-org/gitlab-ui';
import { GlLink } from '@gitlab/ui';
import Icon from '~/vue_shared/components/icon.vue';
import ModalStore from '../../stores/modal_store';
import boardsStore from '../../stores/boards_store';
......
app/assets/javascripts/boards/components/project_select.vue
View file @ 1c7372ad
......@@ -2,7 +2,7 @@
import $ from 'jquery';
import _ from 'underscore';
import Icon from '~/vue_shared/components/icon.vue';
import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
import { GlLoadingIcon } from '@gitlab/ui';
import eventHub from '../eventhub';
import Api from '../../api';
......
app/assets/javascripts/deploy_keys/components/action_btn.vue
View file @ 1c7372ad
<script>
import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
import { GlLoadingIcon } from '@gitlab/ui';
import eventHub from '../eventhub';
export default {
......
app/assets/javascripts/deploy_keys/components/app.vue
View file @ 1c7372ad
......@@ -6,7 +6,7 @@ import eventHub from '../eventhub';
import DeployKeysService from '../service';
import DeployKeysStore from '../store';
import KeysPanel from './keys_panel.vue';
import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
import { GlLoadingIcon } from '@gitlab/ui';
export default {
components: {
......
app/assets/javascripts/diffs/components/app.vue
View file @ 1c7372ad
......@@ -3,7 +3,7 @@ import { mapState, mapGetters, mapActions } from 'vuex';
import Icon from '~/vue_shared/components/icon.vue';
import { __ } from '~/locale';
import createFlash from '~/flash';
import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
import { GlLoadingIcon } from '@gitlab/ui';
import eventHub from '../../notes/event_hub';
import CompareVersions from './compare_versions.vue';
import DiffFile from './diff_file.vue';
......@@ -94,7 +94,7 @@ export default {
return __('Show latest version');
},
canCurrentUserFork() {
return this.currentUser.canFork === true && this.currentUser.canCreateMergeRequest;
return this.currentUser.can_fork === true && this.currentUser.can_create_merge_request;
},
showCompareVersions() {
return this.mergeRequestDiffs && this.mergeRequestDiff;
......
app/assets/javascripts/diffs/components/commit_item.vue
View file @ 1c7372ad
......@@ -40,15 +40,17 @@ export default {
},
computed: {
authorName() {
return (this.commit.author && this.commit.author.name) || this.commit.authorName;
return (this.commit.author && this.commit.author.name) || this.commit.author_name;
},
authorUrl() {
return (
(this.commit.author && this.commit.author.webUrl) || `mailto:${this.commit.authorEmail}`
(this.commit.author && this.commit.author.web_url) || `mailto:${this.commit.author_email}`
);
},
authorAvatar() {
return (this.commit.author && this.commit.author.avatarUrl) || this.commit.authorGravatarUrl;
return (
(this.commit.author && this.commit.author.avatar_url) || this.commit.author_gravatar_url
);
},
},
};
......@@ -66,18 +68,18 @@ export default {
<div class="commit-detail flex-list">
<div class="commit-content qa-commit-content">
<a
:href="commit.commitUrl"
:href="commit.commit_url"
class="commit-row-message item-title"
v-html="commit.titleHtml"
v-html="commit.title_html"
></a>
<span class="commit-row-message d-block d-sm-none">
&middot;
{{ commit.shortId }}
{{ commit.short_id }}
</span>
<button
v-if="commit.descriptionHtml"
v-if="commit.description_html"
class="text-expander js-toggle-button"
type="button"
:aria-label="__('Toggle commit description')"
......@@ -95,29 +97,29 @@ export default {
></a>
{{ s__('CommitWidget|authored') }}
<time-ago-tooltip
:time="commit.authoredDate"
:time="commit.authored_date"
/>
</div>
<pre
v-if="commit.descriptionHtml"
v-if="commit.description_html"
class="commit-row-description js-toggle-content append-bottom-8"
v-html="commit.descriptionHtml"
v-html="commit.description_html"
></pre>
</div>
<div class="commit-actions flex-row d-none d-sm-flex">
<div
v-if="commit.signatureHtml"
v-html="commit.signatureHtml"
v-if="commit.signature_html"
v-html="commit.signature_html"
></div>
<commit-pipeline-status
v-if="commit.pipelineStatusPath"
:endpoint="commit.pipelineStatusPath"
v-if="commit.pipeline_status_path"
:endpoint="commit.pipeline_status_path"
/>
<div class="commit-sha-group">
<div
class="label label-monospace"
v-text="commit.shortId"
v-text="commit.short_id"
></div>
<clipboard-button
:text="commit.id"
......
app/assets/javascripts/diffs/components/compare_versions.vue
View file @ 1c7372ad
<script>
import { mapActions, mapGetters, mapState } from 'vuex';
import Tooltip from '@gitlab-org/gitlab-ui/dist/directives/tooltip';
import Tooltip from '@gitlab/ui/dist/directives/tooltip';
import { __ } from '~/locale';
import { getParameterValues, mergeUrlParams } from '~/lib/utils/url_utility';
import Icon from '~/vue_shared/components/icon.vue';
......
app/assets/javascripts/diffs/components/compare_versions_dropdown.vue
View file @ 1c7372ad
......@@ -56,16 +56,16 @@ export default {
methods: {
commitsText(version) {
return n__(
`${version.commitsCount} commit,`,
`${version.commitsCount} commits,`,
version.commitsCount,
`${version.commits_count} commit,`,
`${version.commits_count} commits,`,
version.commits_count,
);
},
href(version) {
if (this.showCommitCount) {
return version.versionPath;
return version.version_path;
}
return version.comparePath;
return version.compare_path;
},
versionName(version) {
if (this.isLatest(version)) {
......@@ -74,7 +74,7 @@ export default {
if (this.targetBranch && (this.isBase(version) || !version)) {
return this.targetBranch.branchName;
}
return `version ${version.versionIndex}`;
return `version ${version.version_index}`;
},
isActive(version) {
if (!version) {
......@@ -84,11 +84,11 @@ export default {
if (this.targetBranch) {
return (
(this.isBase(version) && !this.startVersion) ||
(this.startVersion && this.startVersion.versionIndex === version.versionIndex)
(this.startVersion && this.startVersion.version_index === version.version_index)
);
}
return version.versionIndex === this.mergeRequestVersion.versionIndex;
return version.version_index === this.mergeRequestVersion.version_index;
},
isBase(version) {
if (!version || !this.targetBranch) {
......@@ -98,7 +98,7 @@ export default {
},
isLatest(version) {
return (
this.mergeRequestVersion && version.versionIndex === this.targetVersions[0].versionIndex
this.mergeRequestVersion && version.version_index === this.targetVersions[0].version_index
);
},
},
......@@ -142,7 +142,7 @@ export default {
</div>
<div>
<small class="commit-sha">
{{ version.truncatedCommitSha }}
{{ version.truncated_commit_sha }}
</small>
</div>
<div>
......@@ -151,8 +151,8 @@ export default {
{{ commitsText(version) }}
</template>
<time-ago
v-if="version.createdAt"
:time="version.createdAt"
v-if="version.created_at"
:time="version.created_at"
class="js-timeago js-timeago-render"
/>
</small>
......
app/assets/javascripts/diffs/components/diff_content.vue
View file @ 1c7372ad
......@@ -39,7 +39,7 @@ export default {
return this.diffFile.viewer.name === 'text';
},
diffFileCommentForm() {
return this.getCommentFormForDiffFile(this.diffFile.fileHash);
return this.getCommentFormForDiffFile(this.diffFile.file_hash);
},
showNotesContainer() {
return this.diffFile.discussions.length || this.diffFileCommentForm;
......@@ -73,28 +73,28 @@ export default {
<inline-diff-view
v-if="isInlineView"
:diff-file="diffFile"
:diff-lines="diffFile.highlightedDiffLines || []"
:diff-lines="diffFile.highlighted_diff_lines || []"
/>
<parallel-diff-view
v-if="isParallelView"
:diff-file="diffFile"
:diff-lines="diffFile.parallelDiffLines || []"
:diff-lines="diffFile.parallel_diff_lines || []"
/>
</template>
<diff-viewer
v-else
:diff-mode="diffMode"
:new-path="diffFile.newPath"
:new-sha="diffFile.diffRefs.headSha"
:old-path="diffFile.oldPath"
:old-sha="diffFile.diffRefs.baseSha"
:file-hash="diffFile.fileHash"
:new-path="diffFile.new_path"
:new-sha="diffFile.diff_refs.head_sha"
:old-path="diffFile.old_path"
:old-sha="diffFile.diff_refs.base_sha"
:file-hash="diffFile.file_hash"
:project-path="projectPath"
>
<image-diff-overlay
slot="image-overlay"
:discussions="diffFile.discussions"
:file-hash="diffFile.fileHash"
:file-hash="diffFile.file_hash"
:can-comment="getNoteableData.current_user.can_create_note"
/>
<div
......@@ -115,7 +115,7 @@ export default {
:save-button-title="__('Comment')"
class="diff-comment-form new-note discussion-form discussion-form-container"
@handleFormUpdate="handleSaveNote"
@cancelForm="closeDiffFileCommentForm(diffFile.fileHash)"
@cancelForm="closeDiffFileCommentForm(diffFile.file_hash)"
/>
</div>
</diff-viewer>
......
app/assets/javascripts/diffs/components/diff_file.vue
View file @ 1c7372ad
......@@ -3,7 +3,7 @@ import { mapActions, mapGetters, mapState } from 'vuex';
import _ from 'underscore';
import { __, sprintf } from '~/locale';
import createFlash from '~/flash';
import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
import { GlLoadingIcon } from '@gitlab/ui';
import DiffFileHeader from './diff_file_header.vue';
import DiffContent from './diff_content.vue';
......@@ -32,6 +32,7 @@ export default {
computed: {
...mapState('diffs', ['currentDiffFileId']),
...mapGetters(['isNotesFetched']),
...mapGetters('diffs', ['getDiffFileDiscussions']),
isCollapsed() {
return this.file.collapsed || false;
},
......@@ -39,7 +40,7 @@ export default {
return sprintf(
__('You can %{linkStart}view the blob%{linkEnd} instead.'),
{
linkStart: `<a href="${_.escape(this.file.viewPath)}">`,
linkStart: `<a href="${_.escape(this.file.view_path)}">`,
linkEnd: '</a>',
},
false,
......@@ -48,21 +49,34 @@ export default {
showExpandMessage() {
return (
this.isCollapsed ||
(!this.file.highlightedDiffLines &&
(!this.file.highlighted_diff_lines &&
!this.isLoadingCollapsedDiff &&
!this.file.tooLarge &&
!this.file.too_large &&
this.file.text)
);
},
showLoadingIcon() {
return this.isLoadingCollapsedDiff || (!this.file.renderIt && !this.isCollapsed);
},
hasDiffLines() {
return (
this.file.highlighted_diff_lines &&
this.file.parallel_diff_lines &&
this.file.parallel_diff_lines.length > 0
);
},
},
watch: {
'file.collapsed': function fileCollapsedWatch(newVal, oldVal) {
if (!newVal && oldVal && !this.hasDiffLines) {
this.handleLoadCollapsedDiff();
}
},
},
methods: {
...mapActions('diffs', ['loadCollapsedDiff', 'assignDiscussionsToDiff']),
handleToggle() {
const { highlightedDiffLines, parallelDiffLines } = this.file;
if (!highlightedDiffLines && parallelDiffLines !== undefined && !parallelDiffLines.length) {
if (!this.hasDiffLines) {
this.handleLoadCollapsedDiff();
} else {
this.file.collapsed = !this.file.collapsed;
......@@ -81,7 +95,7 @@ export default {
.then(() => {
requestIdleCallback(
() => {
this.assignDiscussionsToDiff();
this.assignDiscussionsToDiff(this.getDiffFileDiscussions(this.file));
},
{ timeout: 1000 },
);
......@@ -103,9 +117,9 @@ export default {
<template>
<div
:id="file.fileHash"
:id="file.file_hash"
:class="{
'is-active': currentDiffFileId === file.fileHash
'is-active': currentDiffFileId === file.file_hash
}"
class="diff-file file-holder"
>
......@@ -129,7 +143,7 @@ export default {
make your changes there, and submit a merge request.
</span>
<a
:href="file.forkPath"
:href="file.fork_path"
class="js-fork-suggestion-button btn btn-grouped btn-inverted btn-success"
>
Fork
......@@ -145,7 +159,7 @@ export default {
<diff-content
v-if="!isCollapsed && file.renderIt"
:class="{ hidden: isCollapsed || file.tooLarge }"
:class="{ hidden: isCollapsed || file.too_large }"
:diff-file="file"
/>
<gl-loading-icon
......@@ -166,7 +180,7 @@ export default {
</a>
</div>
<div
v-if="file.tooLarge"
v-if="file.too_large"
class="nothing-here-block diff-collapsed js-too-large-diff"
>
{{ __('This source diff could not be displayed because it is too large.') }}
......
app/assets/javascripts/diffs/components/diff_file_header.vue
View file @ 1c7372ad
......@@ -68,32 +68,32 @@ export default {
},
titleLink() {
if (this.diffFile.submodule) {
return this.diffFile.submoduleTreeUrl || this.diffFile.submoduleLink;
return this.diffFile.submodule_tree_url || this.diffFile.submodule_link;
}
return this.discussionPath;
},
filePath() {
if (this.diffFile.submodule) {
return `${this.diffFile.filePath} @ ${truncateSha(this.diffFile.blob.id)}`;
return `${this.diffFile.file_path} @ ${truncateSha(this.diffFile.blob.id)}`;
}
if (this.diffFile.deletedFile) {
return sprintf(__('%{filePath} deleted'), { filePath: this.diffFile.filePath }, false);
if (this.diffFile.deleted_file) {
return sprintf(__('%{filePath} deleted'), { filePath: this.diffFile.file_path }, false);
}
return this.diffFile.filePath;
return this.diffFile.file_path;
},
titleTag() {
return this.diffFile.fileHash ? 'a' : 'span';
return this.diffFile.file_hash ? 'a' : 'span';
},
isUsingLfs() {
return this.diffFile.storedExternally && this.diffFile.externalStorage === 'lfs';
return this.diffFile.stored_externally && this.diffFile.external_storage === 'lfs';
},
collapseIcon() {
return this.expanded ? 'chevron-down' : 'chevron-right';
},
viewFileButtonText() {
const truncatedContentSha = _.escape(truncateSha(this.diffFile.contentSha));
const truncatedContentSha = _.escape(truncateSha(this.diffFile.content_sha));
return sprintf(
s__('MergeRequests|View file @ %{commitId}'),
{
......@@ -103,7 +103,7 @@ export default {
);
},
viewReplacedFileButtonText() {
const truncatedBaseSha = _.escape(truncateSha(this.diffFile.diffRefs.baseSha));
const truncatedBaseSha = _.escape(truncateSha(this.diffFile.diff_refs.base_sha));
return sprintf(
s__('MergeRequests|View replaced file @ %{commitId}'),
{
......@@ -113,7 +113,7 @@ export default {
);
},
gfmCopyText() {
return `\`${this.diffFile.filePath}\``;
return `\`${this.diffFile.file_path}\``;
},
},
methods: {
......@@ -164,21 +164,21 @@ export default {
aria-hidden="true"
css-classes="js-file-icon append-right-5"
/>
<span v-if="diffFile.renamedFile">
<span v-if="diffFile.renamed_file">
<strong
v-tooltip
:title="diffFile.oldPath"
:title="diffFile.old_path"
class="file-title-name"
data-container="body"
v-html="diffFile.oldPathHtml"
v-html="diffFile.old_path_html"
></strong>
→
<strong
v-tooltip
:title="diffFile.newPath"
:title="diffFile.new_path"
class="file-title-name"
data-container="body"
v-html="diffFile.newPathHtml"
v-html="diffFile.new_path_html"
></strong>
</span>
......@@ -195,16 +195,16 @@ export default {
<clipboard-button
:title="__('Copy file path to clipboard')"
:text="diffFile.filePath"
:text="diffFile.file_path"
:gfm="gfmCopyText"
css-class="btn-default btn-transparent btn-clipboard"
/>
<small
v-if="diffFile.modeChanged"
v-if="diffFile.mode_changed"
ref="fileMode"
>
{{ diffFile.aMode }} → {{ diffFile.bMode }}
{{ diffFile.a_mode }} → {{ diffFile.b_mode }}
</small>
<span
......@@ -220,7 +220,7 @@ export default {
class="file-actions d-none d-sm-block"
>
<template
v-if="diffFile.blob && diffFile.blob.readableText"
v-if="diffFile.blob && diffFile.blob.readable_text"
>
<button
:disabled="!diffHasDiscussions(diffFile)"
......@@ -234,33 +234,33 @@ export default {
</button>
<edit-button
v-if="!diffFile.deletedFile"
v-if="!diffFile.deleted_file"
:can-current-user-fork="canCurrentUserFork"
:edit-path="diffFile.editPath"
:can-modify-blob="diffFile.canModifyBlob"
:edit-path="diffFile.edit_path"
:can-modify-blob="diffFile.can_modify_blob"
@showForkMessage="showForkMessage"
/>
</template>
<a
v-if="diffFile.replacedViewPath"
:href="diffFile.replacedViewPath"
v-if="diffFile.replaced_view_path"
:href="diffFile.replaced_view_path"
class="btn view-file js-view-file"
v-html="viewReplacedFileButtonText"
>
</a>
<a
:href="diffFile.viewPath"
:href="diffFile.view_path"
class="btn view-file js-view-file"
v-html="viewFileButtonText"
>
</a>
<a
v-if="diffFile.externalUrl"
v-if="diffFile.external_url"
v-tooltip
:href="diffFile.externalUrl"
:title="`View on ${diffFile.formattedExternalUrl}`"
:href="diffFile.external_url"
:title="`View on ${diffFile.formatted_external_url}`"
target="_blank"
rel="noopener noreferrer"
class="btn btn-file-option"
......
app/assets/javascripts/diffs/components/diff_gutter_avatars.vue
View file @ 1c7372ad
......@@ -3,7 +3,7 @@ import { mapActions } from 'vuex';
import Icon from '~/vue_shared/components/icon.vue';
import { pluralize, truncate } from '~/lib/utils/text_utility';
import UserAvatarImage from '~/vue_shared/components/user_avatar/user_avatar_image.vue';
import { GlTooltipDirective } from '@gitlab-org/gitlab-ui';
import { GlTooltipDirective } from '@gitlab/ui';
import { COUNT_OF_AVATARS_IN_GUTTER, LENGTH_OF_AVATAR_TOOLTIP } from '../constants';
export default {
......
app/assets/javascripts/diffs/components/diff_line_gutter_content.vue
View file @ 1c7372ad
......@@ -73,7 +73,7 @@ export default {
}),
...mapGetters(['isLoggedIn']),
lineHref() {
return `#${this.line.lineCode || ''}`;
return `#${this.line.line_code || ''}`;
},
shouldShowCommentButton() {
return (
......@@ -99,7 +99,7 @@ export default {
methods: {
...mapActions('diffs', ['loadMoreLines', 'showCommentForm']),
handleCommentButton() {
this.showCommentForm({ lineCode: this.line.lineCode });
this.showCommentForm({ lineCode: this.line.line_code });
},
handleLoadMoreLines() {
if (this.isRequesting) {
......@@ -108,8 +108,8 @@ export default {
this.isRequesting = true;
const endpoint = this.contextLinesPath;
const oldLineNumber = this.line.metaData.oldPos || 0;
const newLineNumber = this.line.metaData.newPos || 0;
const oldLineNumber = this.line.meta_data.old_pos || 0;
const newLineNumber = this.line.meta_data.new_pos || 0;
const offset = newLineNumber - oldLineNumber;
const bottom = this.isBottom;
const { fileHash } = this;
......@@ -125,12 +125,12 @@ export default {
to = lineNumber + UNFOLD_COUNT;
} else {
const diffFile = utils.findDiffFile(this.diffFiles, this.fileHash);
const indexForInline = utils.findIndexInInlineLines(diffFile.highlightedDiffLines, {
const indexForInline = utils.findIndexInInlineLines(diffFile.highlighted_diff_lines, {
oldLineNumber,
newLineNumber,
});
const prevLine = diffFile.highlightedDiffLines[indexForInline - 2];
const prevLineNumber = (prevLine && prevLine.newLine) || 0;
const prevLine = diffFile.highlighted_diff_lines[indexForInline - 2];
const prevLineNumber = (prevLine && prevLine.new_line) || 0;
if (since <= prevLineNumber + 1) {
since = prevLineNumber + 1;
......
app/assets/javascripts/diffs/components/diff_line_note_form.vue
View file @ 1c7372ad
......@@ -53,7 +53,7 @@ export default {
this.noteableData.diff_head_sha,
DIFF_NOTE_TYPE,
this.noteableData.source_project_id,
this.line.lineCode,
this.line.line_code,
];
this.initAutoSave(this.noteableData, keys);
......@@ -72,7 +72,7 @@ export default {
}
this.cancelCommentForm({
lineCode: this.line.lineCode,
lineCode: this.line.line_code,
});
this.$nextTick(() => {
this.resetAutoSave();
......@@ -94,7 +94,7 @@ export default {
<note-form
ref="noteForm"
:is-editing="true"
:line-code="line.lineCode"
:line-code="line.line_code"
save-button-title="Comment"
class="diff-comment-form"
@cancelForm="handleCancelCommentForm"
......
app/assets/javascripts/diffs/components/diff_table_cell.vue
View file @ 1c7372ad
......@@ -96,9 +96,7 @@ export default {
};
},
lineNumber() {
const { lineType } = this;
return lineType === OLD_LINE_TYPE ? this.line.oldLine : this.line.newLine;
return this.lineType === OLD_LINE_TYPE ? this.line.old_line : this.line.new_line;
},
},
};
......
app/assets/javascripts/diffs/components/inline_diff_comment_row.vue
View file @ 1c7372ad
......@@ -48,7 +48,7 @@ export default {
:discussions="line.discussions"
/>
<diff-line-note-form
v-if="diffLineCommentForms[line.lineCode]"
v-if="diffLineCommentForms[line.line_code]"
:diff-file-hash="diffFileHash"
:line="line"
:note-target-line="line"
......
app/assets/javascripts/diffs/components/inline_diff_table_row.vue
View file @ 1c7372ad
......@@ -52,9 +52,7 @@ export default {
};
},
inlineRowId() {
const { lineCode, oldLine, newLine } = this.line;
return lineCode || `${this.fileHash}_${oldLine}_${newLine}`;
return this.line.line_code || `${this.fileHash}_${this.line.old_line}_${this.line.new_line}`;
},
},
created() {
......@@ -107,7 +105,7 @@ export default {
<td
:class="line.type"
class="line_content"
v-html="line.richText"
v-html="line.rich_text"
>
</td>
</tr>
......
app/assets/javascripts/diffs/components/inline_diff_view.vue
View file @ 1c7372ad
......@@ -43,16 +43,16 @@ export default {
v-for="(line, index) in diffLines"
>
<inline-diff-table-row
:key="line.lineCode"
:file-hash="diffFile.fileHash"
:context-lines-path="diffFile.contextLinesPath"
:key="line.line_code"
:file-hash="diffFile.file_hash"
:context-lines-path="diffFile.context_lines_path"
:line="line"
:is-bottom="index + 1 === diffLinesLength"
/>
<inline-diff-comment-row
v-if="shouldRenderInlineCommentRow(line)"
:key="index"
:diff-file-hash="diffFile.fileHash"
:diff-file-hash="diffFile.file_hash"
:line="line"
:line-index="index"
/>
......
app/assets/javascripts/diffs/components/parallel_diff_comment_row.vue
View file @ 1c7372ad
......@@ -27,10 +27,10 @@ export default {
diffLineCommentForms: state => state.diffs.diffLineCommentForms,
}),
leftLineCode() {
return this.line.left && this.line.left.lineCode;
return this.line.left && this.line.left.line_code;
},
rightLineCode() {
return this.line.right && this.line.right.lineCode;
return this.line.right && this.line.right.line_code;
},
hasExpandedDiscussionOnLeft() {
return this.line.left && this.line.left.discussions
......
app/assets/javascripts/diffs/components/parallel_diff_table_row.vue
View file @ 1c7372ad
......@@ -120,11 +120,11 @@ export default {
class="diff-line-num old_line"
/>
<td
:id="line.left.lineCode"
:id="line.left.line_code"
:class="parallelViewLeftLineType"
class="line_content parallel left-side"
@mousedown.native="handleParallelLineMouseDown"
v-html="line.left.richText"
v-html="line.left.rich_text"
>
</td>
</template>
......@@ -146,11 +146,11 @@ export default {
class="diff-line-num new_line"
/>
<td
:id="line.right.lineCode"
:id="line.right.line_code"
:class="line.right.type"
class="line_content parallel right-side"
@mousedown.native="handleParallelLineMouseDown"
v-html="line.right.richText"
v-html="line.right.rich_text"
>
</td>
</template>
......
app/assets/javascripts/diffs/components/parallel_diff_view.vue
View file @ 1c7372ad
......@@ -46,8 +46,8 @@ export default {
>
<parallel-diff-table-row
:key="index"
:file-hash="diffFile.fileHash"
:context-lines-path="diffFile.contextLinesPath"
:file-hash="diffFile.file_hash"
:context-lines-path="diffFile.context_lines_path"
:line="line"
:is-bottom="index + 1 === diffLinesLength"
/>
......@@ -55,7 +55,7 @@ export default {
v-if="shouldRenderParallelCommentRow(line)"
:key="`dcr-${index}`"
:line="line"
:diff-file-hash="diffFile.fileHash"
:diff-file-hash="diffFile.file_hash"
:line-index="index"
/>
</template>
......
app/assets/javascripts/diffs/components/tree_list.vue
View file @ 1c7372ad
<script>
import { mapActions, mapGetters, mapState } from 'vuex';
import { GlTooltipDirective } from '@gitlab-org/gitlab-ui';
import { GlTooltipDirective } from '@gitlab/ui';
import { convertPermissionToBoolean } from '~/lib/utils/common_utils';
import Icon from '~/vue_shared/components/icon.vue';
import FileRow from '~/vue_shared/components/file_row.vue';
......
app/assets/javascripts/diffs/index.js
View file @ 1c7372ad
import Vue from 'vue';
import { mapState } from 'vuex';
import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
import diffsApp from './components/app.vue';
export default function initDiffsApp(store) {
......@@ -17,9 +16,7 @@ export default function initDiffsApp(store) {
return {
endpoint: dataset.endpoint,
projectPath: dataset.projectPath,
currentUser: convertObjectPropsToCamelCase(JSON.parse(dataset.currentUserData), {
deep: true,
}),
currentUser: JSON.parse(dataset.currentUserData) || {},
};
},
computed: {
......
app/assets/javascripts/diffs/store/actions.js
View file @ 1c7372ad
......@@ -50,8 +50,8 @@ export const assignDiscussionsToDiff = (
};
export const removeDiscussionsFromDiff = ({ commit }, removeDiscussion) => {
const { fileHash, line_code, id } = removeDiscussion;
commit(types.REMOVE_LINE_DISCUSSIONS_FOR_FILE, { fileHash, lineCode: line_code, id });
const { file_hash, line_code, id } = removeDiscussion;
commit(types.REMOVE_LINE_DISCUSSIONS_FOR_FILE, { fileHash: file_hash, lineCode: line_code, id });
};
export const startRenderDiffsQueue = ({ state, commit }) => {
......@@ -167,7 +167,7 @@ export const expandAllFiles = ({ commit }) => {
export const toggleFileDiscussions = ({ getters, dispatch }, diff) => {
const discussions = getters.getDiffFileDiscussions(diff);
const shouldCloseAll = getters.diffHasAllExpandedDiscussions(diff);
const shouldExpandAll = getters.diffHasAllCollpasedDiscussions(diff);
const shouldExpandAll = getters.diffHasAllCollapsedDiscussions(diff);
discussions.forEach(discussion => {
const data = { discussionId: discussion.id };
......@@ -189,7 +189,7 @@ export const saveDiffDiscussion = ({ dispatch }, { note, formData }) => {
return dispatch('saveNote', postData, { root: true })
.then(result => dispatch('updateDiscussion', result.discussion, { root: true }))
.then(discussion => dispatch('assignDiscussionsToDiff', [discussion]))
.then(() => dispatch('closeDiffFileCommentForm', formData.diffFile.fileHash))
.then(() => dispatch('closeDiffFileCommentForm', formData.diffFile.file_hash))
.then(() => dispatch('startTaskList', null, { root: true }))
.catch(() => createFlash(s__('MergeRequests|Saving the comment failed')));
};
......
app/assets/javascripts/diffs/store/getters.js
View file @ 1c7372ad
import _ from 'underscore';
import { PARALLEL_DIFF_VIEW_TYPE, INLINE_DIFF_VIEW_TYPE } from '../constants';
export const isParallelView = state => state.diffViewType === PARALLEL_DIFF_VIEW_TYPE;
......@@ -28,7 +27,7 @@ export const diffHasAllExpandedDiscussions = (state, getters) => diff => {
* @param {Object} diff
* @returns {Boolean}
*/
export const diffHasAllCollpasedDiscussions = (state, getters) => diff => {
export const diffHasAllCollapsedDiscussions = (state, getters) => diff => {
const discussions = getters.getDiffFileDiscussions(diff);
return (
......@@ -68,8 +67,7 @@ export const diffHasDiscussions = (state, getters) => diff =>
*/
export const getDiffFileDiscussions = (state, getters, rootState, rootGetters) => diff =>
rootGetters.discussions.filter(
discussion =>
discussion.diff_discussion && _.isEqual(discussion.diff_file.file_hash, diff.fileHash),
discussion => discussion.diff_discussion && discussion.diff_file.file_hash === diff.file_hash,
) || [];
export const shouldRenderParallelCommentRow = state => line => {
......@@ -90,14 +88,14 @@ export const shouldRenderParallelCommentRow = state => line => {
return true;
}
const hasCommentFormOnLeft = line.left && state.diffLineCommentForms[line.left.lineCode];
const hasCommentFormOnRight = line.right && state.diffLineCommentForms[line.right.lineCode];
const hasCommentFormOnLeft = line.left && state.diffLineCommentForms[line.left.line_code];
const hasCommentFormOnRight = line.right && state.diffLineCommentForms[line.right.line_code];
return hasCommentFormOnLeft || hasCommentFormOnRight;
};
export const shouldRenderInlineCommentRow = state => line => {
if (state.diffLineCommentForms[line.lineCode]) return true;
if (state.diffLineCommentForms[line.line_code]) return true;
if (!line.discussions || line.discussions.length === 0) {
return false;
......@@ -108,7 +106,7 @@ export const shouldRenderInlineCommentRow = state => line => {
// prevent babel-plugin-rewire from generating an invalid default during karma∂ tests
export const getDiffFileByHash = state => fileHash =>
state.diffFiles.find(file => file.fileHash === fileHash);
state.diffFiles.find(file => file.file_hash === fileHash);
export const allBlobs = state => Object.values(state.treeEntries).filter(f => f.type === 'blob');
......
app/assets/javascripts/diffs/store/mutations.js
View file @ 1c7372ad
......@@ -23,12 +23,11 @@ export default {
},
[types.SET_DIFF_DATA](state, data) {
const diffData = convertObjectPropsToCamelCase(data, { deep: true });
prepareDiffData(diffData);
const { tree, treeEntries } = generateTreeList(diffData.diffFiles);
prepareDiffData(data);
const { tree, treeEntries } = generateTreeList(data.diff_files);
Object.assign(state, {
...diffData,
...convertObjectPropsToCamelCase(data),
tree: sortTree(tree),
treeEntries,
});
......@@ -42,7 +41,7 @@ export default {
[types.SET_MERGE_REQUEST_DIFFS](state, mergeRequestDiffs) {
Object.assign(state, {
mergeRequestDiffs: convertObjectPropsToCamelCase(mergeRequestDiffs, { deep: true }),
mergeRequestDiffs,
});
},
......@@ -62,19 +61,18 @@ export default {
const { lineNumbers, contextLines, fileHash } = options;
const { bottom } = options.params;
const diffFile = findDiffFile(state.diffFiles, fileHash);
const { highlightedDiffLines, parallelDiffLines } = diffFile;
removeMatchLine(diffFile, lineNumbers, bottom);
const lines = addLineReferences(contextLines, lineNumbers, bottom).map(line => ({
...line,
lineCode: line.lineCode || `${fileHash}_${line.oldLine}_${line.newLine}`,
line_code: line.line_code || `${fileHash}_${line.old_line}_${line.new_line}`,
discussions: line.discussions || [],
}));
addContextLines({
inlineLines: highlightedDiffLines,
parallelLines: parallelDiffLines,
inlineLines: diffFile.highlighted_diff_lines,
parallelLines: diffFile.parallel_diff_lines,
contextLines: lines,
bottom,
lineNumbers,
......@@ -82,10 +80,9 @@ export default {
},
[types.ADD_COLLAPSED_DIFFS](state, { file, data }) {
const normalizedData = convertObjectPropsToCamelCase(data, { deep: true });
prepareDiffData(normalizedData);
const [newFileData] = normalizedData.diffFiles.filter(f => f.fileHash === file.fileHash);
const selectedFile = state.diffFiles.find(f => f.fileHash === file.fileHash);
prepareDiffData(data);
const [newFileData] = data.diff_files.filter(f => f.file_hash === file.file_hash);
const selectedFile = state.diffFiles.find(f => f.file_hash === file.file_hash);
Object.assign(selectedFile, { ...newFileData });
},
......@@ -101,20 +98,20 @@ export default {
const discussionLineCode = discussion.line_code;
const fileHash = discussion.diff_file.file_hash;
const lineCheck = ({ lineCode }) =>
lineCode === discussionLineCode &&
const lineCheck = line =>
line.line_code === discussionLineCode &&
isDiscussionApplicableToLine({
discussion,
diffPosition: diffPositionByLineCode[lineCode],
diffPosition: diffPositionByLineCode[line.line_code],
latestDiff,
});
state.diffFiles = state.diffFiles.map(diffFile => {
if (diffFile.fileHash === fileHash) {
if (diffFile.file_hash === fileHash) {
const file = { ...diffFile };
if (file.highlightedDiffLines) {
file.highlightedDiffLines = file.highlightedDiffLines.map(line => {
if (file.highlighted_diff_lines) {
file.highlighted_diff_lines = file.highlighted_diff_lines.map(line => {
if (lineCheck(line)) {
return {
...line,
......@@ -126,8 +123,8 @@ export default {
});
}
if (file.parallelDiffLines) {
file.parallelDiffLines = file.parallelDiffLines.map(line => {
if (file.parallel_diff_lines) {
file.parallel_diff_lines = file.parallel_diff_lines.map(line => {
const left = line.left && lineCheck(line.left);
const right = line.right && lineCheck(line.right);
......@@ -148,7 +145,7 @@ export default {
});
}
if (!file.parallelDiffLines || !file.highlightedDiffLines) {
if (!file.parallel_diff_lines || !file.highlighted_diff_lines) {
file.discussions = file.discussions.concat(discussion);
}
......@@ -160,16 +157,16 @@ export default {
},
[types.REMOVE_LINE_DISCUSSIONS_FOR_FILE](state, { fileHash, lineCode, id }) {
const selectedFile = state.diffFiles.find(f => f.fileHash === fileHash);
const selectedFile = state.diffFiles.find(f => f.file_hash === fileHash);
if (selectedFile) {
if (selectedFile.parallelDiffLines) {
const targetLine = selectedFile.parallelDiffLines.find(
if (selectedFile.parallel_diff_lines) {
const targetLine = selectedFile.parallel_diff_lines.find(
line =>
(line.left && line.left.lineCode === lineCode) ||
(line.right && line.right.lineCode === lineCode),
(line.left && line.left.line_code === lineCode) ||
(line.right && line.right.line_code === lineCode),
);
if (targetLine) {
const side = targetLine.left && targetLine.left.lineCode === lineCode ? 'left' : 'right';
const side = targetLine.left && targetLine.left.line_code === lineCode ? 'left' : 'right';
Object.assign(targetLine[side], {
discussions: [],
......@@ -177,9 +174,9 @@ export default {
}
}
if (selectedFile.highlightedDiffLines) {
const targetInlineLine = selectedFile.highlightedDiffLines.find(
line => line.lineCode === lineCode,
if (selectedFile.highlighted_diff_lines) {
const targetInlineLine = selectedFile.highlighted_diff_lines.find(
line => line.line_code === lineCode,
);
if (targetInlineLine) {
......
app/assets/javascripts/diffs/store/utils.js
View file @ 1c7372ad
This diff is collapsed.
app/assets/javascripts/environments/components/container.vue
View file @ 1c7372ad
<script>
import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
import { GlLoadingIcon } from '@gitlab/ui';
import tablePagination from '../../vue_shared/components/table_pagination.vue';
import environmentTable from '../components/environments_table.vue';
......
app/assets/javascripts/environments/components/environment_actions.vue
View file @ 1c7372ad
......@@ -4,7 +4,7 @@ import { formatTime } from '~/lib/utils/datetime_utility';
import Icon from '~/vue_shared/components/icon.vue';
import eventHub from '../event_hub';
import tooltip from '../../vue_shared/directives/tooltip';
import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
import { GlLoadingIcon } from '@gitlab/ui';
export default {
directives: {
......
app/assets/javascripts/environments/components/environment_external_url.vue
View file @ 1c7372ad
<script>
import { GlTooltipDirective } from '@gitlab-org/gitlab-ui';
import { GlTooltipDirective } from '@gitlab/ui';
import Icon from '~/vue_shared/components/icon.vue';
import { s__ } from '~/locale';
......
app/assets/javascripts/environments/components/environment_item.vue
View file @ 1c7372ad
<script>
import Timeago from 'timeago.js';
import _ from 'underscore';
import { GlTooltipDirective } from '@gitlab-org/gitlab-ui';
import { GlTooltipDirective } from '@gitlab/ui';
import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue';
import { humanize } from '~/lib/utils/text_utility';
import Icon from '~/vue_shared/components/icon.vue';
......
app/assets/javascripts/environments/components/environment_monitoring.vue
View file @ 1c7372ad
......@@ -2,7 +2,7 @@
/**
* Renders the Monitoring (Metrics) link in environments table.
*/
import { GlButton, GlTooltipDirective } from '@gitlab-org/gitlab-ui';
import { GlButton, GlTooltipDirective } from '@gitlab/ui';
import Icon from '~/vue_shared/components/icon.vue';
export default {
......
app/assets/javascripts/environments/components/environment_rollback.vue
View file @ 1c7372ad
......@@ -6,7 +6,7 @@
* Makes a post request when the button is clicked.
*/
import { s__ } from '~/locale';
import { GlTooltipDirective, GlLoadingIcon } from '@gitlab-org/gitlab-ui';
import { GlTooltipDirective, GlLoadingIcon } from '@gitlab/ui';
import Icon from '~/vue_shared/components/icon.vue';
import eventHub from '../event_hub';
......@@ -63,7 +63,7 @@ export default {
>
<icon
v-if="isLastDeployment"
name="repeat"
name="repeat"
/>
<icon
v-else
......
app/assets/javascripts/environments/components/environment_stop.vue
View file @ 1c7372ad
......@@ -5,7 +5,7 @@
*/
import $ from 'jquery';
import { GlTooltipDirective } from '@gitlab-org/gitlab-ui';
import { GlTooltipDirective } from '@gitlab/ui';
import Icon from '~/vue_shared/components/icon.vue';
import { s__ } from '~/locale';
import eventHub from '../event_hub';
......
app/assets/javascripts/environments/components/environment_terminal_button.vue
View file @ 1c7372ad
......@@ -3,7 +3,7 @@
* Renders a terminal button to open a web terminal.
* Used in environments table.
*/
import { GlTooltipDirective } from '@gitlab-org/gitlab-ui';
import { GlTooltipDirective } from '@gitlab/ui';
import Icon from '~/vue_shared/components/icon.vue';
export default {
......
app/assets/javascripts/environments/components/environments_table.vue
View file @ 1c7372ad
......@@ -2,7 +2,7 @@
/**
* Render environments table.
*/
import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
import { GlLoadingIcon } from '@gitlab/ui';
import environmentItem from './environment_item.vue';
export default {
......
app/assets/javascripts/environments/components/stop_environment_modal.vue
View file @ 1c7372ad
<script>
import { GlTooltipDirective } from '@gitlab-org/gitlab-ui';
import { GlTooltipDirective } from '@gitlab/ui';
import GlModal from '~/vue_shared/components/gl_modal.vue';
import { s__, sprintf } from '~/locale';
import LoadingButton from '~/vue_shared/components/loading_button.vue';
......
app/assets/javascripts/files_comment_button.js
View file @ 1c7372ad
/* Developer beware! Do not add logic to showButton or hideButton
* that will force a reflow. Doing so will create a signficant performance
* that will force a reflow. Doing so will create a significant performance
* bottleneck for pages with large diffs. For a comprehensive list of what
* causes reflows, visit https://gist.github.com/paulirish/5d52fb081b3570c81e3a
*/
......
app/assets/javascripts/filtered_search/dropdown_emoji.js
View file @ 1c7372ad
......@@ -69,10 +69,13 @@ export default class DropdownEmoji extends FilteredSearchDropdown {
// Replace empty gl-emoji tag to real content
const dropdownItems = [...this.dropdown.querySelectorAll('.filter-dropdown-item')];
dropdownItems.forEach(dropdownItem => {
const name = dropdownItem.querySelector('.js-data-value').innerText;
const emojiTag = this.glEmojiTag(name);
const emojiElement = dropdownItem.querySelector('gl-emoji');
emojiElement.outerHTML = emojiTag;
const valueElement = dropdownItem.querySelector('.js-data-value');
if (valueElement !== null) {
const name = valueElement.innerText;
const emojiTag = this.glEmojiTag(name);
const emojiElement = dropdownItem.querySelector('gl-emoji');
emojiElement.outerHTML = emojiTag;
}
});
}
......
app/assets/javascripts/filtered_search/filtered_search_visual_tokens.js
View file @ 1c7372ad
......@@ -135,10 +135,6 @@ export default class FilteredSearchVisualTokens {
}
static updateUserTokenAppearance(tokenValueContainer, tokenValueElement, tokenValue) {
if (tokenValue === 'none') {
return Promise.resolve();
}
const username = tokenValue.replace(/^@/, '');
return (
UsersCache.retrieve(username)
......@@ -184,7 +180,12 @@ export default class FilteredSearchVisualTokens {
const tokenValueElement = tokenValueContainer.querySelector('.value');
tokenValueElement.innerText = tokenValue;
if (tokenValue === 'none' || tokenValue === 'any') {
return;
}
const tokenType = tokenName.toLowerCase();
if (tokenType === 'label') {
FilteredSearchVisualTokens.updateLabelTokenColor(tokenValueContainer, tokenValue);
} else if (tokenType === 'author' || tokenType === 'assignee') {
......
app/assets/javascripts/frequent_items/components/app.vue
View file @ 1c7372ad
<script>
import { mapState, mapActions, mapGetters } from 'vuex';
import AccessorUtilities from '~/lib/utils/accessor';
import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
import { GlLoadingIcon } from '@gitlab/ui';
import eventHub from '../event_hub';
import store from '../store/';
import { FREQUENT_ITEMS, STORAGE_KEY } from '../constants';
......
app/assets/javascripts/groups/components/app.vue
View file @ 1c7372ad
......@@ -8,7 +8,7 @@ import { HIDDEN_CLASS } from '~/lib/utils/constants';
import { getParameterByName } from '~/lib/utils/common_utils';
import { mergeUrlParams } from '~/lib/utils/url_utility';
import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
import { GlLoadingIcon } from '@gitlab/ui';
import eventHub from '../event_hub';
import { COMMON_STR, CONTENT_LIST_CLASS } from '../constants';
import groupsComponent from './groups.vue';
......
app/assets/javascripts/ide/components/branches/search_list.vue
View file @ 1c7372ad
......@@ -2,7 +2,7 @@
import { mapActions, mapState } from 'vuex';
import _ from 'underscore';
import Icon from '~/vue_shared/components/icon.vue';
import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
import { GlLoadingIcon } from '@gitlab/ui';
import Item from './item.vue';
export default {
......
app/assets/javascripts/ide/components/error_message.vue
View file @ 1c7372ad
<script>
import { mapActions } from 'vuex';
import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
import { GlLoadingIcon } from '@gitlab/ui';
export default {
components: {
......
app/assets/javascripts/ide/components/file_templates/dropdown.vue
View file @ 1c7372ad
......@@ -2,7 +2,7 @@
import $ from 'jquery';
import { mapActions, mapState } from 'vuex';
import DropdownButton from '~/vue_shared/components/dropdown/dropdown_button.vue';
import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
import { GlLoadingIcon } from '@gitlab/ui';
export default {
components: {
......
app/assets/javascripts/ide/components/ide_side_bar.vue
View file @ 1c7372ad
<script>
import { mapState, mapGetters } from 'vuex';
import { GlSkeletonLoading } from '@gitlab-org/gitlab-ui';
import { GlSkeletonLoading } from '@gitlab/ui';
import IdeTree from './ide_tree.vue';
import ResizablePanel from './resizable_panel.vue';
import ActivityBar from './activity_bar.vue';
......
app/assets/javascripts/ide/components/ide_tree_list.vue
View file @ 1c7372ad
<script>
import { mapActions, mapGetters, mapState } from 'vuex';
import Icon from '~/vue_shared/components/icon.vue';
import { GlSkeletonLoading } from '@gitlab-org/gitlab-ui';
import { GlSkeletonLoading } from '@gitlab/ui';
import FileRow from '~/vue_shared/components/file_row.vue';
import NavDropdown from './nav_dropdown.vue';
import FileRowExtra from './file_row_extra.vue';
......
app/assets/javascripts/ide/components/jobs/list.vue
View file @ 1c7372ad
<script>
import { mapActions } from 'vuex';
import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
import { GlLoadingIcon } from '@gitlab/ui';
import Stage from './stage.vue';
export default {
......
app/assets/javascripts/ide/components/jobs/stage.vue
View file @ 1c7372ad
<script>
import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
import { GlLoadingIcon } from '@gitlab/ui';
import tooltip from '../../../vue_shared/directives/tooltip';
import Icon from '../../../vue_shared/components/icon.vue';
import CiIcon from '../../../vue_shared/components/ci_icon.vue';
......
app/assets/javascripts/ide/components/merge_requests/list.vue
View file @ 1c7372ad
......@@ -3,7 +3,7 @@ import { mapActions, mapState } from 'vuex';
import _ from 'underscore';
import { __ } from '~/locale';
import Icon from '~/vue_shared/components/icon.vue';
import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
import { GlLoadingIcon } from '@gitlab/ui';
import Item from './item.vue';
import TokenedInput from '../shared/tokened_input.vue';
......
app/assets/javascripts/ide/components/pipelines/list.vue
View file @ 1c7372ad
<script>
import { mapActions, mapGetters, mapState } from 'vuex';
import _ from 'underscore';
import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
import { GlLoadingIcon } from '@gitlab/ui';
import { sprintf, __ } from '../../../locale';
import Icon from '../../../vue_shared/components/icon.vue';
import CiIcon from '../../../vue_shared/components/ci_icon.vue';
......
app/assets/javascripts/ide/components/preview/clientside.vue
View file @ 1c7372ad
......@@ -3,7 +3,7 @@ import { mapActions, mapGetters, mapState } from 'vuex';
import _ from 'underscore';
import { Manager } from 'smooshpack';
import { listen } from 'codesandbox-api';
import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
import { GlLoadingIcon } from '@gitlab/ui';
import Navigator from './navigator.vue';
import { packageJsonPath } from '../../constants';
import { createPathWithExt } from '../../utils';
......
app/assets/javascripts/ide/components/preview/navigator.vue
View file @ 1c7372ad
<script>
import { listen } from 'codesandbox-api';
import Icon from '~/vue_shared/components/icon.vue';
import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
import { GlLoadingIcon } from '@gitlab/ui';
export default {
components: {
......
app/assets/javascripts/ide/stores/modules/pipelines/actions.js
View file @ 1c7372ad
......@@ -28,7 +28,7 @@ export const receiveLatestPipelineError = ({ commit, dispatch }, err) => {
dispatch(
'setErrorMessage',
{
text: __('An error occured whilst fetching the latest pipline.'),
text: __('An error occured whilst fetching the latest pipeline.'),
action: () =>
dispatch('forcePipelineRequest').then(() =>
dispatch('setErrorMessage', null, { root: true }),
......
app/assets/javascripts/init_legacy_filters.js deleted 100644 → 0
View file @ 9737cc8a
/* eslint-disable no-new */
import LabelsSelect from './labels_select';
import subscriptionSelect from './subscription_select';
import UsersSelect from './users_select';
import issueStatusSelect from './issue_status_select';
import MilestoneSelect from './milestone_select';
export default () => {
new UsersSelect();
new LabelsSelect();
new MilestoneSelect();
issueStatusSelect();
subscriptionSelect();
};
app/assets/javascripts/jobs/components/artifacts_block.vue
View file @ 1c7372ad
<script>
import { GlLink } from '@gitlab-org/gitlab-ui';
import { GlLink } from '@gitlab/ui';
import TimeagoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
import timeagoMixin from '~/vue_shared/mixins/timeago';
......
app/assets/javascripts/jobs/components/commit_block.vue
View file @ 1c7372ad
<script>
import { GlLink } from '@gitlab-org/gitlab-ui';
import { GlLink } from '@gitlab/ui';
import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';
export default {
......
app/assets/javascripts/jobs/components/empty_state.vue
View file @ 1c7372ad
<script>
import { GlLink } from '@gitlab-org/gitlab-ui';
import { GlLink } from '@gitlab/ui';
export default {
components: {
......
app/assets/javascripts/jobs/components/erased_block.vue
View file @ 1c7372ad
<script>
import _ from 'underscore';
import { GlLink } from '@gitlab-org/gitlab-ui';
import { GlLink } from '@gitlab/ui';
import TimeagoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
export default {
......
app/assets/javascripts/jobs/components/job_app.vue
View file @ 1c7372ad
<script>
import _ from 'underscore';
import { mapGetters, mapState, mapActions } from 'vuex';
import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
import { GlLoadingIcon } from '@gitlab/ui';
import { isScrolledToBottom } from '~/lib/utils/scroll_utils';
import { polyfillSticky } from '~/lib/utils/sticky';
import bp from '~/breakpoints';
......
app/assets/javascripts/jobs/components/job_container_item.vue
View file @ 1c7372ad
<script>
import { GlLink } from '@gitlab-org/gitlab-ui';
import { GlLink } from '@gitlab/ui';
import tooltip from '~/vue_shared/directives/tooltip';
import CiIcon from '~/vue_shared/components/ci_icon.vue';
import Icon from '~/vue_shared/components/icon.vue';
......
app/assets/javascripts/jobs/components/job_log_controllers.vue
View file @ 1c7372ad
<script>
import { GlTooltipDirective, GlLink, GlButton } from '@gitlab-org/gitlab-ui';
import { GlTooltipDirective, GlLink, GlButton } from '@gitlab/ui';
import { polyfillSticky } from '~/lib/utils/sticky';
import Icon from '~/vue_shared/components/icon.vue';
import { numberToHumanSize } from '~/lib/utils/number_utils';
......
app/assets/javascripts/jobs/components/sidebar.vue
View file @ 1c7372ad
<script>
import _ from 'underscore';
import { mapActions, mapState } from 'vuex';
import { GlLink, GlButton } from '@gitlab-org/gitlab-ui';
import { GlLink, GlButton } from '@gitlab/ui';
import timeagoMixin from '~/vue_shared/mixins/timeago';
import { timeIntervalInWords } from '~/lib/utils/datetime_utility';
import Icon from '~/vue_shared/components/icon.vue';
......
app/assets/javascripts/jobs/components/sidebar_detail_row.vue
View file @ 1c7372ad
<script>
import { GlLink } from '@gitlab-org/gitlab-ui';
import { GlLink } from '@gitlab/ui';
export default {
name: 'SidebarDetailRow',
......
app/assets/javascripts/jobs/components/stuck_block.vue
View file @ 1c7372ad
<script>
import { GlLink } from '@gitlab-org/gitlab-ui';
import { GlLink } from '@gitlab/ui';
/**
* Renders Stuck Runners block for job's view.
*/
......
app/assets/javascripts/jobs/components/trigger_block.vue
View file @ 1c7372ad
<script>
import { GlButton } from '@gitlab-org/gitlab-ui';
import { GlButton } from '@gitlab/ui';
export default {
components: {
......
app/assets/javascripts/jobs/store/getters.js
View file @ 1c7372ad
......@@ -42,7 +42,7 @@ export const emptyStateIllustration = state =>
(state.job && state.job.status && state.job.status.illustration) || {};
export const emptyStateAction = state =>
(state.job && state.job.status && state.job.status.action) || {};
(state.job && state.job.status && state.job.status.action) || null;
export const isScrollingDown = state => isScrolledToBottom() && !state.isTraceComplete;
......
app/assets/javascripts/notes.js
View file @ 1c7372ad
......@@ -16,7 +16,7 @@ import 'vendor/jquery.atwho';
import AjaxCache from '~/lib/utils/ajax_cache';
import Vue from 'vue';
import syntaxHighlight from '~/syntax_highlight';
import { GlSkeletonLoading } from '@gitlab-org/gitlab-ui';
import { GlSkeletonLoading } from '@gitlab/ui';
import axios from './lib/utils/axios_utils';
import { getLocationHash } from './lib/utils/url_utility';
import Flash from './flash';
......
app/assets/javascripts/notes/components/diff_with_note.vue
View file @ 1c7372ad
<script>
import { mapState, mapActions } from 'vuex';
import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
import DiffFileHeader from '~/diffs/components/diff_file_header.vue';
import DiffViewer from '~/vue_shared/components/diff_viewer/diff_viewer.vue';
import ImageDiffOverlay from '~/diffs/components/image_diff_overlay.vue';
import { GlSkeletonLoading } from '@gitlab-org/gitlab-ui';
import { GlSkeletonLoading } from '@gitlab/ui';
import { trimFirstCharOfLineContent, getDiffMode } from '~/diffs/store/utils';
export default {
......@@ -34,7 +33,9 @@ export default {
return getDiffMode(this.diffFile);
},
hasTruncatedDiffLines() {
return this.discussion.truncatedDiffLines && this.discussion.truncatedDiffLines.length !== 0;
return (
this.discussion.truncated_diff_lines && this.discussion.truncated_diff_lines.length !== 0
);
},
isDiscussionsExpanded() {
return true; // TODO: @fatihacet - Fix this.
......@@ -50,19 +51,17 @@ export default {
return text ? 'text-file' : 'js-image-file';
},
diffFile() {
return convertObjectPropsToCamelCase(this.discussion.diffFile, { deep: true });
return this.discussion.diff_file;
},
imageDiffHtml() {
return this.discussion.imageDiffHtml;
return this.discussion.image_diff_html;
},
userColorScheme() {
return window.gon.user_color_scheme;
},
normalizedDiffLines() {
if (this.discussion.truncatedDiffLines) {
return this.discussion.truncatedDiffLines.map(line =>
trimFirstCharOfLineContent(convertObjectPropsToCamelCase(line)),
);
if (this.discussion.truncated_diff_lines) {
return this.discussion.truncated_diff_lines.map(line => trimFirstCharOfLineContent(line));
}
return [];
......@@ -97,7 +96,7 @@ export default {
class="diff-file file-holder"
>
<diff-file-header
:discussion-path="discussion.discussionPath"
:discussion-path="discussion.discussion_path"
:diff-file="diffFile"
:can-current-user-fork="false"
:discussions-expanded="isDiscussionsExpanded"
......@@ -111,15 +110,15 @@ export default {
<table>
<tr
v-for="line in normalizedDiffLines"
:key="line.lineCode"
:key="line.line_code"
class="line_holder"
>
<td class="diff-line-num old_line">{{ line.oldLine }}</td>
<td class="diff-line-num new_line">{{ line.newLine }}</td>
<td class="diff-line-num old_line">{{ line.old_line }}</td>
<td class="diff-line-num new_line">{{ line.new_line }}</td>
<td
:class="line.type"
class="line_content"
v-html="line.richText"
v-html="line.rich_text"
>
</td>
</tr>
......@@ -165,17 +164,17 @@ export default {
>
<diff-viewer
:diff-mode="diffMode"
:new-path="diffFile.newPath"
:new-sha="diffFile.diffRefs.headSha"
:old-path="diffFile.oldPath"
:old-sha="diffFile.diffRefs.baseSha"
:file-hash="diffFile.fileHash"
:new-path="diffFile.new_path"
:new-sha="diffFile.diff_refs.head_sha"
:old-path="diffFile.old_path"
:old-sha="diffFile.diff_refs.base_sha"
:file-hash="diffFile.file_hash"
:project-path="projectPath"
>
<image-diff-overlay
slot="image-overlay"
:discussions="discussion"
:file-hash="diffFile.fileHash"
:file-hash="diffFile.file_hash"
:show-comment-icon="true"
:should-toggle-discussion="false"
badge-class="image-comment-badge"
......
app/assets/javascripts/notes/components/note_actions.vue
View file @ 1c7372ad
......@@ -2,7 +2,7 @@
import { mapGetters } from 'vuex';
import Icon from '~/vue_shared/components/icon.vue';
import tooltip from '~/vue_shared/directives/tooltip';
import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
import { GlLoadingIcon } from '@gitlab/ui';
export default {
name: 'NoteActions',
......
app/assets/javascripts/notes/components/noteable_discussion.vue
View file @ 1c7372ad
<script>
import { mapActions, mapGetters } from 'vuex';
import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
import { truncateSha } from '~/lib/utils/text_utility';
import { s__ } from '~/locale';
import systemNote from '~/vue_shared/components/notes/system_note.vue';
......@@ -88,17 +87,16 @@ export default {
transformedDiscussion() {
return {
...this.discussion.notes[0],
truncatedDiffLines: this.discussion.truncated_diff_lines || [],
truncatedDiffLinesPath: this.discussion.truncated_diff_lines_path,
diffFile: this.discussion.diff_file,
diffDiscussion: this.discussion.diff_discussion,
imageDiffHtml: this.discussion.image_diff_html,
truncated_diff_lines: this.discussion.truncated_diff_lines || [],
truncated_diff_lines_path: this.discussion.truncated_diff_lines_path,
diff_file: this.discussion.diff_file,
diff_discussion: this.discussion.diff_discussion,
active: this.discussion.active,
discussionPath: this.discussion.discussion_path,
discussion_path: this.discussion.discussion_path,
resolved: this.discussion.resolved,
resolvedBy: this.discussion.resolved_by,
resolvedByPush: this.discussion.resolved_by_push,
resolvedAt: this.discussion.resolved_at,
resolved_by: this.discussion.resolved_by,
resolved_by_push: this.discussion.resolved_by_push,
resolved_at: this.discussion.resolved_at,
};
},
author() {
......@@ -138,7 +136,7 @@ export default {
return null;
},
resolvedText() {
return this.transformedDiscussion.resolvedByPush ? 'Automatically resolved' : 'Resolved';
return this.transformedDiscussion.resolved_by_push ? 'Automatically resolved' : 'Resolved';
},
hasMultipleUnresolvedDiscussions() {
return this.unresolvedDiscussions.length > 1;
......@@ -150,12 +148,14 @@ export default {
);
},
shouldRenderDiffs() {
const { diffDiscussion, diffFile } = this.transformedDiscussion;
return diffDiscussion && diffFile && this.renderDiffFile;
return (
this.transformedDiscussion.diff_discussion &&
this.transformedDiscussion.diff_file &&
this.renderDiffFile
);
},
shouldGroupReplies() {
return !this.shouldRenderDiffs && !this.transformedDiscussion.diffDiscussion;
return !this.shouldRenderDiffs && !this.transformedDiscussion.diff_discussion;
},
shouldRenderHeader() {
return this.shouldRenderDiffs;
......@@ -165,7 +165,7 @@ export default {
},
wrapperComponentProps() {
if (this.shouldRenderDiffs) {
return { discussion: convertObjectPropsToCamelCase(this.discussion) };
return { discussion: this.discussion };
}
return {};
......@@ -184,8 +184,8 @@ export default {
},
shouldShowDiscussions() {
const isExpanded = this.discussion.expanded;
const { diffDiscussion, resolved } = this.transformedDiscussion;
const isResolvedNonDiffDiscussion = !diffDiscussion && resolved;
const { resolved } = this.transformedDiscussion;
const isResolvedNonDiffDiscussion = !this.transformedDiscussion.diff_discussion && resolved;
return isExpanded || this.alwaysExpanded || isResolvedNonDiffDiscussion;
},
......@@ -333,9 +333,9 @@ Please check your network connection and try again.`;
:expanded="discussion.expanded"
@toggleHandler="toggleDiscussionHandler"
>
<template v-if="transformedDiscussion.diffDiscussion">
<template v-if="transformedDiscussion.diff_discussion">
started a discussion on
<a :href="transformedDiscussion.discussionPath">
<a :href="transformedDiscussion.discussion_path">
<template v-if="transformedDiscussion.active">
the diff
</template>
......@@ -356,8 +356,8 @@ Please check your network connection and try again.`;
</note-header>
<note-edited-text
v-if="transformedDiscussion.resolved"
:edited-at="transformedDiscussion.resolvedAt"
:edited-by="transformedDiscussion.resolvedBy"
:edited-at="transformedDiscussion.resolved_at"
:edited-by="transformedDiscussion.resolved_by"
:action-text="resolvedText"
class-name="discussion-headline-light js-discussion-headline"
/>
......
app/assets/javascripts/notes/stores/actions.js
View file @ 1c7372ad
......@@ -341,7 +341,7 @@ export const scrollToNoteIfNeeded = (context, el) => {
};
export const fetchDiscussionDiffLines = ({ commit }, discussion) =>
axios.get(discussion.truncatedDiffLinesPath).then(({ data }) => {
axios.get(discussion.truncated_diff_lines_path).then(({ data }) => {
commit(types.SET_DISCUSSION_DIFF_LINES, {
discussionId: discussion.id,
diffLines: data.truncated_diff_lines,
......
app/assets/javascripts/notes/stores/mutations.js
View file @ 1c7372ad
......@@ -102,7 +102,7 @@ export default {
discussionsData.forEach(discussion => {
if (discussion.diff_file) {
Object.assign(discussion, {
fileHash: discussion.diff_file.file_hash,
file_hash: discussion.diff_file.file_hash,
truncated_diff_lines: discussion.truncated_diff_lines || [],
});
}
......@@ -195,7 +195,7 @@ export default {
const selectedDiscussion = state.discussions.find(disc => disc.id === note.id);
note.expanded = true; // override expand flag to prevent collapse
if (note.diff_file) {
Object.assign(note, { fileHash: note.diff_file.file_hash });
Object.assign(note, { file_hash: note.diff_file.file_hash });
}
Object.assign(selectedDiscussion, { ...note });
},
......
app/assets/javascripts/pages/dashboard/issues/index.js
View file @ 1c7372ad
import projectSelect from '~/project_select';
import initLegacyFilters from '~/init_legacy_filters';
import initFilteredSearch from '~/pages/search/init_filtered_search';
import IssuableFilteredSearchTokenKeys from '~/filtered_search/issuable_filtered_search_token_keys';
import { FILTERED_SEARCH } from '~/pages/constants';
document.addEventListener('DOMContentLoaded', () => {
initFilteredSearch({
page: FILTERED_SEARCH.ISSUES,
filteredSearchTokenKeys: IssuableFilteredSearchTokenKeys,
});
projectSelect();
initLegacyFilters();
});
app/assets/javascripts/pages/dashboard/merge_requests/index.js
View file @ 1c7372ad
import projectSelect from '~/project_select';
import initLegacyFilters from '~/init_legacy_filters';
import initFilteredSearch from '~/pages/search/init_filtered_search';
import IssuableFilteredSearchTokenKeys from '~/filtered_search/issuable_filtered_search_token_keys';
import { FILTERED_SEARCH } from '~/pages/constants';
document.addEventListener('DOMContentLoaded', () => {
IssuableFilteredSearchTokenKeys.addExtraTokensForMergeRequests();
initFilteredSearch({
page: FILTERED_SEARCH.MERGE_REQUESTS,
filteredSearchTokenKeys: IssuableFilteredSearchTokenKeys,
});
projectSelect();
initLegacyFilters();
});
app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue
View file @ 1c7372ad
<script>
import _ from 'underscore';
import { s__, sprintf } from '~/locale';
import { GlModal, GlModalDirective } from '@gitlab-org/gitlab-ui';
import { GlModal, GlModalDirective } from '@gitlab/ui';
export default {
components: {
......
app/assets/javascripts/pipelines/components/empty_state.vue
View file @ 1c7372ad
<script>
import { GlButton } from '@gitlab-org/gitlab-ui';
import { GlButton } from '@gitlab/ui';
export default {
name: 'PipelinesEmptyState',
......
app/assets/javascripts/pipelines/components/graph/action_component.vue
View file @ 1c7372ad
<script>
import $ from 'jquery';
import { GlTooltipDirective, GlButton } from '@gitlab/ui';
import axios from '~/lib/utils/axios_utils';
import { dasherize } from '~/lib/utils/text_utility';
import { __ } from '~/locale';
import createFlash from '~/flash';
import tooltip from '~/vue_shared/directives/tooltip';
import Icon from '~/vue_shared/components/icon.vue';
/**
......@@ -20,23 +19,20 @@ import Icon from '~/vue_shared/components/icon.vue';
export default {
components: {
Icon,
GlButton,
},
directives: {
tooltip,
GlTooltip: GlTooltipDirective,
},
props: {
tooltipText: {
type: String,
required: true,
},
link: {
type: String,
required: true,
},
actionIcon: {
type: String,
required: true,
......@@ -47,7 +43,6 @@ export default {
isDisabled: false,
};
},
computed: {
cssClass() {
const actionIconDash = dasherize(this.actionIcon);
......@@ -62,8 +57,7 @@ export default {
*
*/
onClickAction() {
$(this.$el).tooltip('hide');
this.$root.$emit('bv::hide::tooltip', `js-ci-action-${this.link}`);
this.isDisabled = true;
axios
......@@ -82,18 +76,16 @@ export default {
};
</script>
<template>
<button
v-tooltip
<gl-button
:id="`js-ci-action-${link}`"
v-gl-tooltip="{ boundary: 'viewport' }"
:title="tooltipText"
:class="cssClass"
:disabled="isDisabled"
type="button"
class="js-ci-action btn btn-blank
btn-transparent ci-action-icon-container ci-action-icon-wrapper"
data-container="body"
data-boundary="viewport"
@click="onClickAction"
>
<icon :name="actionIcon"/>
</button>
</gl-button>
</template>
app/assets/javascripts/pipelines/components/graph/graph_component.vue
View file @ 1c7372ad
<script>
import _ from 'underscore';
import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
import { GlLoadingIcon } from '@gitlab/ui';
import StageColumnComponent from './stage_column_component.vue';
export default {
......
app/assets/javascripts/pipelines/components/graph/job_group_dropdown.vue
View file @ 1c7372ad
<script>
import $ from 'jquery';
import { GlTooltipDirective } from '@gitlab/ui';
import CiIcon from '~/vue_shared/components/ci_icon.vue';
import JobItem from './job_item.vue';
import tooltip from '../../../vue_shared/directives/tooltip';
/**
* Renders the dropdown for the pipeline graph.
......@@ -12,32 +12,27 @@ import tooltip from '../../../vue_shared/directives/tooltip';
*/
export default {
directives: {
tooltip,
GlTooltip: GlTooltipDirective,
},
components: {
JobItem,
CiIcon,
},
props: {
group: {
type: Object,
required: true,
},
},
computed: {
tooltipText() {
const { name, status } = this.group;
return `${name} - ${status.label}`;
},
},
mounted() {
this.stopDropdownClickPropagation();
},
methods: {
/**
* When the user right clicks or cmd/ctrl + click in the group name or the action icon
......@@ -65,12 +60,10 @@ export default {
<template>
<div class="ci-job-dropdown-container dropdown dropright">
<button
v-tooltip
v-gl-tooltip.hover="{ boundary: 'viewport' }"
:title="tooltipText"
type="button"
data-toggle="dropdown"
data-container="body"
data-boundary="viewport"
data-display="static"
class="dropdown-menu-toggle build-content"
>
......
app/assets/javascripts/pipelines/components/graph/job_item.vue
View file @ 1c7372ad
<script>
import ActionComponent from './action_component.vue';
import JobNameComponent from './job_name_component.vue';
import tooltip from '../../../vue_shared/directives/tooltip';
import { GlTooltipDirective, GlLink } from '@gitlab/ui';
import { sprintf } from '~/locale';
import delayedJobMixin from '~/jobs/mixins/delayed_job_mixin';
......@@ -34,9 +34,10 @@ export default {
components: {
ActionComponent,
JobNameComponent,
GlLink,
},
directives: {
tooltip,
GlTooltip: GlTooltipDirective,
},
mixins: [delayedJobMixin],
props: {
......@@ -55,7 +56,6 @@ export default {
default: Infinity,
},
},
computed: {
status() {
return this.job && this.job.status ? this.job.status : {};
......@@ -88,7 +88,6 @@ export default {
tooltipBoundary() {
return this.dropdownLength < 5 ? 'viewport' : null;
},
/**
* Verifies if the provided job has an action path
*
......@@ -98,7 +97,6 @@ export default {
return this.job.status && this.job.status.action && this.job.status.action.path;
},
},
methods: {
pipelineActionRequestComplete() {
this.$emit('pipelineActionRequestComplete');
......@@ -108,30 +106,26 @@ export default {
</script>
<template>
<div class="ci-job-component">
<a
<gl-link
v-if="status.has_details"
v-tooltip
v-gl-tooltip="{ boundary: tooltipBoundary }"
:href="status.details_path"
:title="tooltipText"
:class="cssClassJobName"
:data-boundary="tooltipBoundary"
data-container="body"
class="js-pipeline-graph-job-link"
>
<job-name-component
:name="job.name"
:status="job.status"
/>
</a>
</gl-link>
<div
v-else
v-tooltip
v-gl-tooltip
:title="tooltipText"
:class="cssClassJobName"
class="js-job-component-tooltip non-details-job-component"
data-container="body"
>
<job-name-component
......
app/assets/javascripts/pipelines/components/graph/stage_column_component.vue
View file @ 1c7372ad
......@@ -13,34 +13,28 @@ export default {
type: String,
required: true,
},
groups: {
type: Array,
required: true,
},
isFirstColumn: {
type: Boolean,
required: false,
default: false,
},
stageConnectorClass: {
type: String,
required: false,
default: '',
},
},
methods: {
groupId(group) {
return `ci-badge-${_.escape(group.name)}`;
},
buildConnnectorClass(index) {
return index === 0 && !this.isFirstColumn ? 'left-connector' : '';
},
pipelineActionRequestComplete() {
this.$emit('refreshPipelineGraph');
},
......@@ -50,7 +44,8 @@ export default {
<template>
<li
:class="stageConnectorClass"
class="stage-column">
class="stage-column"
>
<div class="stage-name">
{{ title }}
</div>
......@@ -78,7 +73,6 @@ export default {
:group="group"
@pipelineActionRequestComplete="pipelineActionRequestComplete"
/>
</li>
</ul>
</div>
......
app/assets/stylesheets/framework/files.scss
View file @ 1c7372ad
This diff is collapsed.
app/assets/stylesheets/pages/diff.scss
View file @ 1c7372ad
This diff is collapsed.
app/assets/stylesheets/pages/issuable.scss
View file @ 1c7372ad
This diff is collapsed.
app/assets/stylesheets/pages/note_form.scss
View file @ 1c7372ad
This diff is collapsed.
app/assets/stylesheets/pages/notes.scss
View file @ 1c7372ad
This diff is collapsed.
app/controllers/application_controller.rb
View file @ 1c7372ad
This diff is collapsed.
app/controllers/dashboard_controller.rb
View file @ 1c7372ad
This diff is collapsed.
app/controllers/projects/blob_controller.rb
View file @ 1c7372ad
This diff is collapsed.
app/controllers/root_controller.rb
View file @ 1c7372ad
This diff is collapsed.
app/finders/issuable_finder.rb
View file @ 1c7372ad
This diff is collapsed.
app/helpers/application_helper.rb
View file @ 1c7372ad
This diff is collapsed.
app/helpers/auth_helper.rb
View file @ 1c7372ad
This diff is collapsed.
app/helpers/dashboard_helper.rb
View file @ 1c7372ad
This diff is collapsed.
app/helpers/nav_helper.rb
View file @ 1c7372ad
This diff is collapsed.
app/helpers/profiles_helper.rb
View file @ 1c7372ad
This diff is collapsed.
app/helpers/search_helper.rb
View file @ 1c7372ad
This diff is collapsed.
app/models/application_record.rb 0 → 100644
View file @ 1c7372ad
This diff is collapsed.
app/models/ci/build.rb
View file @ 1c7372ad
This diff is collapsed.
app/models/ci/pipeline.rb
View file @ 1c7372ad
This diff is collapsed.
app/models/ci/pipeline_enums.rb 0 → 100644
View file @ 1c7372ad
This diff is collapsed.
app/models/clusters/applications/knative.rb
View file @ 1c7372ad
This diff is collapsed.
app/models/clusters/kubernetes_namespace.rb
View file @ 1c7372ad
This diff is collapsed.
app/models/commit.rb
View file @ 1c7372ad
This diff is collapsed.
app/models/commit_status.rb
View file @ 1c7372ad
This diff is collapsed.
app/models/commit_status_enums.rb 0 → 100644
View file @ 1c7372ad
This diff is collapsed.
app/models/concerns/deployable.rb
View file @ 1c7372ad
This diff is collapsed.
app/models/deployment.rb
View file @ 1c7372ad
This diff is collapsed.
app/models/hooks/service_hook.rb
View file @ 1c7372ad
This diff is collapsed.
app/models/member.rb
View file @ 1c7372ad
This diff is collapsed.
app/models/merge_request.rb
View file @ 1c7372ad
This diff is collapsed.
app/models/project.rb
View file @ 1c7372ad
This diff is collapsed.
app/models/user.rb
View file @ 1c7372ad
This diff is collapsed.
app/models/user_callout.rb
View file @ 1c7372ad
This diff is collapsed.
app/models/user_callout_enums.rb 0 → 100644
View file @ 1c7372ad
This diff is collapsed.
app/policies/ci/pipeline_policy.rb
View file @ 1c7372ad
This diff is collapsed.
app/presenters/ci/pipeline_presenter.rb
View file @ 1c7372ad
This diff is collapsed.
app/services/ci/destroy_pipeline_service.rb 0 → 100644
View file @ 1c7372ad
This diff is collapsed.
app/services/projects/disable_deploy_key_service.rb 0 → 100644
View file @ 1c7372ad
This diff is collapsed.
app/services/users/build_service.rb
View file @ 1c7372ad
This diff is collapsed.
app/views/dashboard/issues.html.haml
View file @ 1c7372ad
This diff is collapsed.
app/views/discussions/_discussion.html.haml
View file @ 1c7372ad
This diff is collapsed.
app/views/events/event/_push.html.haml
View file @ 1c7372ad
This diff is collapsed.
app/views/layouts/nav/_dashboard.html.haml
View file @ 1c7372ad
This diff is collapsed.
app/views/shared/_label.html.haml
View file @ 1c7372ad
This diff is collapsed.
app/views/shared/issuable/_filter.html.haml deleted 100644 → 0
View file @ 9737cc8a
This diff is collapsed.
app/workers/build_finished_worker.rb
View file @ 1c7372ad
This diff is collapsed.
app/workers/process_commit_worker.rb
View file @ 1c7372ad
This diff is collapsed.
bin/rails
View file @ 1c7372ad
This diff is collapsed.
bin/rake
View file @ 1c7372ad
This diff is collapsed.
bin/rspec
View file @ 1c7372ad
This diff is collapsed.
bin/setup
View file @ 1c7372ad
This diff is collapsed.
changelogs/unreleased/49479-hide-unmerged-env-perf-stats.yml 0 → 100644
View file @ 1c7372ad
This diff is collapsed.
changelogs/unreleased/49726-upgrade-helm-to-2-11.yml 0 → 100644
View file @ 1c7372ad
This diff is collapsed.
changelogs/unreleased/51959-branch-and-tag-name-links.yml 0 → 100644
View file @ 1c7372ad
This diff is collapsed.
changelogs/unreleased/52385-search-bar-for-dashboard-list.yml 0 → 100644
View file @ 1c7372ad
This diff is collapsed.
changelogs/unreleased/53700-hashed-storagemigration.yml 0 → 100644
View file @ 1c7372ad
This diff is collapsed.
changelogs/unreleased/54004-update-asana-to-0-8-1.yml 0 → 100644
View file @ 1c7372ad
This diff is collapsed.
changelogs/unreleased/54010-update-asciidoctor-to-1-5-8.yml 0 → 100644
View file @ 1c7372ad
This diff is collapsed.
changelogs/unreleased/54021-empty-button.yml 0 → 100644
View file @ 1c7372ad
This diff is collapsed.
changelogs/unreleased/added-glob-for-ci-changes-detection.yml 0 → 100644
View file @ 1c7372ad
This diff is collapsed.
changelogs/unreleased/an-gitaly-version-0-133-0.yml 0 → 100644
View file @ 1c7372ad
This diff is collapsed.
changelogs/unreleased/auto_devops_kubernetes_active.yml 0 → 100644
View file @ 1c7372ad
This diff is collapsed.
changelogs/unreleased/ce-53347_fix_impersonation_tokens.yml 0 → 100644
View file @ 1c7372ad
This diff is collapsed.
changelogs/unreleased/dm-commit-email-select-options.yml 0 → 100644
View file @ 1c7372ad
This diff is collapsed.
changelogs/unreleased/drop-gcp-cluster-table.yml 0 → 100644
View file @ 1c7372ad
This diff is collapsed.
changelogs/unreleased/fix-deployment-metrics-in-mr-widget.yml 0 → 100644
View file @ 1c7372ad
This diff is collapsed.
changelogs/unreleased/fix-not-render-emoji.yml 0 → 100644
View file @ 1c7372ad
This diff is collapsed.
changelogs/unreleased/frozen-string-lib-gitlab-even-more.yml 0 → 100644
View file @ 1c7372ad
This diff is collapsed.
changelogs/unreleased/gt-fix-typos-in-lib.yml 0 → 100644
View file @ 1c7372ad
This diff is collapsed.
changelogs/unreleased/gt-remove-unused-project-method.yml 0 → 100644
View file @ 1c7372ad
This diff is collapsed.
changelogs/unreleased/gt-rename-diffs-store-variable.yml 0 → 100644
View file @ 1c7372ad
This diff is collapsed.
changelogs/unreleased/osw-fallback-on-blank-refs.yml 0 → 100644
View file @ 1c7372ad
This diff is collapsed.
changelogs/unreleased/sh-fix-issue-53783-ce.yml 0 → 100644
View file @ 1c7372ad
This diff is collapsed.
changelogs/unreleased/sh-remove-local-sidekiq-admin-check.yml 0 → 100644
View file @ 1c7372ad
This diff is collapsed.
changelogs/unreleased/sh-use-nakayoshi-fork.yml 0 → 100644
View file @ 1c7372ad
This diff is collapsed.
changelogs/unreleased/sh-use-nokogiri-xml-backend.yml 0 → 100644
View file @ 1c7372ad
This diff is collapsed.
changelogs/unreleased/switch-rails.yml 0 → 100644
View file @ 1c7372ad
This diff is collapsed.
changelogs/unreleased/triggermesh-phase2-serverless.yml 0 → 100644
View file @ 1c7372ad
This diff is collapsed.
changelogs/unreleased/validate-foreign-keys-being-indexed.yml 0 → 100644
View file @ 1c7372ad
This diff is collapsed.
config/application.rb
View file @ 1c7372ad
This diff is collapsed.
config/boot.rb
View file @ 1c7372ad
This diff is collapsed.
config/dependency_decisions.yml
View file @ 1c7372ad
This diff is collapsed.
config/environment.rb
View file @ 1c7372ad
This diff is collapsed.
db/migrate/20181031190558_drop_fk_gcp_clusters_table.rb 0 → 100644
View file @ 1c7372ad
This diff is collapsed.
db/migrate/20181031190559_drop_gcp_clusters_table.rb 0 → 100644
View file @ 1c7372ad
This diff is collapsed.
db/schema.rb
View file @ 1c7372ad
This diff is collapsed.
doc/administration/git_protocol.md
View file @ 1c7372ad
This diff is collapsed.
doc/administration/uploads.md
View file @ 1c7372ad
This diff is collapsed.
doc/api/avatar.md
View file @ 1c7372ad
This diff is collapsed.
doc/api/commits.md
View file @ 1c7372ad
This diff is collapsed.
doc/api/events.md
View file @ 1c7372ad
This diff is collapsed.
doc/api/pipelines.md
View file @ 1c7372ad
This diff is collapsed.
doc/api/users.md
View file @ 1c7372ad
This diff is collapsed.
doc/ci/pipelines.md
View file @ 1c7372ad
This diff is collapsed.
doc/ci/yaml/README.md
View file @ 1c7372ad
This diff is collapsed.
doc/development/README.md
View file @ 1c7372ad
This diff is collapsed.
doc/development/architecture.md
View file @ 1c7372ad
This diff is collapsed.
doc/development/changelog.md
View file @ 1c7372ad
This diff is collapsed.
doc/development/feature_flags.md
View file @ 1c7372ad
This diff is collapsed.
doc/development/i18n/proofreader.md
View file @ 1c7372ad
This diff is collapsed.
doc/development/logging.md 0 → 100644
View file @ 1c7372ad
This diff is collapsed.
doc/development/migration_style_guide.md
View file @ 1c7372ad
This diff is collapsed.
doc/development/switching_to_rails5.md 0 → 100644
View file @ 1c7372ad
This diff is collapsed.
doc/install/requirements.md
View file @ 1c7372ad
This diff is collapsed.
doc/topics/autodevops/index.md
View file @ 1c7372ad
This diff is collapsed.
doc/topics/git/troubleshooting_git.md
View file @ 1c7372ad
This diff is collapsed.
doc/university/training/topics/tags.md
View file @ 1c7372ad
This diff is collapsed.
doc/user/project/clusters/index.md
View file @ 1c7372ad
This diff is collapsed.
doc/user/project/clusters/serverless/img/deploy-stage.png 0 → 100644
View file @ 1c7372ad
This diff is collapsed.
doc/user/project/clusters/serverless/img/dns-entry.png 0 → 100644
View file @ 1c7372ad
This diff is collapsed.
doc/user/project/clusters/serverless/img/install-knative.png 0 → 100644
View file @ 1c7372ad
This diff is collapsed.
doc/user/project/clusters/serverless/img/knative-app.png 0 → 100644
View file @ 1c7372ad
This diff is collapsed.
doc/user/project/clusters/serverless/index.md 0 → 100644
View file @ 1c7372ad
This diff is collapsed.
doc/user/project/import/github.md
View file @ 1c7372ad
This diff is collapsed.
doc/user/project/merge_requests/img/comment-on-any-diff-line.png 0 → 100644
View file @ 1c7372ad
This diff is collapsed.
doc/user/project/merge_requests/index.md
View file @ 1c7372ad
This diff is collapsed.
doc/user/project/milestones/index.md
View file @ 1c7372ad
This diff is collapsed.
doc/user/project/repository/index.md
View file @ 1c7372ad
This diff is collapsed.
doc/user/project/settings/index.md
View file @ 1c7372ad
This diff is collapsed.
doc/user/search/img/dashboard_links.png 0 → 100644
View file @ 1c7372ad
This diff is collapsed.
doc/user/search/img/left_menu_bar.png deleted 100644 → 0
View file @ 9737cc8a
This diff is collapsed.
doc/user/search/index.md
View file @ 1c7372ad
This diff is collapsed.
doc/workflow/shortcuts.md
View file @ 1c7372ad
This diff is collapsed.
lib/api/commits.rb
View file @ 1c7372ad
This diff is collapsed.
lib/api/entities.rb
View file @ 1c7372ad
This diff is collapsed.
lib/api/pipelines.rb
View file @ 1c7372ad
This diff is collapsed.
lib/api/users.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/checks/commit_check.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/ci/build/policy/changes.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/ci/parsers/test/junit.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/ci/variables/collection/item.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/file_detector.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/fogbugz_import/client.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/fogbugz_import/importer.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/fogbugz_import/repository.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/gfm/reference_rewriter.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/gfm/uploads_rewriter.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/git/attributes_at_ref_parser.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/git/attributes_parser.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/git/blame.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/git/blob.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/git/branch.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/git/commit.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/git/commit_stats.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/git/compare.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/git/conflict/file.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/git/conflict/parser.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/git/conflict/resolution.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/git/conflict/resolver.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/git/diff.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/git/diff_collection.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/git/gitmodules_parser.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/git/hook_env.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/git/index.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/git/lfs_changes.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/git/lfs_pointer_file.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/git/operation_service.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/git/path_helper.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/git/pre_receive_error.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/git/raw_diff_change.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/git/ref.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/git/remote_mirror.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/git/remote_repository.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/git/repository.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/git/repository_mirroring.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/git/tag.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/git/tree.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/git/user.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/git/util.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/git/version.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/git/wiki.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/git/wiki_file.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/git/wiki_page.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/git/wiki_page_version.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/git/wraps_gitaly_errors.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/gitaly_client.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/gitaly_client/attributes_bag.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/gitaly_client/blob_service.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/gitaly_client/blobs_stitcher.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/gitaly_client/commit_service.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/gitaly_client/diff.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/gitaly_client/diff_stitcher.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/gitaly_client/ref_service.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/gitaly_client/remote_service.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/gitaly_client/server_service.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/gitaly_client/storage_service.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/gitaly_client/util.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/gitaly_client/wiki_file.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/gitaly_client/wiki_page.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/gitaly_client/wiki_service.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/gitlab_import/client.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/gitlab_import/importer.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/gitlab_import/project_creator.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/google_code_import/client.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/google_code_import/importer.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/google_code_import/repository.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/gpg/commit.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/graphql/authorize.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/graphql/connections.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/graphql/errors.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/graphql/expose_permissions.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/graphql/present.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/graphql/variables.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/graphs/commits.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/hashed_storage/migrator.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/hashed_storage/rake_helper.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/health_checks/db_check.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/health_checks/gitaly_check.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/health_checks/metric.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/health_checks/result.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/http_io.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/kubernetes/helm.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/kubernetes/helm/api.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/kubernetes/helm/client_command.rb 0 → 100644
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/kubernetes/kube_client.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/private_commit_email.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/sentry.rb
View file @ 1c7372ad
This diff is collapsed.
lib/gitlab/view/presenter/base.rb
View file @ 1c7372ad
This diff is collapsed.
locale/ar_SA/gitlab.po
View file @ 1c7372ad
This diff is collapsed.
locale/bg/gitlab.po
View file @ 1c7372ad
This diff is collapsed.
locale/ca_ES/gitlab.po
View file @ 1c7372ad
This diff is collapsed.
locale/cs_CZ/gitlab.po
View file @ 1c7372ad
This diff is collapsed.
locale/da_DK/gitlab.po
View file @ 1c7372ad
This diff is collapsed.
locale/de/gitlab.po
View file @ 1c7372ad
This diff is collapsed.
locale/eo/gitlab.po
View file @ 1c7372ad
This diff is collapsed.
locale/es/gitlab.po
View file @ 1c7372ad
This diff is collapsed.
locale/et_EE/gitlab.po
View file @ 1c7372ad
This diff is collapsed.
locale/fil_PH/gitlab.po
View file @ 1c7372ad
This diff is collapsed.
locale/fr/gitlab.po
View file @ 1c7372ad
This diff is collapsed.
locale/gitlab.pot
View file @ 1c7372ad
This diff is collapsed.
locale/gl_ES/gitlab.po
View file @ 1c7372ad
This diff is collapsed.
locale/he_IL/gitlab.po
View file @ 1c7372ad
This diff is collapsed.
locale/id_ID/gitlab.po
View file @ 1c7372ad
This diff is collapsed.
locale/it/gitlab.po
View file @ 1c7372ad
This diff is collapsed.
locale/ja/gitlab.po
View file @ 1c7372ad
This diff is collapsed.
locale/ko/gitlab.po
View file @ 1c7372ad
This diff is collapsed.
locale/mn_MN/gitlab.po
View file @ 1c7372ad
This diff is collapsed.
locale/nb_NO/gitlab.po
View file @ 1c7372ad
This diff is collapsed.
locale/nl_NL/gitlab.po
View file @ 1c7372ad
This diff is collapsed.
locale/pl_PL/gitlab.po
View file @ 1c7372ad
This diff is collapsed.
locale/pt_BR/gitlab.po
View file @ 1c7372ad
This diff is collapsed.
locale/ro_RO/gitlab.po
View file @ 1c7372ad
This diff is collapsed.
locale/ru/gitlab.po
View file @ 1c7372ad
This diff is collapsed.
locale/sq_AL/gitlab.po
View file @ 1c7372ad
This diff is collapsed.
locale/tr_TR/gitlab.po
View file @ 1c7372ad
This diff is collapsed.
locale/uk/gitlab.po
View file @ 1c7372ad
This diff is collapsed.
locale/zh_CN/gitlab.po
View file @ 1c7372ad
This diff is collapsed.
locale/zh_HK/gitlab.po
View file @ 1c7372ad
This diff is collapsed.
locale/zh_TW/gitlab.po
View file @ 1c7372ad
This diff is collapsed.
package.json
View file @ 1c7372ad
This diff is collapsed.
scripts/build_assets_image
View file @ 1c7372ad
This diff is collapsed.
scripts/rails4-gemfile-lock-check 0 → 100755
View file @ 1c7372ad
This diff is collapsed.
scripts/rails5-gemfile-lock-check deleted 100755 → 0
View file @ 9737cc8a
This diff is collapsed.
spec/controllers/root_controller_spec.rb
View file @ 1c7372ad
This diff is collapsed.
spec/db/schema_spec.rb 0 → 100644
View file @ 1c7372ad
This diff is collapsed.
spec/fast_spec_helper.rb
View file @ 1c7372ad
This diff is collapsed.
spec/features/admin/admin_users_spec.rb
View file @ 1c7372ad
This diff is collapsed.
spec/features/atom/dashboard_issues_spec.rb
View file @ 1c7372ad
This diff is collapsed.
spec/features/dashboard/issues_spec.rb
View file @ 1c7372ad
This diff is collapsed.
spec/features/dashboard/milestone_filter_spec.rb deleted 100644 → 0
View file @ 9737cc8a
This diff is collapsed.
spec/features/issues/form_spec.rb
View file @ 1c7372ad
This diff is collapsed.
spec/features/projects/jobs_spec.rb
View file @ 1c7372ad
This diff is collapsed.
spec/features/users/login_spec.rb
View file @ 1c7372ad
This diff is collapsed.
spec/finders/pipelines_finder_spec.rb
View file @ 1c7372ad
This diff is collapsed.
spec/fixtures/trace/sample_trace
View file @ 1c7372ad
This diff is collapsed.
spec/helpers/auth_helper_spec.rb
View file @ 1c7372ad
This diff is collapsed.
spec/helpers/profiles_helper_spec.rb
View file @ 1c7372ad
This diff is collapsed.
spec/helpers/search_helper_spec.rb
View file @ 1c7372ad
This diff is collapsed.
spec/javascripts/diffs/store/utils_spec.js
View file @ 1c7372ad
This diff is collapsed.
spec/lib/gitlab/file_detector_spec.rb
View file @ 1c7372ad
This diff is collapsed.
spec/lib/gitlab/git/commit_spec.rb
View file @ 1c7372ad
This diff is collapsed.
spec/lib/gitlab/git/repository_spec.rb
View file @ 1c7372ad
This diff is collapsed.
spec/lib/gitlab/git/tag_spec.rb
View file @ 1c7372ad
This diff is collapsed.
spec/lib/gitlab/kubernetes/helm/api_spec.rb
View file @ 1c7372ad
This diff is collapsed.
spec/lib/gitlab/kubernetes/helm/pod_spec.rb
View file @ 1c7372ad
This diff is collapsed.
spec/lib/gitlab/sentry_spec.rb
View file @ 1c7372ad
This diff is collapsed.
spec/models/ci/build_spec.rb
View file @ 1c7372ad
This diff is collapsed.
spec/models/commit_spec.rb
View file @ 1c7372ad
This diff is collapsed.
spec/models/concerns/awardable_spec.rb
View file @ 1c7372ad
This diff is collapsed.
spec/models/concerns/deployable_spec.rb
View file @ 1c7372ad
This diff is collapsed.
spec/models/merge_request_spec.rb
View file @ 1c7372ad
This diff is collapsed.
spec/models/project_spec.rb
View file @ 1c7372ad
This diff is collapsed.
spec/models/user_spec.rb
View file @ 1c7372ad
This diff is collapsed.
spec/policies/ci/pipeline_policy_spec.rb
View file @ 1c7372ad
This diff is collapsed.
spec/requests/api/pipelines_spec.rb
View file @ 1c7372ad
This diff is collapsed.
spec/requests/api/users_spec.rb
View file @ 1c7372ad
This diff is collapsed.
spec/services/ci/destroy_pipeline_service_spec.rb 0 → 100644
View file @ 1c7372ad
This diff is collapsed.
spec/services/system_hooks_service_spec.rb
View file @ 1c7372ad
This diff is collapsed.
spec/services/users/build_service_spec.rb
View file @ 1c7372ad
This diff is collapsed.
spec/spec_helper.rb
View file @ 1c7372ad
This diff is collapsed.
spec/support/helpers/filter_item_select_helper.rb deleted 100644 → 0
View file @ 9737cc8a
This diff is collapsed.
spec/support/helpers/kubernetes_helpers.rb
View file @ 1c7372ad
This diff is collapsed.
spec/support/helpers/user_login_helper.rb 0 → 100644
View file @ 1c7372ad
This diff is collapsed.
spec/workers/emails_on_push_worker_spec.rb
View file @ 1c7372ad
This diff is collapsed.
vendor/licenses.csv
View file @ 1c7372ad
This diff is collapsed.
yarn.lock
View file @ 1c7372ad
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7