Skip to content

G
gitlab-ce
Commit 17853757 authored by Matija Čupić's avatar Matija Čupić
Browse files
Options

Merge branch 'master' into... 

Merge branch 'master' into 39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled
parents 92a72ce4 6f1b4dc7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 10433 additions and 7041 deletions

Too many changes to show.
Plain diff Email patch

To preserve performance only 1000 of 1000+ files are displayed.

.codeclimate.yml
View file @ 17853757
......@@ -16,6 +16,7 @@ engines:
enabled: true
rubocop:
enabled: true
channel: "gitlab-rubocop-0-52"
ratings:
paths:
- Gemfile.lock
......
.gitlab-ci.yml
View file @ 17853757
image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.3.5-golang-1.8-git-2.14-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6"
image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.3.6-golang-1.9-git-2.14-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6"
.dedicated-runner: &dedicated-runner
retry: 1
......@@ -431,6 +431,7 @@ ee_compat_check:
- master
- tags
- /^[\d-]+-stable(-ee)?/
- /^security-/
- branches@gitlab-org/gitlab-ee
- branches@gitlab/gitlab-ee
retry: 0
......@@ -508,7 +509,7 @@ db:rollback-mysql:
<<: *db-rollback
<<: *use-mysql
.db-seed_fu: &db-seed_fu
.gitlab-setup: &gitlab-setup
<<: *dedicated-runner
<<: *except-docs-and-qa
<<: *pull-cache
......@@ -517,22 +518,24 @@ db:rollback-mysql:
SIZE: "1"
SETUP_DB: "false"
CREATE_DB_USER: "true"
FIXTURE_PATH: db/fixtures/development
script:
- git clone https://gitlab.com/gitlab-org/gitlab-test.git
/home/git/repositories/gitlab-org/gitlab-test.git
- bundle exec rake db:setup db:seed_fu
- scripts/gitaly-test-spawn
- force=yes bundle exec rake gitlab:setup
artifacts:
when: on_failure
expire_in: 1d
paths:
- log/development.log
db:seed_fu-pg:
<<: *db-seed_fu
gitlab:setup-pg:
<<: *gitlab-setup
<<: *use-pg
db:seed_fu-mysql:
<<: *db-seed_fu
gitlab:setup-mysql:
<<: *gitlab-setup
<<: *use-mysql
# Frontend-related jobs
......@@ -594,12 +597,20 @@ codequality:
script:
- cp .rubocop.yml .rubocop.yml.bak
- grep -v "rubocop-gitlab-security" .rubocop.yml.bak > .rubocop.yml
- docker run --env CODECLIMATE_CODE="$PWD" --volume "$PWD":/code --volume /var/run/docker.sock:/var/run/docker.sock --volume /tmp/cc:/tmp/cc codeclimate/codeclimate analyze -f json > raw_codeclimate.json
- docker run --env CODECLIMATE_CODE="$PWD" --volume "$PWD":/code --volume /var/run/docker.sock:/var/run/docker.sock --volume /tmp/cc:/tmp/cc dev.gitlab.org:5005/gitlab/gitlab-build-images:gitlab-codeclimate-v2 analyze -f json > raw_codeclimate.json
- cat raw_codeclimate.json | docker run -i stedolan/jq -c 'map({check_name,fingerprint,location})' > codeclimate.json
- mv .rubocop.yml.bak .rubocop.yml
artifacts:
paths: [codeclimate.json]
sast:
image: registry.gitlab.com/gitlab-org/gl-sast:latest
before_script: []
script:
- /app/bin/run .
artifacts:
paths: [gl-sast-report.json]
qa:internal:
<<: *dedicated-runner
<<: *except-docs
......
.rubocop.yml
View file @ 17853757
This diff is collapsed.
.rubocop_todo.yml
View file @ 17853757
This diff is collapsed.
CHANGELOG.md
View file @ 17853757
This diff is collapsed.
CONTRIBUTING.md
View file @ 17853757
......@@ -553,7 +553,7 @@ the feature you contribute through all of these steps.
1. Description explaining the relevancy (see following item)
1. Working and clean code that is commented where needed
1. [Unit and system tests][testing] that pass on the CI server
1. [Unit, integration, and system tests][testing] that pass on the CI server
1. Performance/scalability implications have been considered, addressed, and tested
1. [Documented][doc-styleguide] in the `/doc` directory
1. [Changelog entry added][changelog], if necessary
......
Gemfile
View file @ 17853757
......@@ -12,7 +12,7 @@ gem 'sprockets', '~> 3.7.0'
gem 'default_value_for', '~> 3.0.0'
# Supported DBs
gem 'mysql2', '~> 0.4.5', group: :mysql
gem 'mysql2', '~> 0.4.10', group: :mysql
gem 'pg', '~> 0.18.2', group: :postgres
gem 'rugged', '~> 0.26.0'
......@@ -283,7 +283,7 @@ group :metrics do
gem 'influxdb', '~> 0.2', require: false
# Prometheus
gem 'prometheus-client-mmap', '~> 0.7.0.beta43'
gem 'prometheus-client-mmap', '~> 0.7.0.beta44'
gem 'raindrops', '~> 0.18'
end
......@@ -334,9 +334,11 @@ group :development, :test do
gem 'spring-commands-rspec', '~> 1.0.4'
gem 'spring-commands-spinach', '~> 1.1.0'
gem 'rubocop', '~> 0.49.1', require: false
gem 'rubocop-rspec', '~> 1.15.1', require: false
gem 'rubocop-gitlab-security', '~> 0.1.0', require: false
gem 'gitlab-styles', '~> 2.2.0', require: false
# Pin these dependencies, otherwise a new rule could break the CI pipelines
gem 'rubocop', '~> 0.52.0'
gem 'rubocop-rspec', '~> 1.20.1'
gem 'scss_lint', '~> 0.54.0', require: false
gem 'haml_lint', '~> 0.26.0', require: false
gem 'simplecov', '~> 0.14.0', require: false
......@@ -400,7 +402,7 @@ group :ed25519 do
end
# Gitaly GRPC client
gem 'gitaly-proto', '~> 0.61.0', require: 'gitaly'
gem 'gitaly-proto', '~> 0.64.0', require: 'gitaly'
gem 'toml-rb', '~> 0.3.15', require: false
......
Gemfile.lock
View file @ 17853757
......@@ -284,7 +284,7 @@ GEM
po_to_json (>= 1.0.0)
rails (>= 3.2.0)
gherkin-ruby (0.3.2)
gitaly-proto (0.61.0)
gitaly-proto (0.64.0)
google-protobuf (~> 3.1)
grpc (~> 1.0)
github-linguist (4.7.6)
......@@ -303,6 +303,10 @@ GEM
mime-types (>= 1.16)
posix-spawn (~> 0.3)
gitlab-markup (1.6.3)
gitlab-styles (2.2.0)
rubocop (~> 0.51)
rubocop-gitlab-security (~> 0.1.0)
rubocop-rspec (~> 1.19)
gitlab_omniauth-ldap (2.0.4)
net-ldap (~> 0.16)
omniauth (~> 1.3)
......@@ -501,7 +505,7 @@ GEM
mustermann (1.0.0)
mustermann-grape (1.0.0)
mustermann (~> 1.0.0)
mysql2 (0.4.5)
mysql2 (0.4.10)
net-ldap (0.16.0)
net-ssh (4.1.0)
netrc (0.11.0)
......@@ -630,7 +634,7 @@ GEM
parser
unparser
procto (0.0.3)
prometheus-client-mmap (0.7.0.beta43)
prometheus-client-mmap (0.7.0.beta44)
pry (0.10.4)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
......@@ -704,7 +708,7 @@ GEM
json
recursive-open-struct (1.0.0)
redcarpet (3.4.0)
redis (3.3.3)
redis (3.3.5)
redis-actionpack (5.0.2)
actionpack (>= 4.0, < 6)
redis-rack (>= 1, < 3)
......@@ -777,21 +781,21 @@ GEM
pg
rails
sqlite3
rubocop (0.49.1)
rubocop (0.52.0)
parallel (~> 1.10)
parser (>= 2.3.3.1, < 3.0)
parser (>= 2.4.0.2, < 3.0)
powerpack (~> 0.1)
rainbow (>= 1.99.1, < 3.0)
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1)
rubocop-gitlab-security (0.1.0)
rubocop (>= 0.47.1)
rubocop-rspec (1.15.1)
rubocop (>= 0.42.0)
rubocop-gitlab-security (0.1.1)
rubocop (>= 0.51)
rubocop-rspec (1.20.1)
rubocop (>= 0.51.0)
ruby-fogbugz (0.2.1)
crack (~> 0.4)
ruby-prof (0.16.2)
ruby-progressbar (1.8.1)
ruby-progressbar (1.9.0)
ruby-saml (1.4.1)
nokogiri (>= 1.5.10)
ruby_parser (3.9.0)
......@@ -835,11 +839,11 @@ GEM
rack
shoulda-matchers (3.1.2)
activesupport (>= 4.0.0)
sidekiq (5.0.4)
sidekiq (5.0.5)
concurrent-ruby (~> 1.0)
connection_pool (~> 2.2, >= 2.2.0)
rack-protection (>= 1.5.0)
redis (~> 3.3, >= 3.3.3)
redis (>= 3.3.4, < 5)
sidekiq-cron (0.6.0)
rufus-scheduler (>= 3.3.0)
sidekiq (>= 4.2.1)
......@@ -1042,10 +1046,11 @@ DEPENDENCIES
gettext (~> 3.2.2)
gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.2.0)
gitaly-proto (~> 0.61.0)
gitaly-proto (~> 0.64.0)
github-linguist (~> 4.7.0)
gitlab-flowdock-git-hook (~> 1.0.1)
gitlab-markup (~> 1.6.2)
gitlab-styles (~> 2.2.0)
gitlab_omniauth-ldap (~> 2.0.4)
gollum-lib (~> 4.2)
gollum-rugged_adapter (~> 0.4.4)
......@@ -1082,7 +1087,7 @@ DEPENDENCIES
method_source (~> 0.8)
minitest (~> 5.7.0)
mousetrap-rails (~> 1.4.6)
mysql2 (~> 0.4.5)
mysql2 (~> 0.4.10)
net-ldap
net-ssh (~> 4.1.0)
nokogiri (~> 1.8.1)
......@@ -1117,7 +1122,7 @@ DEPENDENCIES
peek-sidekiq (~> 1.0.3)
pg (~> 0.18.2)
premailer-rails (~> 1.9.7)
prometheus-client-mmap (~> 0.7.0.beta43)
prometheus-client-mmap (~> 0.7.0.beta44)
pry-byebug (~> 3.4.1)
pry-rails (~> 0.3.4)
rack-attack (~> 4.4.1)
......@@ -1148,9 +1153,8 @@ DEPENDENCIES
rspec-retry (~> 0.4.5)
rspec-set (~> 0.1.3)
rspec_profiling (~> 0.0.5)
rubocop (~> 0.49.1)
rubocop-gitlab-security (~> 0.1.0)
rubocop-rspec (~> 1.15.1)
rubocop (~> 0.52.0)
rubocop-rspec (~> 1.20.1)
ruby-fogbugz (~> 0.2.1)
ruby-prof (~> 0.16.2)
ruby_parser (~> 3.8)
......
VERSION
View file @ 17853757
10.3.0-pre
10.4.0-pre
app/assets/images/file_icons.svg 0 → 100644
View file @ 17853757
This source diff could not be displayed because it is too large. You can view the blob instead.
app/assets/images/icons.json
View file @ 17853757
{"iconCount":181,"spriteSize":81482,"icons":["abuse","account","admin","angle-double-left","angle-double-right","angle-down","angle-left","angle-right","angle-up","appearance","applications","approval","arrow-down","arrow-right","assignee","bold","book","branch","bullhorn","calendar","cancel","chart","chevron-down","chevron-left","chevron-right","chevron-up","clock","close","code","collapse","comment-dots","comment-next","comment","comments","commit","credit-card","cut","dashboard","disk","doc_code","doc_image","doc_text","double-headed-arrow","download","duplicate","earth","ellipsis_v","emoji_slightly_smiling_face","emoji_smile","emoji_smiley","epic","external-link","eye-slash","eye","file-addition","file-deletion","file-modified","filter","folder","fork","geo-nodes","git-merge","group","history","home","hook","hourglass","image-comment-dark","image-comment-light","import","issue-block","issue-child","issue-close","issue-duplicate","issue-new","issue-open-m","issue-open","issue-parent","issues","italic","key-2","key","label","labels","leave","level-up","license","link","list-bulleted","list-numbered","location-dot","location","lock-open","lock","log","mail","menu","merge-request-close","messages","mobile-issue-close","monitor","more","notifications-off","notifications","overview","pencil-square","pencil","pipeline","play","plus-square-o","plus-square","plus","preferences","profile","project","push-rules","question-o","question","quote","redo","remove","repeat","retry","scale","screen-full","screen-normal","scroll_down","scroll_up","search","settings","shield","slight-frown","slight-smile","smile","smiley","snippet","spam","spinner","star-o","star","status_canceled_borderless","status_canceled","status_closed","status_created_borderless","status_created","status_failed_borderless","status_failed","status_manual_borderless","status_manual","status_notfound_borderless","status_open","status_pending_borderless","status_pending","status_running_borderless","status_running","status_skipped_borderless","status_skipped","status_success_borderless","status_success_solid","status_success","status_warning_borderless","status_warning","stop","task-done","template","terminal","thumb-down","thumb-up","thumbtack","timer","todo-add","todo-done","token","unapproval","unassignee","unlink","user","users","volume-up","warning","work"]}
\ No newline at end of file
{"iconCount":186,"spriteSize":84748,"icons":["abuse","account","admin","angle-double-left","angle-double-right","angle-down","angle-left","angle-right","angle-up","appearance","applications","approval","arrow-down","arrow-right","assignee","bold","book","bookmark","branch","bullhorn","calendar","cancel","chart","chevron-down","chevron-left","chevron-right","chevron-up","clock","close","code","collapse","comment-dots","comment-next","comment","comments","commit","credit-card","cut","dashboard","disk","doc_code","doc_image","doc_text","double-headed-arrow","download","duplicate","earth","ellipsis_v","emoji_slightly_smiling_face","emoji_smile","emoji_smiley","epic","external-link","eye-slash","eye","file-addition","file-deletion","file-modified","filter","folder-o","folder-open","folder","fork","geo-nodes","git-merge","group","history","home","hook","hourglass","image-comment-dark","image-comment-light","import","issue-block","issue-child","issue-close","issue-duplicate","issue-external","issue-new","issue-open-m","issue-open","issue-parent","issues","italic","key-2","key","label","labels","leave","level-up","license","link","list-bulleted","list-numbered","location-dot","location","lock-open","lock","log","mail","menu","merge-request-close","messages","mobile-issue-close","monitor","more","notifications-off","notifications","overview","pencil-square","pencil","pipeline","play","plus-square-o","plus-square","plus","podcast","preferences","profile","project","push-rules","question-o","question","quote","redo","remove","repeat","retry","scale","screen-full","screen-normal","scroll_down","scroll_up","search","settings","shield","slight-frown","slight-smile","smile","smiley","snippet","spam","spinner","star-o","star","status_canceled_borderless","status_canceled","status_closed","status_created_borderless","status_created","status_failed_borderless","status_failed","status_manual_borderless","status_manual","status_notfound_borderless","status_open","status_pending_borderless","status_pending","status_running_borderless","status_running","status_skipped_borderless","status_skipped","status_success_borderless","status_success_solid","status_success","status_warning_borderless","status_warning","stop","task-done","template","terminal","thumb-down","thumb-up","thumbtack","timer","todo-add","todo-done","token","unapproval","unassignee","unlink","user","users","volume-up","warning","work"]}
\ No newline at end of file
app/assets/images/icons.svg
View file @ 17853757
This source diff could not be displayed because it is too large. You can view the blob instead.
app/assets/images/illustrations/job_not_triggered.svg 0 → 100644
View file @ 17853757
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 310 141" xmlns:xlink="http://www.w3.org/1999/xlink"><g fill="none" fill-rule="evenodd"><g fill-rule="nonzero"><path fill="#e5e5e5" d="M48 69c0-1.105.887-2 1.998-2h4c1.103 0 1.998.888 1.998 2 0 1.105-.887 2-1.998 2h-4A1.992 1.992 0 0 1 48 69m14 0c0-1.105.887-2 1.998-2h4c1.103 0 1.998.888 1.998 2 0 1.105-.887 2-1.998 2h-4A1.992 1.992 0 0 1 62 69"/><g fill="#31af64"><path d="M19 88C8.507 88 0 79.493 0 69s8.507-19 19-19 19 8.507 19 19-8.507 19-19 19m0-4c8.284 0 15-6.716 15-15 0-8.284-6.716-15-15-15-8.284 0-15 6.716-15 15 0 8.284 6.716 15 15 15"/><path d="M17.07 71.02l-2.829-2.828a1.995 1.995 0 0 0-2.828 0 1.997 1.997 0 0 0 0 2.83l4.243 4.243a1.993 1.993 0 0 0 2.823.005l7.79-7.79a1.998 1.998 0 0 0-.007-2.822 1.99 1.99 0 0 0-2.822-.006l-6.37 6.37v-.001"/></g></g><g transform="translate(187)"><rect width="116" height="134" y="7" fill="#f9f9f9" rx="10"/><rect width="116" height="134" x="5" y="2" fill="#fff" rx="10"/><path fill="#eee" fill-rule="nonzero" d="M15 4a8 8 0 0 0-8 8v114a8 8 0 0 0 8 8h96a8 8 0 0 0 8-8V12a8 8 0 0 0-8-8H15m0-4h96c6.627 0 12 5.373 12 12v114c0 6.627-5.373 12-12 12H15c-6.627 0-12-5.373-12-12V12C3 5.373 8.373 0 15 0"/><g transform="translate(23 25)"><g fill="#e1dbf1"><rect width="16" height="4" rx="2"/><rect width="16" height="4" x="32" y="12" rx="2"/></g><rect width="16" height="4" x="44" fill="#eee" rx="2"/><rect width="16" height="4" x="12" y="24" fill="#e1dbf1" rx="2"/><rect width="16" height="4" x="64" y="36" fill="#fef0e8" rx="2"/><rect width="8" height="4" x="20" fill="#fee1d3" rx="2" id="a"/><rect width="8" height="4" x="32" y="36" fill="#fc6d26" rx="2"/><rect width="8" height="4" x="52" y="12" fill="#fef0e8" rx="2"/><rect width="8" height="4" x="64" fill="#fef0e8" rx="2" id="b"/><rect width="12" height="4" x="16" y="48" fill="#e1dbf1" rx="2"/><rect width="8" height="4" x="44" y="36" fill="#fc6d26" rx="2"/><g fill="#e1dbf1"><rect width="4" height="4" x="56" y="36" rx="2"/><rect width="4" height="4" x="64" y="60" rx="2"/></g><rect width="4" height="4" x="72" y="60" fill="#fc6d26" rx="2"/><rect width="8" height="4" x="32" fill="#fc6d26" rx="2" id="c"/><g fill="#eee"><rect width="28" height="4" y="36" rx="2"/><rect width="28" height="4" x="44" y="48" rx="2"/></g><rect width="28" height="4" x="32" y="60" fill="#efedf8" rx="2"/><rect width="28" height="4" y="12" fill="#6b4fbb" rx="2"/><rect width="28" height="4" x="32" y="24" fill="#c3b8e3" rx="2"/><rect width="8" height="4" y="24" fill="#fef0e8" rx="2"/><rect width="8" height="4" x="32" y="48" fill="#6b4fbb" rx="2"/><rect width="12" height="4" y="48" fill="#fc6d26" rx="2"/><g fill="#fef0e8"><rect width="12" height="4" y="60" rx="2"/><rect width="12" height="4" x="16" y="60" rx="2"/></g></g><g transform="translate(23 97)"><rect width="16" height="4" fill="#efedf8" rx="2"/><rect width="16" height="4" x="18" y="12" fill="#fc6d26" rx="2"/><rect width="16" height="4" x="44" fill="#6b4fbb" rx="2"/><use xlink:href="#a"/><rect width="8" height="4" x="38" y="12" fill="#fef0e8" rx="2"/><use xlink:href="#b"/><use xlink:href="#c"/><rect width="14" height="4" y="12" fill="#eee" rx="2"/></g></g><g fill-rule="nonzero"><path fill="#eee" d="M109 101a2 2 0 1 1 0-4c2.524 0 5-.346 7.379-1.02a2 2 0 0 1 1.091 3.849 31.007 31.007 0 0 1-8.47 1.172m18.09-5.825a31.174 31.174 0 0 0 6.187-5.899 2 2 0 1 0-3.131-2.489 27.133 27.133 0 0 1-5.393 5.142 2.001 2.001 0 0 0 2.337 3.247m11.297-15.288a30.923 30.923 0 0 0 1.576-8.407 2 2 0 1 0-3.996-.188 26.875 26.875 0 0 1-1.372 7.32 2 2 0 1 0 3.791 1.275m.283-18.89a30.855 30.855 0 0 0-3.593-7.763 2 2 0 1 0-3.362 2.166 26.905 26.905 0 0 1 3.128 6.757 2 2 0 0 0 3.828-1.16M127.875 45.41a30.973 30.973 0 0 0-7.435-4.228 2 2 0 0 0-1.477 3.717 26.936 26.936 0 0 1 6.474 3.682 2 2 0 0 0 2.438-3.172m-17.834-6.391a31.09 31.09 0 0 0-8.5.886 2 2 0 0 0 .959 3.883 27.06 27.06 0 0 1 7.408-.771 2 2 0 1 0 .132-3.998m-18.272 5.207a31.139 31.139 0 0 0-6.383 5.688 2 2 0 1 0 3.045 2.593 27.152 27.152 0 0 1 5.564-4.957 2 2 0 1 0-2.226-3.324M79.96 59.121a30.864 30.864 0 0 0-1.862 8.349 2 2 0 1 0 3.987.323c.203-2.506.75-4.946 1.62-7.268a2 2 0 1 0-3.746-1.404m-.923 18.873a30.827 30.827 0 0 0 3.327 7.881 2.001 2.001 0 0 0 3.435-2.051 26.785 26.785 0 0 1-2.895-6.859 2 2 0 0 0-3.865 1.029M89.301 93.94a31.008 31.008 0 0 0 7.286 4.476 2 2 0 1 0 1.603-3.665 26.983 26.983 0 0 1-6.346-3.899 2 2 0 0 0-2.543 3.087m17.61 6.991a2 2 0 0 1 .265-3.991c.601.04 1.205.06 1.812.06a1.999 1.999 0 1 1-.001 3.999c-.695 0-1.387-.023-2.076-.069"/><path fill="#fc0" d="M117.78 63.798c.241.268.288.563.14.884l-10.848 23.24c-.174.334-.455.502-.843.502-.054 0-.148-.014-.282-.04a.855.855 0 0 1-.512-.382.761.761 0 0 1-.09-.603l3.957-16.232-8.156 2.03a1.08 1.08 0 0 1-.241.02.93.93 0 0 1-.623-.222c-.24-.2-.328-.462-.26-.783l4.04-16.574a.858.858 0 0 1 .321-.462.917.917 0 0 1 .563-.18h6.59c.254 0 .468.083.642.25a.797.797 0 0 1 .261.593.818.818 0 0 1-.1.362l-3.435 9.301 7.955-1.969c.107-.027.187-.04.241-.04.254 0 .482.1.683.301"/><path fill="#e5e5e5" d="M148 69c0-1.105.887-2 1.998-2h4c1.103 0 1.998.888 1.998 2 0 1.105-.887 2-1.998 2h-4A1.992 1.992 0 0 1 148 69m14 0c0-1.105.887-2 1.998-2h4c1.103 0 1.998.888 1.998 2 0 1.105-.887 2-1.998 2h-4A1.992 1.992 0 0 1 162 69"/></g></g></svg>
\ No newline at end of file
app/assets/images/illustrations/manual_action.svg 0 → 100644
View file @ 17853757
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 398 151" xmlns:xlink="http://www.w3.org/1999/xlink"><g fill="none" fill-rule="evenodd"><path fill="#fef0e8" stroke="#fc6d26" stroke-width="4" d="M57.7 106.5h21.6a4.2 4.2 0 0 1 4.2 4.2v5.6a4.2 4.2 0 0 1-4.2 4.2H57.7a4.2 4.2 0 0 1-4.2-4.2v-5.6a4.2 4.2 0 0 1 4.2-4.2"/><g transform="translate(42 117)"><rect width="52" height="23" x=".5" y=".5" fill="#fff" stroke="#eee" stroke-width="4" rx="4.2"/><g fill="#fdc4a8"><rect width="11" height="2" x="8" y="8" rx="1"/><rect width="11" height="2" x="8" y="14" rx="1"/></g></g><g fill-rule="nonzero"><path fill="#e1dbf1" d="M96.31 132.32c1.048 0 1.648.007 4.319.042 11.523.153 18.377-.12 26.32-1.533 24.23-4.309 38.521-18.02 38.521-45.03 0-31.02 21.885-44.487 66.903-40.522l.351-3.985c-47.09-4.147-71.25 10.727-71.25 44.507 0 24.868-12.746 37.1-35.22 41.09-7.623 1.356-14.284 1.621-25.567 1.471a287.717 287.717 0 0 0-4.372-.042v4"/><path fill="#eee" d="M242 57.678c-6.29-1.373-11-6.976-11-13.678 0-6.702 4.71-12.304 11-13.678v4.136c-4.057 1.274-7 5.065-7 9.542 0 4.478 2.943 8.268 7 9.542v4.136"/></g><g transform="translate(242)"><rect width="116" height="134" y="7" fill="#f9f9f9" rx="10"/><rect width="116" height="134" x="5" y="2" fill="#fff" rx="10"/><path fill="#eee" fill-rule="nonzero" d="M15 4a8 8 0 0 0-8 8v114a8 8 0 0 0 8 8h96a8 8 0 0 0 8-8V12a8 8 0 0 0-8-8H15m0-4h96c6.627 0 12 5.373 12 12v114c0 6.627-5.373 12-12 12H15c-6.627 0-12-5.373-12-12V12C3 5.373 8.373 0 15 0"/><g transform="translate(23 25)"><g fill="#e1dbf1"><rect width="16" height="4" rx="2"/><rect width="16" height="4" x="32" y="12" rx="2"/></g><rect width="16" height="4" x="44" fill="#eee" rx="2"/><rect width="16" height="4" x="12" y="24" fill="#e1dbf1" rx="2"/><rect width="16" height="4" x="64" y="36" fill="#fef0e8" rx="2"/><rect width="8" height="4" x="20" fill="#fee1d3" rx="2" id="a"/><rect width="8" height="4" x="32" y="36" fill="#fc6d26" rx="2"/><rect width="8" height="4" x="52" y="12" fill="#fef0e8" rx="2"/><rect width="8" height="4" x="64" fill="#fef0e8" rx="2" id="b"/><rect width="12" height="4" x="16" y="48" fill="#e1dbf1" rx="2"/><rect width="8" height="4" x="44" y="36" fill="#fc6d26" rx="2"/><g fill="#e1dbf1"><rect width="4" height="4" x="56" y="36" rx="2"/><rect width="4" height="4" x="64" y="60" rx="2"/></g><rect width="4" height="4" x="72" y="60" fill="#fc6d26" rx="2"/><rect width="8" height="4" x="32" fill="#fc6d26" rx="2" id="c"/><g fill="#eee"><rect width="28" height="4" y="36" rx="2"/><rect width="28" height="4" x="44" y="48" rx="2"/></g><rect width="28" height="4" x="32" y="60" fill="#efedf8" rx="2"/><rect width="28" height="4" y="12" fill="#6b4fbb" rx="2"/><rect width="28" height="4" x="32" y="24" fill="#c3b8e3" rx="2"/><rect width="8" height="4" y="24" fill="#fef0e8" rx="2"/><rect width="8" height="4" x="32" y="48" fill="#6b4fbb" rx="2"/><rect width="12" height="4" y="48" fill="#fc6d26" rx="2"/><g fill="#fef0e8"><rect width="12" height="4" y="60" rx="2"/><rect width="12" height="4" x="16" y="60" rx="2"/></g><g transform="translate(0 72)"><rect width="16" height="4" fill="#efedf8" rx="2"/><rect width="16" height="4" x="18" y="12" fill="#fc6d26" rx="2"/><rect width="16" height="4" x="44" fill="#6b4fbb" rx="2"/><use xlink:href="#a"/><rect width="8" height="4" x="38" y="12" fill="#fef0e8" rx="2"/><use xlink:href="#b"/><use xlink:href="#c"/><rect width="14" height="4" y="12" fill="#eee" rx="2"/></g></g></g><g transform="translate(330 83)"><circle cx="33" cy="33" r="33" fill="#fff"/><g fill-rule="nonzero"><path fill="#eee" d="M33 68C13.67 68-2 52.33-2 33S13.67-2 33-2s35 15.67 35 35-15.67 35-35 35m0-4c17.12 0 31-13.879 31-31C64 15.88 50.121 2 33 2 15.88 2 2 15.879 2 33c0 17.12 13.879 31 31 31"/><path fill="#6b4fbb" stroke="#6b4fbb" stroke-width=".968" d="M42.383 34.655v-3.308l-2.112-.343c-.116-.456-.351-.913-.703-1.598l1.29-1.711-2.463-2.398-1.76 1.256a6.347 6.347 0 0 0-1.642-.684l-.233-2.055h-3.401l-.352 2.055c-.586.114-1.055.342-1.642.684l-1.76-1.255-2.463 2.397 1.173 1.711c-.352.57-.469 1.027-.704 1.598l-1.995.228v3.31l2.112.342c.116.57.351 1.027.703 1.598l-1.172 1.712 2.463 2.397 1.759-1.141c.469.227 1.056.456 1.642.684l.352 2.055h3.518l.352-2.055c.586-.114 1.055-.342 1.642-.684l1.76 1.255 2.463-2.397-1.29-1.712a6.03 6.03 0 0 0 .703-1.598l1.76-.344M33 36.367c-1.994 0-3.519-1.484-3.519-3.424 0-1.941 1.525-3.424 3.519-3.424 1.994 0 3.519 1.483 3.519 3.424 0 1.94-1.525 3.424-3.519 3.424" stroke-linecap="round" stroke-linejoin="bevel"/><path fill="#e1dbf1" d="M33 53.563c-11.598 0-21-9.206-21-20.563s9.402-20.563 21-20.563S54 21.643 54 33s-9.402 20.563-21 20.563m0-4.375c9.13 0 16.532-7.248 16.532-16.188 0-8.94-7.402-16.188-16.532-16.188-9.13 0-16.532 7.248-16.532 16.188 0 8.94 7.402 16.188 16.532 16.188"/></g></g><path fill="#fff" d="M164 114c14.912 0 27-12.09 27-27 0-14.912-12.09-27-27-27-14.912 0-27 12.09-27 27 0 14.912 12.09 27 27 27"/><g fill-rule="nonzero"><path fill="#eee" d="M164 118c-17.12 0-31-13.879-31-31 0-17.12 13.879-31 31-31 17.12 0 31 13.879 31 31 0 17.12-13.879 31-31 31m0-4c14.912 0 27-12.09 27-27 0-14.912-12.09-27-27-27-14.912 0-27 12.09-27 27 0 14.912 12.09 27 27 27"/><path fill="#fc0" d="M172.78 80.798c.241.268.288.563.14.884l-10.848 23.24c-.174.334-.455.502-.843.502-.054 0-.148-.014-.282-.04a.855.855 0 0 1-.512-.382.761.761 0 0 1-.09-.603l3.957-16.232-8.156 2.03a1.08 1.08 0 0 1-.241.02.93.93 0 0 1-.623-.222c-.24-.2-.328-.462-.26-.783l4.04-16.574a.858.858 0 0 1 .321-.462.917.917 0 0 1 .563-.18h6.59c.254 0 .468.083.642.25a.797.797 0 0 1 .261.593.818.818 0 0 1-.1.362l-3.435 9.301 7.955-1.969c.107-.027.187-.04.241-.04.254 0 .482.1.683.301"/></g><g><path fill="#eee" fill-rule="nonzero" d="M37.801 99.01l5.355 2.648c2.271 1.122 4.643-.252 4.809-2.778l.487-7.546a27.675 27.675 0 0 0 2.87-4.076c7.594-13.152 3.088-29.972-10.07-37.565-13.153-7.594-29.971-3.087-37.566 10.07-7.594 13.154-3.087 29.973 10.07 37.565a27.46 27.46 0 0 0 24.05 1.687m.952-3.992a2.002 2.002 0 0 0-1.698-.035 23.454 23.454 0 0 1-21.299-1.124c-11.24-6.488-15.09-20.86-8.602-32.1 6.49-11.239 20.862-15.09 32.1-8.601 11.239 6.489 15.09 20.862 8.6 32.1a23.519 23.519 0 0 1-2.849 3.939 1.995 1.995 0 0 0-.504 1.204l-.466 7.229-5.285-2.613"/><path fill="#fdc4a8" d="M21.137 70.471A7.495 7.495 0 0 0 27.5 74c2.684 0 5.04-1.41 6.363-3.529C36.377 71.869 38 74.267 38 77.674c0 5.799-2.739 9.587-10.5 9.587S17 83.473 17 77.674c0-3.407 1.622-5.804 4.137-7.203M27.5 72a5.5 5.5 0 1 1 0-11 5.5 5.5 0 1 1 0 11"/></g></g></svg>
\ No newline at end of file
app/assets/images/illustrations/service_desk_callout.svg 0 → 100644
View file @ 17853757
<svg xmlns="http://www.w3.org/2000/svg" width="78" height="82" viewBox="0 0 78 82"><g fill="none" fill-rule="evenodd"><path fill="#F9F9F9" d="M2.12 42c-.08.99-.12 1.99-.12 3 0 20.435 16.565 37 37 37s37-16.565 37-37c0-1.01-.04-2.01-.12-3C74.353 61.032 58.425 76 39 76 19.575 76 3.647 61.032 2.12 42z"/><path fill="#EEE" fill-rule="nonzero" d="M39 78C17.46 78 0 60.54 0 39S17.46 0 39 0s39 17.46 39 39-17.46 39-39 39zm0-4c19.33 0 35-15.67 35-35S58.33 4 39 4 4 19.67 4 39s15.67 35 35 35z"/><rect width="7" height="1" x="59" y="38" fill="#E1DBF2" rx=".5"/><path fill="#6B4FBB" d="M60.5 42a3.5 3.5 0 0 0 0-7v7z"/><rect width="7" height="1" x="12" y="38" fill="#E1DBF2" transform="matrix(-1 0 0 1 31 0)" rx=".5"/><path fill="#6B4FBB" d="M17.5 42a3.5 3.5 0 0 1 0-7v7z"/><path fill="#E1DBF1" fill-rule="nonzero" d="M39 58c10.493 0 19-8.507 19-19s-8.507-19-19-19-19 8.507-19 19 8.507 19 19 19zm0 4c-12.703 0-23-10.297-23-23s10.297-23 23-23 23 10.297 23 23-10.297 23-23 23z"/><path fill="#6B4FBB" d="M35 56a1 1 0 1 1 0-2 1 1 0 0 1 0 2zm4 0a1 1 0 1 1 0-2 1 1 0 0 1 0 2zm4 0a1 1 0 1 1 0-2 1 1 0 0 1 0 2z"/><path fill="#E1DBF1" fill-rule="nonzero" d="M26.5 40c0 4.143 3.355 7.5 7.494 7.5h10.012A7.497 7.497 0 0 0 51.5 40c0-4.143-3.355-7.5-7.494-7.5H33.994A7.497 7.497 0 0 0 26.5 40zm-3 0c0-5.799 4.698-10.5 10.494-10.5h10.012C49.802 29.5 54.5 34.2 54.5 40c0 5.799-4.698 10.5-10.494 10.5H33.994C28.198 50.5 23.5 45.8 23.5 40z"/><path fill="#6B4FBB" fill-rule="nonzero" d="M35.255 42.406a1 1 0 1 1 1.872-.703 2.001 2.001 0 0 0 3.76-.038 1 1 0 1 1 1.886.665 4 4 0 0 1-7.518.076zM31.5 40a1.5 1.5 0 1 1 0-3 1.5 1.5 0 0 1 0 3zm15 0a1.5 1.5 0 1 1 0-3 1.5 1.5 0 0 1 0 3z"/><path fill="#6B4FBB" d="M38 22h2a1 1 0 0 1 0 2h-2a1 1 0 0 1 0-2zm0 3h2a1 1 0 0 1 0 2h-2a1 1 0 0 1 0-2z" style="mix-blend-mode:multiply"/></g></svg>
\ No newline at end of file
app/assets/images/illustrations/service_desk_empty.svg 0 → 100644
View file @ 17853757
<svg xmlns="http://www.w3.org/2000/svg" width="226" height="178" viewBox="0 0 226 178"><g fill="none" fill-rule="evenodd"><path fill="#EEE" fill-rule="nonzero" d="M109.496 165.895a78.17 78.17 0 0 0 6.158.08 2 2 0 0 0-.11-4c-1.94.053-3.886.028-5.84-.074a2 2 0 0 0-2.1 1.893 1.996 1.996 0 0 0 1.89 2.102zm18.408-1.245a76 76 0 0 0 6-1.4 2 2 0 1 0-1.064-3.856c-1.875.52-3.772.96-5.686 1.327a2.001 2.001 0 0 0 .75 3.93zm17.572-5.636a76.28 76.28 0 0 0 5.486-2.803 2 2 0 1 0-1.962-3.485 72.42 72.42 0 0 1-5.2 2.656 2.003 2.003 0 0 0 1.676 3.635zm44.342-74.897a75.786 75.786 0 0 0-.674-6.127 2.002 2.002 0 0 0-3.956.598c.29 1.92.505 3.857.64 5.805a1.998 1.998 0 0 0 2.133 1.857 2 2 0 0 0 1.858-2.133zm-3.505-18.144a76.141 76.141 0 0 0-2.13-5.78 2.001 2.001 0 0 0-3.695 1.534 72.381 72.381 0 0 1 2.02 5.476 1.999 1.999 0 1 0 3.805-1.229zm-7.754-16.73a77.053 77.053 0 0 0-3.454-5.1 1.998 1.998 0 0 0-2.797-.423 1.998 1.998 0 0 0-.424 2.796 73.06 73.06 0 0 1 3.273 4.835c.58.94 1.814 1.23 2.753.647a2.001 2.001 0 0 0 .646-2.754zm-11.582-14.446a76.37 76.37 0 0 0-4.572-4.128 1.999 1.999 0 1 0-2.559 3.073 72.633 72.633 0 0 1 4.334 3.913 2.001 2.001 0 1 0 2.798-2.86zm-101.422-4.91a77.634 77.634 0 0 0-4.64 4.05 2.001 2.001 0 0 0 2.749 2.906 72.611 72.611 0 0 1 4.4-3.84 2 2 0 1 0-2.509-3.115zM52.7 43.062a75.962 75.962 0 0 0-3.546 5.04 2 2 0 1 0 3.363 2.168 72.314 72.314 0 0 1 3.36-4.777 2 2 0 0 0-3.177-2.432zm-9.373 15.924c-.82 1.882-1.56 3.8-2.226 5.745a2 2 0 1 0 3.787 1.294 72.253 72.253 0 0 1 2.108-5.443 1.998 1.998 0 0 0-1.036-2.63 2.001 2.001 0 0 0-2.633 1.036zm-5.26 17.74a76.33 76.33 0 0 0-.777 6.11 2 2 0 0 0 3.985.347c.17-1.947.415-3.88.737-5.793a2 2 0 0 0-3.945-.664zM74.87 155.55a76.028 76.028 0 0 0 5.437 2.897 2 2 0 1 0 1.737-3.603 71.34 71.34 0 0 1-5.152-2.745 1.998 1.998 0 0 0-2.737.714 2.002 2.002 0 0 0 .715 2.738zm16.97 7.34a76.606 76.606 0 0 0 5.975 1.498 2 2 0 1 0 .816-3.916 72.52 72.52 0 0 1-5.662-1.42 1.999 1.999 0 1 0-1.129 3.837z"/><path fill="#F9F9F9" d="M2.12 130c-.08.99-.12 1.99-.12 3 0 20.435 16.565 37 37 37s37-16.565 37-37c0-1.01-.04-2.01-.12-3-1.527 19.032-17.455 34-36.88 34-19.425 0-35.353-14.968-36.88-34z"/><path fill="#EEE" fill-rule="nonzero" d="M39 166c-21.54 0-39-17.46-39-39s17.46-39 39-39 39 17.46 39 39-17.46 39-39 39zm0-4c19.33 0 35-15.67 35-35S58.33 92 39 92 4 107.67 4 127s15.67 35 35 35z"/><path fill="#FDC4A8" fill-rule="nonzero" d="M53.925 116.226A1.995 1.995 0 0 0 53 116H25a1.99 1.99 0 0 0-.898.212l14.663 13.406c.39.357.99.348 1.37-.02l13.79-13.372zm1.075 4.53L42.92 132.47a5 5 0 0 1-6.854.1L23 120.624V138a2 2 0 0 0 2 2h28a2 2 0 0 0 2-2v-17.244zM25 112h28a6 6 0 0 1 6 6v20a6 6 0 0 1-6 6H25a6 6 0 0 1-6-6v-20a6 6 0 0 1 6-6z"/><path fill="#F9F9F9" d="M150.12 131c-.08.99-.12 1.99-.12 3 0 20.435 16.565 37 37 37s37-16.565 37-37c0-1.01-.04-2.01-.12-3-1.527 19.032-17.455 34-36.88 34-19.425 0-35.353-14.968-36.88-34z"/><path fill="#EEE" fill-rule="nonzero" d="M187 167c-21.54 0-39-17.46-39-39s17.46-39 39-39 39 17.46 39 39-17.46 39-39 39zm0-4c19.33 0 35-15.67 35-35s-15.67-35-35-35-35 15.67-35 35 15.67 35 35 35z"/><path fill="#E1DBF1" fill-rule="nonzero" d="M180.51 137H199a2 2 0 0 0 2-2v-16a2 2 0 0 0-2-2h-24a2 2 0 0 0-2 2v22.743l7.51-4.743zm1.157 4l-9.6 6.062a2 2 0 0 1-3.067-1.69V119a6 6 0 0 1 6-6h24a6 6 0 0 1 6 6v16a6 6 0 0 1-6 6h-17.333z"/><path fill="#6B4FBB" d="M180 129a2 2 0 1 1-.001-3.999A2 2 0 0 1 180 129zm7 0a2 2 0 1 1-.001-3.999A2 2 0 0 1 187 129zm7 0a2 2 0 1 1-.001-3.999A2 2 0 0 1 194 129z"/><g><path fill="#F9F9F9" d="M76.12 42c-.08.99-.12 1.99-.12 3 0 20.435 16.565 37 37 37s37-16.565 37-37c0-1.01-.04-2.01-.12-3-1.527 19.032-17.455 34-36.88 34-19.425 0-35.353-14.968-36.88-34z"/><path fill="#EEE" fill-rule="nonzero" d="M113 78c-21.54 0-39-17.46-39-39S91.46 0 113 0s39 17.46 39 39-17.46 39-39 39zm0-4c19.33 0 35-15.67 35-35S132.33 4 113 4 78 19.67 78 39s15.67 35 35 35z"/><g transform="translate(133 35)"><rect width="7" height="1" y="3" fill="#E1DBF2" rx=".5"/><path fill="#6B4FBB" d="M1.5 7a3.5 3.5 0 1 0 0-7v7z"/></g><g transform="matrix(-1 0 0 1 93 35)"><rect width="7" height="1" y="3" fill="#E1DBF2" rx=".5"/><path fill="#6B4FBB" d="M1.5 7a3.5 3.5 0 1 0 0-7v7z"/></g><path fill="#E1DBF1" fill-rule="nonzero" d="M113 58c10.493 0 19-8.507 19-19s-8.507-19-19-19-19 8.507-19 19 8.507 19 19 19zm0 4c-12.703 0-23-10.297-23-23s10.297-23 23-23 23 10.297 23 23-10.297 23-23 23z"/><path fill="#6B4FBB" d="M109 56a1 1 0 1 1 0-2 1 1 0 0 1 0 2zm4 0a1 1 0 1 1 0-2 1 1 0 0 1 0 2zm4 0a1 1 0 1 1 0-2 1 1 0 0 1 0 2z"/><path fill="#E1DBF1" fill-rule="nonzero" d="M97.5 40c0-5.8 4.698-10.5 10.494-10.5h10.012c5.796 0 10.494 4.7 10.494 10.5s-4.698 10.5-10.494 10.5h-10.012C102.198 50.5 97.5 45.8 97.5 40zm3 0c0 4.143 3.355 7.5 7.494 7.5h10.012A7.496 7.496 0 0 0 125.5 40c0-4.143-3.355-7.5-7.494-7.5h-10.012A7.496 7.496 0 0 0 100.5 40z"/><path fill="#6B4FBB" fill-rule="nonzero" d="M109.255 42.406a.998.998 0 0 1 .584-1.287.997.997 0 0 1 1.287.583 2 2 0 0 0 3.76-.038 1 1 0 0 1 1.886.665 4.001 4.001 0 0 1-7.518.076zM105.5 40a1.5 1.5 0 1 1 .001-3.001A1.5 1.5 0 0 1 105.5 40zm15 0a1.5 1.5 0 1 1 .001-3.001A1.5 1.5 0 0 1 120.5 40z"/><path fill="#6B4FBB" d="M112 22h2a1 1 0 0 1 0 2h-2a1 1 0 0 1 0-2zm0 3h2a1 1 0 0 1 0 2h-2a1 1 0 0 1 0-2z" style="mix-blend-mode:multiply"/></g></g></svg>
\ No newline at end of file
app/assets/javascripts/blob/notebook/index.js
View file @ 17853757
/* eslint-disable no-new */
import Vue from 'vue';
import VueResource from 'vue-resource';
import axios from '../../lib/utils/axios_utils';
import notebookLab from '../../notebook/index.vue';
Vue.use(VueResource);
export default () => {
const el = document.getElementById('js-notebook-viewer');
......@@ -50,14 +48,14 @@ export default () => {
`,
methods: {
loadFile() {
this.$http.get(el.dataset.endpoint)
.then(response => response.json())
.then((res) => {
this.json = res;
axios.get(el.dataset.endpoint)
.then(res => res.data)
.then((data) => {
this.json = data;
this.loading = false;
})
.catch((e) => {
if (e.status) {
if (e.status !== 200) {
this.loadError = true;
}
......
app/assets/javascripts/boards/boards_bundle.js
View file @ 17853757
......@@ -2,7 +2,6 @@
import _ from 'underscore';
import Vue from 'vue';
import VueResource from 'vue-resource';
import Flash from '../flash';
import { __ } from '../locale';
import FilteredSearchBoards from './filtered_search_boards';
......@@ -25,8 +24,6 @@ import './components/new_list_dropdown';
import './components/modal/index';
import '../vue_shared/vue_resource_interceptor';
Vue.use(VueResource);
$(() => {
const $boardApp = document.getElementById('board-app');
const Store = gl.issueBoards.BoardsStore;
......@@ -95,14 +92,13 @@ $(() => {
Store.disabled = this.disabled;
gl.boardService.all()
.then(response => response.json())
.then((resp) => {
resp.forEach((board) => {
.then(res => res.data)
.then((data) => {
data.forEach((board) => {
const list = Store.addList(board, this.defaultAvatar);
if (list.type === 'closed') {
list.position = Infinity;
list.label = { description: 'Shows all closed issues. Moving an issue to this list closes it' };
} else if (list.type === 'backlog') {
list.position = -1;
}
......@@ -113,7 +109,9 @@ $(() => {
Store.addBlankState();
this.loading = false;
})
.catch(() => new Flash('An error occurred. Please try again.'));
.catch(() => {
Flash('An error occurred while fetching the board lists. Please try again.');
});
},
methods: {
updateTokens() {
......@@ -124,7 +122,7 @@ $(() => {
if (sidebarInfoEndpoint && newIssue.subscribed === undefined) {
newIssue.setFetchingState('subscriptions', true);
BoardService.getIssueInfo(sidebarInfoEndpoint)
.then(res => res.json())
.then(res => res.data)
.then((data) => {
newIssue.setFetchingState('subscriptions', false);
newIssue.updateData({
......
app/assets/javascripts/boards/components/board_blank_state.js
View file @ 17853757
......@@ -65,7 +65,7 @@ export default {
// Save the labels
gl.boardService.generateDefaultLists()
.then(resp => resp.json())
.then(res => res.data)
.then((data) => {
data.forEach((listObj) => {
const list = Store.findList('title', listObj.title);
......
app/assets/javascripts/boards/components/board_list.js
View file @ 17853757
......@@ -115,7 +115,7 @@ export default {
},
mounted() {
const options = gl.issueBoards.getBoardSortableDefaultOptions({
scroll: document.querySelectorAll('.boards-list')[0],
scroll: true,
group: 'issues',
disabled: this.disabled,
filter: '.board-list-count, .is-disabled',
......
app/assets/javascripts/boards/components/board_sidebar.js
View file @ 17853757
/* eslint-disable comma-dangle, space-before-function-paren, no-new */
/* global MilestoneSelect */
import Vue from 'vue';
import Flash from '../../flash';
......@@ -12,6 +11,7 @@ import './sidebar/remove_issue';
import IssuableContext from '../../issuable_context';
import LabelsSelect from '../../labels_select';
import subscriptions from '../../sidebar/components/subscriptions/subscriptions.vue';
import MilestoneSelect from '../../milestone_select';
const Store = gl.issueBoards.BoardsStore;
......
app/assets/javascripts/boards/components/modal/index.js
View file @ 17853757
......@@ -89,7 +89,7 @@ gl.issueBoards.IssuesModal = Vue.extend({
page: this.page,
per: this.perPage,
}))
.then(resp => resp.json())
.then(res => res.data)
.then((data) => {
if (clearIssues) {
this.issues = [];
......
app/assets/javascripts/boards/models/list.js
View file @ 17853757
......@@ -40,7 +40,7 @@ class List {
save () {
return gl.boardService.createList(this.label.id)
.then(resp => resp.json())
.then(res => res.data)
.then((data) => {
this.id = data.id;
this.type = data.list_type;
......@@ -90,7 +90,7 @@ class List {
}
return gl.boardService.getIssuesForList(this.id, data)
.then(resp => resp.json())
.then(res => res.data)
.then((data) => {
this.loading = false;
this.issuesSize = data.size;
......@@ -108,7 +108,7 @@ class List {
this.issuesSize += 1;
return gl.boardService.newIssue(this.id, issue)
.then(resp => resp.json())
.then(res => res.data)
.then((data) => {
issue.id = data.id;
issue.iid = data.iid;
......
app/assets/javascripts/boards/services/board_service.js
View file @ 17853757
/* eslint-disable space-before-function-paren, comma-dangle, no-param-reassign, camelcase, max-len, no-unused-vars */
import Vue from 'vue';
import axios from '../../lib/utils/axios_utils';
import { mergeUrlParams } from '../../lib/utils/url_utility';
export default class BoardService {
constructor ({ boardsEndpoint, listsEndpoint, bulkUpdatePath, boardId }) {
this.boards = Vue.resource(`${boardsEndpoint}{/id}.json`, {}, {
issues: {
method: 'GET',
url: `${gon.relative_url_root}/-/boards/${boardId}/issues.json`,
}
});
this.lists = Vue.resource(`${listsEndpoint}{/id}`, {}, {
generate: {
method: 'POST',
url: `${listsEndpoint}/generate.json`
}
});
this.issue = Vue.resource(`${gon.relative_url_root}/-/boards/${boardId}/issues{/id}`, {});
this.issues = Vue.resource(`${listsEndpoint}{/id}/issues`, {}, {
bulkUpdate: {
method: 'POST',
url: bulkUpdatePath,
},
});
constructor({ boardsEndpoint, listsEndpoint, bulkUpdatePath, boardId }) {
this.boardsEndpoint = boardsEndpoint;
this.boardId = boardId;
this.listsEndpoint = listsEndpoint;
this.listsEndpointGenerate = `${listsEndpoint}/generate.json`;
this.bulkUpdatePath = bulkUpdatePath;
}
generateBoardsPath(id) {
return `${this.boardsEndpoint}${id ? `/${id}` : ''}.json`;
}
all () {
return this.lists.get();
generateIssuesPath(id) {
return `${this.listsEndpoint}${id ? `/${id}` : ''}/issues`;
}
generateDefaultLists () {
return this.lists.generate({});
static generateIssuePath(boardId, id) {
return `${gon.relative_url_root}/-/boards/${boardId ? `/${boardId}` : ''}/issues${id ? `/${id}` : ''}`;
}
createList (label_id) {
return this.lists.save({}, {
all() {
return axios.get(this.listsEndpoint);
}
generateDefaultLists() {
return axios.post(this.listsEndpointGenerate, {});
}
createList(labelId) {
return axios.post(this.listsEndpoint, {
list: {
label_id
}
label_id: labelId,
},
});
}
updateList (id, position) {
return this.lists.update({ id }, {
updateList(id, position) {
return axios.put(`${this.listsEndpoint}/${id}`, {
list: {
position
}
position,
},
});
}
destroyList (id) {
return this.lists.delete({ id });
destroyList(id) {
return axios.delete(`${this.listsEndpoint}/${id}`);
}
getIssuesForList (id, filter = {}) {
getIssuesForList(id, filter = {}) {
const data = { id };
Object.keys(filter).forEach((key) => { data[key] = filter[key]; });
return this.issues.get(data);
return axios.get(mergeUrlParams(data, this.generateIssuesPath(id)));
}
moveIssue (id, from_list_id = null, to_list_id = null, move_before_id = null, move_after_id = null) {
return this.issue.update({ id }, {
from_list_id,
to_list_id,
move_before_id,
move_after_id,
moveIssue(id, fromListId = null, toListId = null, moveBeforeId = null, moveAfterId = null) {
return axios.put(BoardService.generateIssuePath(this.boardId, id), {
from_list_id: fromListId,
to_list_id: toListId,
move_before_id: moveBeforeId,
move_after_id: moveAfterId,
});
}
newIssue (id, issue) {
return this.issues.save({ id }, {
issue
newIssue(id, issue) {
return axios.post(this.generateIssuesPath(id), {
issue,
});
}
getBacklog(data) {
return this.boards.issues(data);
return axios.get(mergeUrlParams(data, `${gon.relative_url_root}/-/boards/${this.boardId}/issues.json`));
}
bulkUpdate(issueIds, extraData = {}) {
......@@ -86,15 +83,15 @@ export default class BoardService {
}),
};
return this.issues.bulkUpdate(data);
return axios.post(this.bulkUpdatePath, data);
}
static getIssueInfo(endpoint) {
return Vue.http.get(endpoint);
return axios.get(endpoint);
}
static toggleIssueSubscription(endpoint) {
return Vue.http.post(endpoint);
return axios.post(endpoint);
}
}
......
app/assets/javascripts/clusters/clusters_bundle.js
View file @ 17853757
......@@ -30,6 +30,7 @@ export default class Clusters {
installHelmPath,
installIngressPath,
installRunnerPath,
installPrometheusPath,
clusterStatus,
clusterStatusReason,
helpPath,
......@@ -44,6 +45,7 @@ export default class Clusters {
installHelmEndpoint: installHelmPath,
installIngressEndpoint: installIngressPath,
installRunnerEndpoint: installRunnerPath,
installPrometheusEndpoint: installPrometheusPath,
});
this.toggle = this.toggle.bind(this);
......
app/assets/javascripts/clusters/components/applications.vue
View file @ 17853757
......@@ -67,6 +67,16 @@ export default {
and send the results back to GitLab.`,
));
},
prometheusDescription() {
return sprintf(
_.escape(s__('ClusterIntegration|Prometheus is an open-source monitoring system with %{gitlabIntegrationLink} to monitor deployed applications.')), {
gitlabIntegrationLink: `<a href="https://docs.gitlab.com/ce/user/project/integrations/prometheus.html", target="_blank" rel="noopener noreferrer">
${_.escape(s__('ClusterIntegration|Gitlab Integration'))}
</a>`,
},
false,
);
},
},
};
</script>
......@@ -105,6 +115,16 @@ export default {
:status-reason="applications.ingress.statusReason"
:request-status="applications.ingress.requestStatus"
:request-reason="applications.ingress.requestReason"
/>
<application-row
id="prometheus"
:title="applications.prometheus.title"
title-link="https://prometheus.io/docs/introduction/overview/"
:description="prometheusDescription"
:status="applications.prometheus.status"
:status-reason="applications.prometheus.statusReason"
:request-status="applications.prometheus.requestStatus"
:request-reason="applications.prometheus.requestReason"
/>
<!-- NOTE: Don't forget to update `clusters.scss` min-height for this block and uncomment `application_spec` tests -->
<!-- Add GitLab Runner row, all other plumbing is complete -->
......
app/assets/javascripts/clusters/services/clusters_service.js
View file @ 17853757
......@@ -7,6 +7,7 @@ export default class ClusterService {
helm: this.options.installHelmEndpoint,
ingress: this.options.installIngressEndpoint,
runner: this.options.installRunnerEndpoint,
prometheus: this.options.installPrometheusEndpoint,
};
}
......
app/assets/javascripts/clusters/stores/clusters_store.js
View file @ 17853757
......@@ -28,6 +28,13 @@ export default class ClusterStore {
requestStatus: null,
requestReason: null,
},
prometheus: {
title: s__('ClusterIntegration|Prometheus'),
status: null,
statusReason: null,
requestStatus: null,
requestReason: null,
},
},
};
}
......
app/assets/javascripts/cycle_analytics/components/stage_review_component.vue
View file @ 17853757
......@@ -2,6 +2,7 @@
import userAvatarImage from '../../vue_shared/components/user_avatar/user_avatar_image.vue';
import limitWarning from './limit_warning_component.vue';
import totalTime from './total_time_component.vue';
import icon from '../../vue_shared/components/icon.vue';
export default {
props: {
......@@ -12,6 +13,7 @@
userAvatarImage,
totalTime,
limitWarning,
icon,
},
};
</script>
......@@ -52,7 +54,10 @@
</template>
<template v-else>
<span class="merge-request-branch" v-if="mergeRequest.branch">
<i class= "fa fa-code-fork"></i>
<icon
name="fork"
:size="16">
</icon>
<a :href="mergeRequest.branch.url">{{ mergeRequest.branch.name }}</a>
</span>
</template>
......
app/assets/javascripts/cycle_analytics/components/stage_staging_component.vue
View file @ 17853757
......@@ -3,6 +3,7 @@
import iconBranch from '../svg/icon_branch.svg';
import limitWarning from './limit_warning_component.vue';
import totalTime from './total_time_component.vue';
import icon from '../../vue_shared/components/icon.vue';
export default {
props: {
......@@ -13,6 +14,7 @@
userAvatarImage,
totalTime,
limitWarning,
icon,
},
computed: {
iconBranch() {
......@@ -37,7 +39,10 @@
<user-avatar-image :img-src="build.author.avatarUrl"/>
<h5 class="item-title">
<a :href="build.url" class="pipeline-id">#{{ build.id }}</a>
<i class="fa fa-code-fork"></i>
<icon
name="fork"
:size="16">
</icon>
<a :href="build.branch.url" class="ref-name">{{ build.branch.name }}</a>
<span class="icon-branch" v-html="iconBranch"></span>
<a :href="build.commitUrl" class="commit-sha">{{ build.shortSha }}</a>
......
app/assets/javascripts/cycle_analytics/components/stage_test_component.vue
View file @ 17853757
......@@ -3,6 +3,7 @@
import iconBranch from '../svg/icon_branch.svg';
import limitWarning from './limit_warning_component.vue';
import totalTime from './total_time_component.vue';
import icon from '../../vue_shared/components/icon.vue';
export default {
props: {
......@@ -12,6 +13,7 @@
components: {
totalTime,
limitWarning,
icon,
},
computed: {
iconBuildStatus() {
......@@ -40,7 +42,10 @@
<a :href="build.url" class="item-build-name">{{ build.name }}</a>
&middot;
<a :href="build.url" class="pipeline-id">#{{ build.id }}</a>
<i class="fa fa-code-fork"></i>
<icon
name="fork"
:size="16">
</icon>
<a :href="build.branch.url" class="ref-name">{{ build.branch.name }}</a>
<span class="icon-branch" v-html="iconBranch"></span>
<a :href="build.commitUrl" class="commit-sha">{{ build.shortSha }}</a>
......
app/assets/javascripts/dispatcher.js
View file @ 17853757
......@@ -5,7 +5,7 @@ import IssuableIndex from './issuable_index';
import Milestone from './milestone';
import IssuableForm from './issuable_form';
import LabelsSelect from './labels_select';
/* global MilestoneSelect */
import MilestoneSelect from './milestone_select';
import NewBranchForm from './new_branch_form';
import NotificationsForm from './notifications_form';
import notificationsDropdown from './notifications_dropdown';
......
app/assets/javascripts/filtered_search/filtered_search_manager.js
View file @ 17853757
......@@ -127,7 +127,7 @@ class FilteredSearchManager {
this.handleInputVisualTokenWrapper = this.handleInputVisualToken.bind(this);
this.checkForEnterWrapper = this.checkForEnter.bind(this);
this.onClearSearchWrapper = this.onClearSearch.bind(this);
this.checkForBackspaceWrapper = this.checkForBackspace.bind(this);
this.checkForBackspaceWrapper = this.checkForBackspace.call(this);
this.removeSelectedTokenKeydownWrapper = this.removeSelectedTokenKeydown.bind(this);
this.unselectEditTokensWrapper = this.unselectEditTokens.bind(this);
this.editTokenWrapper = this.editToken.bind(this);
......@@ -180,22 +180,34 @@ class FilteredSearchManager {
this.unbindStateEvents();
}
checkForBackspace(e) {
// 8 = Backspace Key
// 46 = Delete Key
if (e.keyCode === 8 || e.keyCode === 46) {
const { lastVisualToken } = gl.FilteredSearchVisualTokens.getLastVisualTokenBeforeInput();
checkForBackspace() {
let backspaceCount = 0;
// closure for keeping track of the number of backspace keystrokes
return (e) => {
// 8 = Backspace Key
// 46 = Delete Key
if (e.keyCode === 8 || e.keyCode === 46) {
const { lastVisualToken } = gl.FilteredSearchVisualTokens.getLastVisualTokenBeforeInput();
const { tokenName, tokenValue } = gl.DropdownUtils.getVisualTokenValues(lastVisualToken);
const canEdit = tokenName && this.canEdit && this.canEdit(tokenName, tokenValue);
if (this.filteredSearchInput.value === '' && lastVisualToken && canEdit) {
backspaceCount += 1;
if (backspaceCount === 2) {
backspaceCount = 0;
this.filteredSearchInput.value = gl.FilteredSearchVisualTokens.getLastTokenPartial();
gl.FilteredSearchVisualTokens.removeLastTokenPartial();
}
}
const { tokenName, tokenValue } = gl.DropdownUtils.getVisualTokenValues(lastVisualToken);
const canEdit = tokenName && this.canEdit && this.canEdit(tokenName, tokenValue);
if (this.filteredSearchInput.value === '' && lastVisualToken && canEdit) {
this.filteredSearchInput.value = gl.FilteredSearchVisualTokens.getLastTokenPartial();
gl.FilteredSearchVisualTokens.removeLastTokenPartial();
// Reposition dropdown so that it is aligned with cursor
this.dropdownManager.updateCurrentDropdownOffset();
} else {
backspaceCount = 0;
}
// Reposition dropdown so that it is aligned with cursor
this.dropdownManager.updateCurrentDropdownOffset();
}
};
}
checkForEnter(e) {
......
app/assets/javascripts/groups/components/group_item.vue
View file @ 17853757
......@@ -77,7 +77,8 @@ export default {
class="group-row"
>
<div
class="group-row-contents">
class="group-row-contents"
:class="{ 'project-row-contents': !isGroup }">
<item-actions
v-if="isGroup"
:group="group"
......@@ -97,7 +98,7 @@ export default {
/>
</div>
<div
class="avatar-container s40 hidden-xs"
class="avatar-container prepend-top-8 prepend-left-5 s24 hidden-xs"
:class="{ 'content-loading': group.isChildrenLoading }"
>
<a
......@@ -106,11 +107,12 @@ export default {
>
<img
v-if="hasAvatar"
class="avatar s40"
class="avatar s24"
:src="group.avatarUrl"
/>
<identicon
v-else
size-class="s24"
:entity-id=group.id
:entity-name="group.name"
/>
......@@ -123,7 +125,7 @@ export default {
:href="group.relativePath"
:title="group.fullName"
class="no-expand"
data-placement="top"
data-placement="bottom"
>{{
// ending bracket must be by closing tag to prevent
// link hover text-decoration from over-extending
......
app/assets/javascripts/groups/components/item_actions.vue
View file @ 17853757
<script>
import { s__ } from '../../locale';
import tooltip from '../../vue_shared/directives/tooltip';
import modal from '../../vue_shared/components/modal.vue';
import { s__ } from '~/locale';
import tooltip from '~/vue_shared/directives/tooltip';
import icon from '~/vue_shared/components/icon.vue';
import modal from '~/vue_shared/components/modal.vue';
import eventHub from '../event_hub';
import { COMMON_STR } from '../constants';
import Icon from '../../vue_shared/components/icon.vue';
export default {
components: {
Icon,
icon,
modal,
},
directives: {
......@@ -64,10 +64,9 @@ export default {
:title="editBtnTitle"
:aria-label="editBtnTitle"
data-container="body"
data-placement="bottom"
class="edit-group btn no-expand">
<icon
name="settings">
</icon>
<icon name="settings"/>
</a>
<a
v-tooltip
......@@ -77,10 +76,9 @@ export default {
:title="leaveBtnTitle"
:aria-label="leaveBtnTitle"
data-container="body"
data-placement="bottom"
class="leave-group btn no-expand">
<i
class="fa fa-sign-out"
aria-hidden="true"/>
<icon name="leave"/>
</a>
<modal
v-show="modalStatus"
......
app/assets/javascripts/groups/components/item_caret.vue
View file @ 17853757
<script>
import icon from '~/vue_shared/components/icon.vue';
export default {
props: {
isGroupOpen: {
......@@ -7,9 +9,12 @@ export default {
default: false,
},
},
components: {
icon,
},
computed: {
iconClass() {
return this.isGroupOpen ? 'fa-caret-down' : 'fa-caret-right';
return this.isGroupOpen ? 'angle-down' : 'angle-right';
},
},
};
......@@ -17,9 +22,9 @@ export default {
<template>
<span class="folder-caret">
<i
:class="iconClass"
class="fa"
aria-hidden="true"/>
<icon
:size="12"
:name="iconClass"
/>
</span>
</template>
app/assets/javascripts/groups/components/item_stats.vue
View file @ 17853757
<script>
import tooltip from '../../vue_shared/directives/tooltip';
import icon from '~/vue_shared/components/icon.vue';
import timeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
import { ITEM_TYPE, VISIBILITY_TYPE_ICON, GROUP_VISIBILITY_TYPE, PROJECT_VISIBILITY_TYPE } from '../constants';
import itemStatsValue from './item_stats_value.vue';
export default {
directives: {
tooltip,
components: {
icon,
timeAgoTooltip,
itemStatsValue,
},
props: {
item: {
......@@ -34,65 +38,47 @@ export default {
<template>
<div class="stats">
<span
v-tooltip
<item-stats-value
v-if="isGroup"
css-class="number-subgroups"
icon-name="folder"
:title="s__('Subgroups')"
class="number-subgroups"
data-placement="top"
data-container="body">
<i
class="fa fa-folder"
aria-hidden="true"
/>
{{item.subgroupCount}}
</span>
<span
v-tooltip
:value=item.subgroupCount
/>
<item-stats-value
v-if="isGroup"
css-class="number-projects"
icon-name="bookmark"
:title="s__('Projects')"
class="number-projects"
data-placement="top"
data-container="body">
<i
class="fa fa-bookmark"
aria-hidden="true"
/>
{{item.projectCount}}
</span>
<span
v-tooltip
:value=item.projectCount
/>
<item-stats-value
v-if="isGroup"
css-class="number-users"
icon-name="users"
:title="s__('Members')"
class="number-users"
data-placement="top"
data-container="body">
<i
class="fa fa-users"
aria-hidden="true"
/>
{{item.memberCount}}
</span>
<span
:value=item.memberCount
/>
<item-stats-value
v-if="isProject"
class="project-stars">
<i
class="fa fa-star"
aria-hidden="true"
/>
{{item.starCount}}
</span>
<span
v-tooltip
css-class="project-stars"
icon-name="star"
:value=item.starCount
/>
<item-stats-value
css-class="item-visibility"
tooltip-placement="left"
:icon-name="visibilityIcon"
:title="visibilityTooltip"
data-placement="left"
data-container="body"
class="item-visibility">
<i
:class="visibilityIcon"
class="fa"
aria-hidden="true"
/>
<div
class="last-updated"
v-if="isProject"
>
<time-ago-tooltip
tooltip-placement="bottom"
:time="item.updatedAt"
/>
</span>
</div>
</div>
</template>
app/assets/javascripts/groups/components/item_stats_value.vue 0 → 100644
View file @ 17853757
<script>
import tooltip from '~/vue_shared/directives/tooltip';
import icon from '~/vue_shared/components/icon.vue';
export default {
props: {
title: {
type: String,
required: false,
default: '',
},
cssClass: {
type: String,
required: false,
default: '',
},
iconName: {
type: String,
required: true,
},
tooltipPlacement: {
type: String,
required: false,
default: 'bottom',
},
/**
* value could either be number or string
* as `memberCount` is always passed as string
* while `subgroupCount` & `projectCount`
* are always number
*/
value: {
type: [Number, String],
required: false,
default: '',
},
},
directives: {
tooltip,
},
components: {
icon,
},
computed: {
isValuePresent() {
return this.value !== '';
},
},
};
</script>
<template>
<span
v-tooltip
data-container="body"
:data-placement="tooltipPlacement"
:class="cssClass"
:title="title"
>
<icon :name="iconName"/>
<span
v-if="isValuePresent"
class="stat-value"
>
{{value}}
</span>
</span>
</template>
app/assets/javascripts/groups/components/item_type_icon.vue
View file @ 17853757
<script>
import icon from '~/vue_shared/components/icon.vue';
import { ITEM_TYPE } from '../constants';
export default {
components: {
icon,
},
props: {
itemType: {
type: String,
......@@ -16,9 +20,9 @@ export default {
computed: {
iconClass() {
if (this.itemType === ITEM_TYPE.GROUP) {
return this.isGroupOpen ? 'fa-folder-open' : 'fa-folder';
return this.isGroupOpen ? 'folder-open' : 'folder';
}
return 'fa-bookmark';
return 'bookmark';
},
},
};
......@@ -26,9 +30,6 @@ export default {
<template>
<span class="item-type-icon">
<i
:class="iconClass"
class="fa"
aria-hidden="true"/>
<icon :name="iconClass"/>
</span>
</template>
app/assets/javascripts/groups/constants.js
View file @ 17853757
......@@ -29,7 +29,7 @@ export const PROJECT_VISIBILITY_TYPE = {
};
export const VISIBILITY_TYPE_ICON = {
public: 'fa-globe',
internal: 'fa-shield',
private: 'fa-lock',
public: 'earth',
internal: 'shield',
private: 'lock',
};
app/assets/javascripts/groups/store/groups_store.js
View file @ 17853757
......@@ -91,6 +91,7 @@ export default class GroupsStore {
subgroupCount: rawGroupItem.subgroup_count,
memberCount: rawGroupItem.number_users_with_delimiter,
starCount: rawGroupItem.star_count,
updatedAt: rawGroupItem.updated_at,
};
}
......
app/assets/javascripts/ide/components/ide_context_bar.vue
View file @ 17853757
......@@ -2,11 +2,18 @@
import { mapGetters, mapState, mapActions } from 'vuex';
import repoCommitSection from './repo_commit_section.vue';
import icon from '../../vue_shared/components/icon.vue';
import panelResizer from '../../vue_shared/components/panel_resizer.vue';
export default {
data() {
return {
width: 290,
};
},
components: {
repoCommitSection,
icon,
panelResizer,
},
computed: {
...mapState([
......@@ -18,10 +25,20 @@ export default {
currentIcon() {
return this.rightPanelCollapsed ? 'angle-double-left' : 'angle-double-right';
},
maxSize() {
return window.innerWidth / 2;
},
panelStyle() {
if (!this.rightPanelCollapsed) {
return { width: `${this.width}px` };
}
return {};
},
},
methods: {
...mapActions([
'setPanelCollapsedStatus',
'setResizingStatus',
]),
toggleCollapsed() {
this.setPanelCollapsedStatus({
......@@ -29,6 +46,12 @@ export default {
collapsed: !this.rightPanelCollapsed,
});
},
resizingStarted() {
this.setResizingStatus(true);
},
resizingEnded() {
this.setResizingStatus(false);
},
},
};
</script>
......@@ -39,6 +62,7 @@ export default {
:class="{
'is-collapsed': rightPanelCollapsed,
}"
:style="panelStyle"
>
<div
class="multi-file-commit-panel-section">
......@@ -71,5 +95,14 @@ export default {
<repo-commit-section
class=""/>
</div>
<panel-resizer
:size.sync="width"
:enabled="!rightPanelCollapsed"
:start-size="290"
:min-size="200"
:max-size="maxSize"
@resize-start="resizingStarted"
@resize-end="resizingEnded"
side="left"/>
</div>
</template>
app/assets/javascripts/ide/components/ide_side_bar.vue
View file @ 17853757
......@@ -2,11 +2,18 @@
import { mapState, mapActions } from 'vuex';
import projectTree from './ide_project_tree.vue';
import icon from '../../vue_shared/components/icon.vue';
import panelResizer from '../../vue_shared/components/panel_resizer.vue';
export default {
data() {
return {
width: 290,
};
},
components: {
projectTree,
icon,
panelResizer,
},
computed: {
...mapState([
......@@ -16,10 +23,20 @@ export default {
currentIcon() {
return this.leftPanelCollapsed ? 'angle-double-right' : 'angle-double-left';
},
maxSize() {
return window.innerWidth / 2;
},
panelStyle() {
if (!this.leftPanelCollapsed) {
return { width: `${this.width}px` };
}
return {};
},
},
methods: {
...mapActions([
'setPanelCollapsedStatus',
'setResizingStatus',
]),
toggleCollapsed() {
this.setPanelCollapsedStatus({
......@@ -27,6 +44,12 @@ export default {
collapsed: !this.leftPanelCollapsed,
});
},
resizingStarted() {
this.setResizingStatus(true);
},
resizingEnded() {
this.setResizingStatus(false);
},
},
};
</script>
......@@ -37,6 +60,7 @@ export default {
:class="{
'is-collapsed': leftPanelCollapsed,
}"
:style="panelStyle"
>
<div class="multi-file-commit-panel-inner">
<project-tree
......@@ -58,5 +82,14 @@ export default {
class="collapse-text"
>Collapse sidebar</span>
</button>
<panel-resizer
:size.sync="width"
:enabled="!leftPanelCollapsed"
:start-size="290"
:min-size="200"
:max-size="maxSize"
@resize-start="resizingStarted"
@resize-end="resizingEnded"
side="right"/>
</div>
</template>
app/assets/javascripts/ide/components/repo_editor.vue
View file @ 17853757
......@@ -90,6 +90,11 @@ export default {
rightPanelCollapsed() {
this.editor.updateDimensions();
},
panelResizing(isResizing) {
if (isResizing === false) {
this.editor.updateDimensions();
}
},
},
computed: {
...mapGetters([
......@@ -99,6 +104,7 @@ export default {
...mapState([
'leftPanelCollapsed',
'rightPanelCollapsed',
'panelResizing',
]),
shouldHideEditor() {
return this.activeFile.binary && !this.activeFile.raw;
......
app/assets/javascripts/ide/components/repo_file.vue
View file @ 17853757
......@@ -3,6 +3,7 @@
import timeAgoMixin from '../../vue_shared/mixins/timeago';
import skeletonLoadingContainer from '../../vue_shared/components/skeleton_loading_container.vue';
import newDropdown from './new_dropdown/index.vue';
import fileIcon from '../../vue_shared/components/file_icon.vue';
export default {
mixins: [
......@@ -11,6 +12,7 @@
components: {
skeletonLoadingContainer,
newDropdown,
fileIcon,
},
props: {
file: {
......@@ -26,13 +28,6 @@
...mapState([
'leftPanelCollapsed',
]),
fileIcon() {
return {
'fa-spinner fa-spin': this.file.loading,
[this.file.icon]: !this.file.loading,
'fa-folder-open': !this.file.loading && this.file.opened,
};
},
isSubmodule() {
return this.file.type === 'submodule';
},
......@@ -94,16 +89,18 @@
class="multi-file-table-name"
:colspan="submoduleColSpan"
>
<i
class="fa fa-fw file-icon"
:class="fileIcon"
:style="levelIndentation"
aria-hidden="true"
>
</i>
<a
class="repo-file-name"
>
<file-icon
:file-name="file.name"
:loading="file.loading"
:folder="file.type === 'tree'"
:opened="file.opened"
:style="levelIndentation"
:size="16"
>
</file-icon>
{{ file.name }}
</a>
<new-dropdown
......
app/assets/javascripts/ide/components/repo_tab.vue
View file @ 17853757
<script>
import { mapActions } from 'vuex';
import fileIcon from '../../vue_shared/components/file_icon.vue';
export default {
props: {
......@@ -8,7 +9,9 @@ export default {
required: true,
},
},
components: {
fileIcon,
},
computed: {
closeLabel() {
if (this.tab.changed || this.tab.tempFile) {
......@@ -63,6 +66,11 @@ export default {
:class="{active : tab.active }"
:title="tab.url"
>
<file-icon
:file-name="tab.name"
:size="16"
>
</file-icon>
{{ tab.name }}
</div>
</li>
......
app/assets/javascripts/ide/stores/actions.js
View file @ 17853757
......@@ -63,6 +63,10 @@ export const setPanelCollapsedStatus = ({ commit }, { side, collapsed }) => {
}
};
export const setResizingStatus = ({ commit }, resizing) => {
commit(types.SET_RESIZING_STATUS, resizing);
};
export const checkCommitStatus = ({ state }) =>
service
.getBranchData(state.currentProjectId, state.currentBranchId)
......
app/assets/javascripts/ide/stores/mutation_types.js
View file @ 17853757
......@@ -5,6 +5,7 @@ export const SET_ROOT = 'SET_ROOT';
export const SET_LAST_COMMIT_DATA = 'SET_LAST_COMMIT_DATA';
export const SET_LEFT_PANEL_COLLAPSED = 'SET_LEFT_PANEL_COLLAPSED';
export const SET_RIGHT_PANEL_COLLAPSED = 'SET_RIGHT_PANEL_COLLAPSED';
export const SET_RESIZING_STATUS = 'SET_RESIZING_STATUS';
// Project Mutation Types
export const SET_PROJECT = 'SET_PROJECT';
......
app/assets/javascripts/ide/stores/mutations.js
View file @ 17853757
......@@ -49,6 +49,11 @@ export default {
rightPanelCollapsed: collapsed,
});
},
[types.SET_RESIZING_STATUS](state, resizing) {
Object.assign(state, {
panelResizing: resizing,
});
},
[types.SET_LAST_COMMIT_DATA](state, { entry, lastCommit }) {
Object.assign(entry.lastCommit, {
id: lastCommit.commit.id,
......
app/assets/javascripts/ide/stores/state.js
View file @ 17853757
......@@ -19,4 +19,5 @@ export default () => ({
projects: {},
leftPanelCollapsed: false,
rightPanelCollapsed: true,
panelResizing: false,
});
app/assets/javascripts/init_issuable_sidebar.js
View file @ 17853757
/* eslint-disable no-new */
/* global MilestoneSelect */
import MilestoneSelect from './milestone_select';
import LabelsSelect from './labels_select';
import IssuableContext from './issuable_context';
import Sidebar from './right_sidebar';
......
app/assets/javascripts/init_legacy_filters.js
View file @ 17853757
/* eslint-disable no-new */
import LabelsSelect from './labels_select';
/* global MilestoneSelect */
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();
......
app/assets/javascripts/issuable_bulk_update_sidebar.js
View file @ 17853757
/* eslint-disable class-methods-use-this, no-new */
/* global MilestoneSelect */
import IssuableBulkUpdateActions from './issuable_bulk_update_actions';
import './milestone_select';
import MilestoneSelect from './milestone_select';
import issueStatusSelect from './issue_status_select';
import subscriptionSelect from './subscription_select';
import LabelsSelect from './labels_select';
......
app/assets/javascripts/issue_show/components/app.vue
View file @ 17853757
......@@ -172,8 +172,8 @@ export default {
},
updateIssuable() {
this.service.updateIssuable(this.store.formState)
.then(res => res.json())
return this.service.updateIssuable(this.store.formState)
.then(res => res.data)
.then(data => this.checkForSpam(data))
.then((data) => {
if (location.pathname !== data.web_url) {
......@@ -182,7 +182,7 @@ export default {
return this.service.getData();
})
.then(res => res.json())
.then(res => res.data)
.then((data) => {
this.store.updateState(data);
eventHub.$emit('close.form');
......@@ -207,7 +207,7 @@ export default {
deleteIssuable() {
this.service.deleteIssuable()
.then(res => res.json())
.then(res => res.data)
.then((data) => {
// Stop the poll so we don't get 404's with the issuable not existing
this.poll.stop();
......@@ -225,7 +225,7 @@ export default {
this.poll = new Poll({
resource: this.service,
method: 'getData',
successCallback: res => res.json().then(data => this.store.updateState(data)),
successCallback: res => this.store.updateState(res.data),
errorCallback(err) {
throw new Error(err);
},
......
app/assets/javascripts/issue_show/services/index.js
View file @ 17853757
import Vue from 'vue';
import VueResource from 'vue-resource';
Vue.use(VueResource);
import axios from '../../lib/utils/axios_utils';
export default class Service {
constructor(endpoint) {
this.endpoint = endpoint;
this.resource = Vue.resource(`${this.endpoint}.json`, {}, {
realtimeChanges: {
method: 'GET',
url: `${this.endpoint}/realtime_changes`,
},
});
this.endpoint = `${endpoint}.json`;
this.realtimeEndpoint = `${endpoint}/realtime_changes`;
}
getData() {
return this.resource.realtimeChanges();
return axios.get(this.realtimeEndpoint);
}
deleteIssuable() {
return this.resource.delete();
return axios.delete(this.endpoint);
}
updateIssuable(data) {
return this.resource.update(data);
return axios.put(this.endpoint, data);
}
}
app/assets/javascripts/job.js
View file @ 17853757
import _ from 'underscore';
import { visitUrl } from './lib/utils/url_utility';
import bp from './breakpoints';
import { bytesToKiB } from './lib/utils/number_utils';
import { numberToHumanSize } from './lib/utils/number_utils';
import { setCiStatusFavicon } from './lib/utils/common_utils';
import { timeFor } from './lib/utils/datetime_utility';
......@@ -96,14 +96,15 @@ export default class Job {
// eslint-disable-next-line class-methods-use-this
canScroll() {
return this.$document.height() > this.$window.height();
return $(document).height() > $(window).height();
}
toggleScroll() {
const currentPosition = this.$document.scrollTop();
const scrollHeight = this.$document.height();
const $document = $(document);
const currentPosition = $document.scrollTop();
const scrollHeight = $document.height();
const windowHeight = this.$window.height();
const windowHeight = $(window).height();
if (this.canScroll()) {
if (currentPosition > 0 &&
(scrollHeight - currentPosition !== windowHeight)) {
......@@ -127,18 +128,22 @@ export default class Job {
this.toggleDisableButton(this.$scrollBottomBtn, true);
}
}
// eslint-disable-next-line class-methods-use-this
isScrolledToBottom() {
const currentPosition = this.$document.scrollTop();
const scrollHeight = this.$document.height();
const $document = $(document);
const currentPosition = $document.scrollTop();
const scrollHeight = $document.height();
const windowHeight = $(window).height();
const windowHeight = this.$window.height();
return scrollHeight - currentPosition === windowHeight;
}
// eslint-disable-next-line class-methods-use-this
scrollDown() {
this.$document.scrollTop(this.$document.height());
const $document = $(document);
$document.scrollTop($document.height());
}
scrollToBottom() {
......@@ -148,7 +153,7 @@ export default class Job {
}
scrollToTop() {
this.$document.scrollTop(0);
$(document).scrollTop(0);
this.hasBeenScrolled = true;
this.toggleScroll();
}
......@@ -193,7 +198,7 @@ export default class Job {
// we need to show a message warning the user about that.
if (this.logBytes < log.total) {
// size is in bytes, we need to calculate KiB
const size = bytesToKiB(this.logBytes);
const size = numberToHumanSize(this.logBytes);
$('.js-truncated-info-size').html(`${size}`);
this.$truncatedInfo.removeClass('hidden');
} else {
......
app/assets/javascripts/lib/utils/axios_utils.js
View file @ 17853757
......@@ -2,6 +2,8 @@ import axios from 'axios';
import csrf from './csrf';
axios.defaults.headers.common[csrf.headerKey] = csrf.token;
// Used by Rails to check if it is a valid XHR request
axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
// Maintain a global counter for active requests
// see: spec/support/wait_for_requests.rb
......
app/assets/javascripts/lib/utils/common_utils.js
View file @ 17853757
......@@ -232,7 +232,7 @@ export const nodeMatchesSelector = (node, selector) => {
export const normalizeHeaders = (headers) => {
const upperCaseHeaders = {};
Object.keys(headers).forEach((e) => {
Object.keys(headers || {}).forEach((e) => {
upperCaseHeaders[e.toUpperCase()] = headers[e];
});
......
app/assets/javascripts/lib/utils/url_utility.js
View file @ 17853757
......@@ -18,7 +18,7 @@ export function getParameterValues(sParam) {
// @param {String} url
export function mergeUrlParams(params, url) {
let newUrl = Object.keys(params).reduce((acc, paramName) => {
const paramValue = params[paramName];
const paramValue = encodeURIComponent(params[paramName]);
const pattern = new RegExp(`\\b(${paramName}=).*?(&|$)`);
if (paramValue === null) {
......
app/assets/javascripts/milestone_select.js
View file @ 17853757
This diff is collapsed.
app/assets/javascripts/monitoring/utils/date_time_formatters.js
View file @ 17853757
import { timeFormat as time } from 'd3-time-format';
import { timeSecond, timeMinute, timeHour, timeDay, timeMonth, timeYear } from 'd3-time';
import { timeSecond, timeMinute, timeHour, timeDay, timeWeek, timeMonth, timeYear } from 'd3-time';
import { bisector } from 'd3-array';
const d3 = { time, bisector, timeSecond, timeMinute, timeHour, timeDay, timeMonth, timeYear };
const d3 = {
time,
bisector,
timeSecond,
timeMinute,
timeHour,
timeDay,
timeWeek,
timeMonth,
timeYear,
};
export const dateFormat = d3.time('%b %-d, %Y');
export const timeFormat = d3.time('%-I:%M%p');
......
app/assets/javascripts/pipelines/components/pipelines_artifacts.vue
View file @ 17853757
<script>
import tooltip from '../../vue_shared/directives/tooltip';
import icon from '../../vue_shared/components/icon.vue';
export default {
props: {
......@@ -11,6 +12,9 @@
directives: {
tooltip,
},
components: {
icon,
},
};
</script>
<template>
......@@ -24,10 +28,9 @@
data-placement="top"
data-toggle="dropdown"
aria-label="Artifacts">
<i
class="fa fa-download"
aria-hidden="true">
</i>
<icon
name="download">
</icon>
<i
class="fa fa-caret-down"
aria-hidden="true">
......
app/assets/javascripts/profile/profile.js
View file @ 17853757
/* eslint-disable comma-dangle, no-unused-vars, class-methods-use-this, quotes, consistent-return, func-names, prefer-arrow-callback, space-before-function-paren, max-len */
import Cookies from 'js-cookie';
import Flash from '../flash';
import { getPagePath } from '../lib/utils/common_utils';
......@@ -7,6 +8,8 @@ import { getPagePath } from '../lib/utils/common_utils';
constructor({ form } = {}) {
this.onSubmitForm = this.onSubmitForm.bind(this);
this.form = form || $('.edit-user');
this.newRepoActivated = Cookies.get('new_repo');
this.setRepoRadio();
this.bindEvents();
this.initAvatarGlCrop();
}
......@@ -25,6 +28,7 @@ import { getPagePath } from '../lib/utils/common_utils';
bindEvents() {
$('.js-preferences-form').on('change.preference', 'input[type=radio]', this.submitForm);
$('input[name="user[multi_file]"]').on('change', this.setNewRepoCookie);
$('#user_notification_email').on('change', this.submitForm);
$('#user_notified_of_own_activity').on('change', this.submitForm);
$('.update-username').on('ajax:before', this.beforeUpdateUsername);
......@@ -82,6 +86,23 @@ import { getPagePath } from '../lib/utils/common_utils';
}
});
}
setNewRepoCookie() {
if (this.value === 'off') {
Cookies.remove('new_repo');
} else {
Cookies.set('new_repo', true, { expires_in: 365 });
}
}
setRepoRadio() {
const multiEditRadios = $('input[name="user[multi_file]"]');
if (this.newRepoActivated || this.newRepoActivated === 'true') {
multiEditRadios.filter('[value=on]').prop('checked', true);
} else {
multiEditRadios.filter('[value=off]').prop('checked', true);
}
}
}
$(function() {
......
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_deployment.js
View file @ 17853757
......@@ -34,10 +34,10 @@ export default {
if (isConfirmed) {
MRWidgetService.stopEnvironment(deployment.stop_url)
.then(res => res.json())
.then((res) => {
if (res.redirect_url) {
visitUrl(res.redirect_url);
.then(res => res.data)
.then((data) => {
if (data.redirect_url) {
visitUrl(data.redirect_url);
}
})
.catch(() => {
......
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.js
View file @ 17853757
import tooltip from '../../vue_shared/directives/tooltip';
import { pluralize } from '../../lib/utils/text_utility';
import icon from '../../vue_shared/components/icon.vue';
export default {
name: 'MRWidgetHeader',
......@@ -9,6 +10,9 @@ export default {
directives: {
tooltip,
},
components: {
icon,
},
computed: {
shouldShowCommitsBehindText() {
return this.mr.divergedCommitsCount > 0;
......@@ -81,10 +85,9 @@ export default {
data-toggle="dropdown"
aria-label="Download as"
role="button">
<i
class="fa fa-download"
aria-hidden="true">
</i>
<icon
name="download">
</icon>
<i
class="fa fa-caret-down"
aria-hidden="true">
......
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_memory_usage.js
View file @ 17853757
......@@ -102,11 +102,11 @@ export default {
return res;
}
return res.json();
return res.data;
})
.then((res) => {
this.computeGraphData(res.metrics, res.deployment_time);
return res;
.then((data) => {
this.computeGraphData(data.metrics, data.deployment_time);
return data;
})
.catch(() => {
this.loadFailed = true;
......
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_closed.js
View file @ 17853757
......@@ -16,9 +16,9 @@ export default {
<div class="media-body">
<mr-widget-author-and-time
actionText="Closed by"
:author="mr.closedEvent.author"
:dateTitle="mr.closedEvent.updatedAt"
:dateReadable="mr.closedEvent.formattedUpdatedAt"
:author="mr.metrics.closedBy"
:dateTitle="mr.metrics.closedAt"
:dateReadable="mr.metrics.readableClosedAt"
/>
<section class="mr-info-list">
<p>
......
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merge_when_pipeline_succeeds.js
View file @ 17853757
......@@ -31,9 +31,9 @@ export default {
cancelAutomaticMerge() {
this.isCancellingAutoMerge = true;
this.service.cancelAutomaticMerge()
.then(res => res.json())
.then((res) => {
eventHub.$emit('UpdateWidgetData', res);
.then(res => res.data)
.then((data) => {
eventHub.$emit('UpdateWidgetData', data);
})
.catch(() => {
this.isCancellingAutoMerge = false;
......@@ -49,9 +49,9 @@ export default {
this.isRemovingSourceBranch = true;
this.service.mergeResource.save(options)
.then(res => res.json())
.then((res) => {
if (res.status === 'merge_when_pipeline_succeeds') {
.then(res => res.data)
.then((data) => {
if (data.status === 'merge_when_pipeline_succeeds') {
eventHub.$emit('MRWidgetUpdateRequested');
}
})
......
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.js
View file @ 17853757
......@@ -47,9 +47,9 @@ export default {
removeSourceBranch() {
this.isMakingRequest = true;
this.service.removeSourceBranch()
.then(res => res.json())
.then((res) => {
if (res.message === 'Branch was removed') {
.then(res => res.data)
.then((data) => {
if (data.message === 'Branch was removed') {
eventHub.$emit('MRWidgetUpdateRequested', () => {
this.isMakingRequest = false;
});
......@@ -68,9 +68,9 @@ export default {
<div class="space-children">
<mr-widget-author-and-time
actionText="Merged by"
:author="mr.mergedEvent.author"
:date-title="mr.mergedEvent.updatedAt"
:date-readable="mr.mergedEvent.formattedUpdatedAt" />
:author="mr.metrics.mergedBy"
:date-title="mr.metrics.mergedAt"
:date-readable="mr.metrics.readableMergedAt" />
<a
v-if="mr.canRevertInCurrentMR"
v-tooltip
......
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js
View file @ 17853757
......@@ -135,16 +135,16 @@ export default {
this.isMakingRequest = true;
this.service.merge(options)
.then(res => res.json())
.then((res) => {
const hasError = res.status === 'failed' || res.status === 'hook_validation_error';
.then(res => res.data)
.then((data) => {
const hasError = data.status === 'failed' || data.status === 'hook_validation_error';
if (res.status === 'merge_when_pipeline_succeeds') {
if (data.status === 'merge_when_pipeline_succeeds') {
eventHub.$emit('MRWidgetUpdateRequested');
} else if (res.status === 'success') {
} else if (data.status === 'success') {
this.initiateMergePolling();
} else if (hasError) {
eventHub.$emit('FailedToMerge', res.merge_error);
eventHub.$emit('FailedToMerge', data.merge_error);
}
})
.catch(() => {
......@@ -159,9 +159,9 @@ export default {
},
handleMergePolling(continuePolling, stopPolling) {
this.service.poll()
.then(res => res.json())
.then((res) => {
if (res.state === 'merged') {
.then(res => res.data)
.then((data) => {
if (data.state === 'merged') {
// If state is merged we should update the widget and stop the polling
eventHub.$emit('MRWidgetUpdateRequested');
eventHub.$emit('FetchActionsContent');
......@@ -174,11 +174,11 @@ export default {
// If user checked remove source branch and we didn't remove the branch yet
// we should start another polling for source branch remove process
if (this.removeSourceBranch && res.source_branch_exists) {
if (this.removeSourceBranch && data.source_branch_exists) {
this.initiateRemoveSourceBranchPolling();
}
} else if (res.merge_error) {
eventHub.$emit('FailedToMerge', res.merge_error);
} else if (data.merge_error) {
eventHub.$emit('FailedToMerge', data.merge_error);
stopPolling();
} else {
// MR is not merged yet, continue polling until the state becomes 'merged'
......@@ -199,11 +199,11 @@ export default {
},
handleRemoveBranchPolling(continuePolling, stopPolling) {
this.service.poll()
.then(res => res.json())
.then((res) => {
.then(res => res.data)
.then((data) => {
// If source branch exists then we should continue polling
// because removing a source branch is a background task and takes time
if (res.source_branch_exists) {
if (data.source_branch_exists) {
continuePolling();
} else {
// Branch is removed. Update widget, stop polling and hide the spinner
......
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_wip.js
View file @ 17853757
......@@ -23,9 +23,9 @@ export default {
removeWIP() {
this.isMakingRequest = true;
this.service.removeWIP()
.then(res => res.json())
.then((res) => {
eventHub.$emit('UpdateWidgetData', res);
.then(res => res.data)
.then((data) => {
eventHub.$emit('UpdateWidgetData', data);
new window.Flash('The merge request can now be merged.', 'notice'); // eslint-disable-line
$('.merge-request .detail-page-description .title').text(this.mr.title);
})
......
app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js
View file @ 17853757
......@@ -84,14 +84,14 @@ export default {
},
checkStatus(cb) {
return this.service.checkStatus()
.then(res => res.json())
.then((res) => {
this.handleNotification(res);
this.mr.setData(res);
.then(res => res.data)
.then((data) => {
this.handleNotification(data);
this.mr.setData(data);
this.setFaviconHelper();
if (cb) {
cb.call(null, res);
cb.call(null, data);
}
})
.catch(() => {
......@@ -124,10 +124,10 @@ export default {
},
fetchDeployments() {
return this.service.fetchDeployments()
.then(res => res.json())
.then((res) => {
if (res.length) {
this.mr.deployments = res;
.then(res => res.data)
.then((data) => {
if (data.length) {
this.mr.deployments = data;
}
})
.catch(() => {
......@@ -137,9 +137,9 @@ export default {
fetchActionsContent() {
this.service.fetchMergeActionsContent()
.then((res) => {
if (res.body) {
if (res.data) {
const el = document.createElement('div');
el.innerHTML = res.body;
el.innerHTML = res.data;
document.body.appendChild(el);
Project.initRefSwitcher();
}
......
app/assets/javascripts/vue_merge_request_widget/services/mr_widget_service.js
View file @ 17853757
import Vue from 'vue';
import VueResource from 'vue-resource';
Vue.use(VueResource);
import axios from '../../lib/utils/axios_utils';
export default class MRWidgetService {
constructor(endpoints) {
this.mergeResource = Vue.resource(endpoints.mergePath);
this.mergeCheckResource = Vue.resource(`${endpoints.statusPath}?serializer=widget`);
this.cancelAutoMergeResource = Vue.resource(endpoints.cancelAutoMergePath);
this.removeWIPResource = Vue.resource(endpoints.removeWIPPath);
this.removeSourceBranchResource = Vue.resource(endpoints.sourceBranchPath);
this.deploymentsResource = Vue.resource(endpoints.ciEnvironmentsStatusPath);
this.pollResource = Vue.resource(`${endpoints.statusPath}?serializer=basic`);
this.mergeActionsContentResource = Vue.resource(endpoints.mergeActionsContentPath);
this.endpoints = endpoints;
}
merge(data) {
return this.mergeResource.save(data);
return axios.post(this.endpoints.mergePath, data);
}
cancelAutomaticMerge() {
return this.cancelAutoMergeResource.save();
return axios.post(this.endpoints.cancelAutoMergePath);
}
removeWIP() {
return this.removeWIPResource.save();
return axios.post(this.endpoints.removeWIPPath);
}
removeSourceBranch() {
return this.removeSourceBranchResource.delete();
return axios.delete(this.endpoints.sourceBranchPath);
}
fetchDeployments() {
return this.deploymentsResource.get();
return axios.get(this.endpoints.ciEnvironmentsStatusPath);
}
poll() {
return this.pollResource.get();
return axios.get(`${this.endpoints.statusPath}?serializer=basic`);
}
checkStatus() {
return this.mergeCheckResource.get();
return axios.get(`${this.endpoints.statusPath}?serializer=widget`);
}
fetchMergeActionsContent() {
return this.mergeActionsContentResource.get();
return axios.get(this.endpoints.mergeActionsContentPath);
}
static stopEnvironment(url) {
return Vue.http.post(url);
return axios.post(url);
}
static fetchMetrics(metricsUrl) {
return Vue.http.get(`${metricsUrl}.json`);
return axios.get(`${metricsUrl}.json`);
}
}
app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
View file @ 17853757
......@@ -39,9 +39,8 @@ export default class MergeRequestStore {
}
this.updatedAt = data.updated_at;
this.mergedEvent = MergeRequestStore.getEventObject(data.merge_event);
this.closedEvent = MergeRequestStore.getEventObject(data.closed_event);
this.setToMWPSBy = MergeRequestStore.getAuthorObject({ author: data.merge_user || {} });
this.metrics = MergeRequestStore.buildMetrics(data.metrics);
this.setToMWPSBy = MergeRequestStore.formatUserObject(data.merge_user || {});
this.mergeUserId = data.merge_user_id;
this.currentUserId = gon.current_user_id;
this.sourceBranchPath = data.source_branch_path;
......@@ -125,43 +124,42 @@ export default class MergeRequestStore {
return this.state === stateKey.nothingToMerge;
}
static getEventObject(event) {
static buildMetrics(metrics) {
if (!metrics) {
return {};
}
return {
author: MergeRequestStore.getAuthorObject(event),
updatedAt: formatDate(MergeRequestStore.getEventUpdatedAtDate(event)),
formattedUpdatedAt: MergeRequestStore.getEventDate(event),
mergedBy: MergeRequestStore.formatUserObject(metrics.merged_by),
closedBy: MergeRequestStore.formatUserObject(metrics.closed_by),
mergedAt: formatDate(metrics.merged_at),
closedAt: formatDate(metrics.closed_at),
readableMergedAt: MergeRequestStore.getReadableDate(metrics.merged_at),
readableClosedAt: MergeRequestStore.getReadableDate(metrics.closed_at),
};
}
static getAuthorObject(event) {
if (!event) {
static formatUserObject(user) {
if (!user) {
return {};
}
return {
name: event.author.name || '',
username: event.author.username || '',
webUrl: event.author.web_url || '',
avatarUrl: event.author.avatar_url || '',
name: user.name || '',
username: user.username || '',
webUrl: user.web_url || '',
avatarUrl: user.avatar_url || '',
};
}
static getEventUpdatedAtDate(event) {
if (!event) {
static getReadableDate(date) {
if (!date) {
return '';
}
return event.updated_at;
}
static getEventDate(event) {
const timeagoInstance = new Timeago();
if (!event) {
return '';
}
return timeagoInstance.format(MergeRequestStore.getEventUpdatedAtDate(event));
return timeagoInstance.format(date);
}
}
app/assets/javascripts/vue_shared/components/commit.vue
View file @ 17853757
......@@ -2,13 +2,14 @@
import commitIconSvg from 'icons/_icon_commit.svg';
import userAvatarLink from './user_avatar/user_avatar_link.vue';
import tooltip from '../directives/tooltip';
import Icon from '../../vue_shared/components/icon.vue';
export default {
props: {
/**
* Indicates the existance of a tag.
* Used to render the correct icon, if true will render `fa-tag` icon,
* if false will render `fa-code-fork` icon.
* if false will render a svg sprite fork icon
*/
tag: {
type: Boolean,
......@@ -107,6 +108,7 @@
},
components: {
userAvatarLink,
Icon,
},
created() {
this.commitIconSvg = commitIconSvg;
......@@ -123,11 +125,10 @@
class="fa fa-tag"
aria-hidden="true">
</i>
<i
<icon
v-if="!tag"
class="fa fa-code-fork"
aria-hidden="true">
</i>
name="fork">
</icon>
</div>
<a
......
app/assets/javascripts/vue_shared/components/file_icon.vue 0 → 100644
View file @ 17853757
<script>
import getIconForFile from './file_icon/file_icon_map';
import loadingIcon from '../../vue_shared/components/loading_icon.vue';
import icon from '../../vue_shared/components/icon.vue';
/* This is a re-usable vue component for rendering a svg sprite
icon
Sample configuration:
<file-icon
name="retry"
:size="32"
css-classes="top"
/>
*/
export default {
props: {
fileName: {
type: String,
required: true,
},
folder: {
type: Boolean,
required: false,
default: false,
},
opened: {
type: Boolean,
required: false,
default: false,
},
loading: {
type: Boolean,
required: false,
default: false,
},
size: {
type: Number,
required: false,
default: 16,
},
cssClasses: {
type: String,
required: false,
default: '',
},
},
components: {
loadingIcon,
icon,
},
computed: {
spriteHref() {
const iconName = getIconForFile(this.fileName) || 'file';
return `${gon.sprite_file_icons}#${iconName}`;
},
folderIconName() {
// We don't have a open folder icon yet
return this.opened ? 'folder' : 'folder';
},
iconSizeClass() {
return this.size ? `s${this.size}` : '';
},
},
};
</script>
<template>
<span>
<svg
:class="[iconSizeClass, cssClasses]"
v-if="!loading && !folder">
<use
v-bind="{'xlink:href':spriteHref}"/>
</svg>
<icon
v-if="!loading && folder"
:name="folderIconName"
:size="size"
/>
<loading-icon
v-if="loading"
:inline="true"
/>
</span>
</template>
app/assets/javascripts/vue_shared/components/panel_resizer.vue 0 → 100644
View file @ 17853757
This diff is collapsed.
app/assets/stylesheets/framework/blocks.scss
View file @ 17853757
......@@ -10,7 +10,6 @@
color: $gl-text-color;
font-weight: $gl-font-weight-normal;
font-size: 14px;
line-height: 36px;
&.diff-collapsed {
padding: 5px;
......
app/assets/stylesheets/framework/lists.scss
View file @ 17853757
This diff is collapsed.
app/assets/stylesheets/framework/wells.scss
View file @ 17853757
This diff is collapsed.
app/assets/stylesheets/pages/clusters.scss
View file @ 17853757
This diff is collapsed.
app/assets/stylesheets/pages/events.scss
View file @ 17853757
This diff is collapsed.
app/assets/stylesheets/pages/pipelines.scss
View file @ 17853757
This diff is collapsed.
app/assets/stylesheets/pages/repo.scss
View file @ 17853757
This diff is collapsed.
app/assets/stylesheets/pages/settings.scss
View file @ 17853757
This diff is collapsed.
app/controllers/passwords_controller.rb
View file @ 17853757
This diff is collapsed.
app/helpers/blob_helper.rb
View file @ 17853757
This diff is collapsed.
app/helpers/commits_helper.rb
View file @ 17853757
This diff is collapsed.
app/helpers/icons_helper.rb
View file @ 17853757
This diff is collapsed.
app/helpers/projects_helper.rb
View file @ 17853757
This diff is collapsed.
app/helpers/services_helper.rb
View file @ 17853757
This diff is collapsed.
app/models/clusters/applications/helm.rb
View file @ 17853757
This diff is collapsed.
app/models/clusters/applications/ingress.rb
View file @ 17853757
This diff is collapsed.
app/models/clusters/applications/prometheus.rb 0 → 100644
View file @ 17853757
This diff is collapsed.
app/models/clusters/cluster.rb
View file @ 17853757
This diff is collapsed.
app/models/clusters/concerns/application_core.rb 0 → 100644
View file @ 17853757
This diff is collapsed.
app/models/concerns/cache_markdown_field.rb
View file @ 17853757
This diff is collapsed.
app/models/concerns/discussion_on_diff.rb
View file @ 17853757
This diff is collapsed.
app/models/concerns/issuable.rb
View file @ 17853757
This diff is collapsed.
app/models/concerns/note_on_diff.rb
View file @ 17853757
This diff is collapsed.
app/models/diff_discussion.rb
View file @ 17853757
This diff is collapsed.
app/models/diff_note.rb
View file @ 17853757
This diff is collapsed.
app/models/event.rb
View file @ 17853757
This diff is collapsed.
app/models/issue.rb
View file @ 17853757
This diff is collapsed.
app/models/legacy_diff_note.rb
View file @ 17853757
This diff is collapsed.
app/models/merge_request/metrics.rb
View file @ 17853757
This diff is collapsed.
app/models/namespace.rb
View file @ 17853757
This diff is collapsed.
app/models/project.rb
View file @ 17853757
This diff is collapsed.
app/models/project_team.rb
View file @ 17853757
This diff is collapsed.
app/models/repository.rb
View file @ 17853757
This diff is collapsed.
app/models/service.rb
View file @ 17853757
This diff is collapsed.
app/models/user.rb
View file @ 17853757
This diff is collapsed.
app/serializers/event_entity.rb deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
app/serializers/merge_request_metrics_entity.rb 0 → 100644
View file @ 17853757
This diff is collapsed.
app/services/event_create_service.rb
View file @ 17853757
This diff is collapsed.
app/services/merge_request_metrics_service.rb 0 → 100644
View file @ 17853757
This diff is collapsed.
app/services/merge_requests/base_service.rb
View file @ 17853757
This diff is collapsed.
app/services/projects/create_service.rb
View file @ 17853757
This diff is collapsed.
app/services/projects/fork_service.rb
View file @ 17853757
This diff is collapsed.
app/services/projects/transfer_service.rb
View file @ 17853757
This diff is collapsed.
app/services/search/global_service.rb
View file @ 17853757
This diff is collapsed.
app/services/search/group_service.rb
View file @ 17853757
This diff is collapsed.
app/services/users/destroy_service.rb
View file @ 17853757
This diff is collapsed.
app/views/groups/edit.html.haml
View file @ 17853757
This diff is collapsed.
app/views/layouts/header/_default.html.haml
View file @ 17853757
This diff is collapsed.
app/views/profiles/accounts/show.html.haml
View file @ 17853757
This diff is collapsed.
app/views/profiles/audit_log.html.haml
View file @ 17853757
This diff is collapsed.
app/views/profiles/gpg_keys/index.html.haml
View file @ 17853757
This diff is collapsed.
app/views/profiles/keys/show.html.haml
View file @ 17853757
This diff is collapsed.
app/views/profiles/show.html.haml
View file @ 17853757
This diff is collapsed.
app/views/projects/_last_push.html.haml
View file @ 17853757
This diff is collapsed.
app/views/projects/blob/_editor.html.haml
View file @ 17853757
This diff is collapsed.
app/views/projects/clusters/show.html.haml
View file @ 17853757
This diff is collapsed.
app/views/projects/compare/_form.html.haml
View file @ 17853757
This diff is collapsed.
app/views/projects/compare/index.html.haml
View file @ 17853757
This diff is collapsed.
app/views/projects/compare/show.html.haml
View file @ 17853757
This diff is collapsed.
app/views/projects/edit.html.haml
View file @ 17853757
This diff is collapsed.
app/views/projects/forks/error.html.haml
View file @ 17853757
This diff is collapsed.
app/views/projects/jobs/show.html.haml
View file @ 17853757
This diff is collapsed.
app/views/projects/services/_deprecated_message.html.haml 0 → 100644
View file @ 17853757
This diff is collapsed.
app/views/projects/services/_form.html.haml
View file @ 17853757
This diff is collapsed.
app/views/projects/services/edit.html.haml
View file @ 17853757
This diff is collapsed.
app/views/projects/tree/show.html.haml
View file @ 17853757
This diff is collapsed.
app/views/shared/_field.html.haml
View file @ 17853757
This diff is collapsed.
app/views/shared/_recaptcha_form.html.haml
View file @ 17853757
This diff is collapsed.
changelogs/unreleased/13634-broadcast-message.yml deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
changelogs/unreleased/20035-pause-resume-runners.yml 0 → 100644
View file @ 17853757
This diff is collapsed.
changelogs/unreleased/31995-project-limit-default-fix.yml 0 → 100644
View file @ 17853757
This diff is collapsed.
changelogs/unreleased/32098-pipelines-navigation.yml deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
changelogs/unreleased/33609-hide-pagination.yml 0 → 100644
View file @ 17853757
This diff is collapsed.
changelogs/unreleased/34534-switch-to-axios.yml 0 → 100644
View file @ 17853757
This diff is collapsed.
changelogs/unreleased/34600-performance-wiki-pages.yml deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
changelogs/unreleased/35724-animate-sidebar.yml deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
changelogs/unreleased/36400-trigger-job.yml deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
changelogs/unreleased/40274-user-settings-breadcrumbs.yml 0 → 100644
View file @ 17853757
This diff is collapsed.
changelogs/unreleased/40481-bump-jquery-to-2-2-4.yml deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
changelogs/unreleased/40533-groups-tree-updates.yml 0 → 100644
View file @ 17853757
This diff is collapsed.
changelogs/unreleased/40568-bump-seed-fu-to-2-3-7.yml deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
changelogs/unreleased/40770-doc-elasticsearch.yml deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
changelogs/unreleased/41268-bump-ruby-to-2-3-6.yml 0 → 100644
View file @ 17853757
This diff is collapsed.
changelogs/unreleased/admin-welcome-new-group-link.yml deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
changelogs/unreleased/an-gitaly-timeouts.yml deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
changelogs/unreleased/brand_header_change.yml deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
changelogs/unreleased/bvl-circuitbreaker-process.yml deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
changelogs/unreleased/bvl-subgroup-in-dropdowns.yml deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
changelogs/unreleased/commit-title-wrapping.yml deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
changelogs/unreleased/deploy-keys-loading-icon.yml deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
changelogs/unreleased/dm-image-blob-diff-full-url.yml deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
changelogs/unreleased/dm-ldap-email-readonly.yml deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
changelogs/unreleased/dm-search-pattern.yml deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
changelogs/unreleased/feature_add_mermaid.yml deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
changelogs/unreleased/fix-abuse-reports-link-url.yml 0 → 100644
View file @ 17853757
This diff is collapsed.
changelogs/unreleased/fix-filter-by-my-reaction.yml deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
changelogs/unreleased/fix-last-push-event-widget-layout.yml 0 → 100644
View file @ 17853757
This diff is collapsed.
changelogs/unreleased/fix-move-2fa-disable-button.yml 0 → 100644
View file @ 17853757
This diff is collapsed.
changelogs/unreleased/fix-profile-settings-content-width.yml 0 → 100644
View file @ 17853757
This diff is collapsed.
changelogs/unreleased/fix-profile-settings-sidebar-heading.yml 0 → 100644
View file @ 17853757
This diff is collapsed.
changelogs/unreleased/fix-todos-last-page.yml deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
changelogs/unreleased/fj-40053-error-500-members-list.yml 0 → 100644
View file @ 17853757
This diff is collapsed.
changelogs/unreleased/improved-changes-dropdown.yml deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
changelogs/unreleased/issue_39238.yml deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
changelogs/unreleased/jramsay-4012-i18n-compare.yml 0 → 100644
View file @ 17853757
This diff is collapsed.
changelogs/unreleased/jramsay-41590-add-readme-case.yml 0 → 100644
View file @ 17853757
This diff is collapsed.
changelogs/unreleased/mk-add-user-rate-limits.yml deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
changelogs/unreleased/patch-24.yml deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
changelogs/unreleased/perform-sql-matching-of-tags.yml deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
changelogs/unreleased/sh-optimize-commit-stats.yml 0 → 100644
View file @ 17853757
This diff is collapsed.
changelogs/unreleased/skip_confirmation_user_API.yml deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
changelogs/unreleased/text-utils.yml deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
changelogs/unreleased/update-merge-worker-metrics.yml deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
changelogs/unreleased/update_mr_changes_empty_page.yml deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
changelogs/unreleased/use-count_commits-directly.yml deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
changelogs/unreleased/user-agent-gke-api.yml deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
changelogs/unreleased/winh-subgroups-api.yml deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
changelogs/unreleased/zj-commit-show-n-1.yml deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
changelogs/unreleased/zj-empty-repo-importer.yml deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
config.ru
View file @ 17853757
This diff is collapsed.
config/initializers/asset_sync.rb
View file @ 17853757
This diff is collapsed.
config/initializers/peek.rb
View file @ 17853757
This diff is collapsed.
config/routes/project.rb
View file @ 17853757
This diff is collapsed.
config/webpack.config.js
View file @ 17853757
This diff is collapsed.
db/fixtures/development/06_teams.rb
View file @ 17853757
This diff is collapsed.
db/migrate/20171019141859_fix_dev_timezone_schema.rb 0 → 100644
View file @ 17853757
This diff is collapsed.
db/migrate/20171216111734_clean_up_for_members.rb 0 → 100644
View file @ 17853757
This diff is collapsed.
db/migrate/20171216112339_add_foreign_key_for_members.rb 0 → 100644
View file @ 17853757
This diff is collapsed.
db/schema.rb
View file @ 17853757
This diff is collapsed.
doc/administration/auth/ldap.md
View file @ 17853757
This diff is collapsed.
doc/administration/integration/plantuml.md
View file @ 17853757
This diff is collapsed.
doc/api/services.md
View file @ 17853757
This diff is collapsed.
doc/articles/index.md
View file @ 17853757
This diff is collapsed.
doc/ci/README.md
View file @ 17853757
This diff is collapsed.
doc/ci/examples/README.md
View file @ 17853757
This diff is collapsed.
doc/ci/examples/artifactory_and_gitlab/index.md 0 → 100644
View file @ 17853757
This diff is collapsed.
doc/ci/examples/code_climate.md
View file @ 17853757
This diff is collapsed.
doc/development/README.md
View file @ 17853757
This diff is collapsed.
doc/development/utilities.md 0 → 100644
View file @ 17853757
This diff is collapsed.
doc/development/ux_guide/img/james-mackey.png
View file @ 17853757
This diff is collapsed.
doc/development/ux_guide/img/matthieu-poirier.png 0 → 100644
View file @ 17853757
This diff is collapsed.
doc/development/ux_guide/img/nazim-ramesh.png
View file @ 17853757
This diff is collapsed.
doc/development/ux_guide/users.md
View file @ 17853757
This diff is collapsed.
doc/development/what_requires_downtime.md
View file @ 17853757
This diff is collapsed.
doc/install/installation.md
View file @ 17853757
This diff is collapsed.
doc/install/kubernetes/index.md
View file @ 17853757
This diff is collapsed.
doc/topics/authentication/index.md
View file @ 17853757
This diff is collapsed.
doc/topics/autodevops/img/auto_devops_settings.png deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
doc/topics/autodevops/index.md
View file @ 17853757
This diff is collapsed.
doc/update/10.1-to-10.2.md
View file @ 17853757
This diff is collapsed.
doc/update/10.2-to-10.3.md
View file @ 17853757
This diff is collapsed.
doc/update/10.3-to-10.4.md 0 → 100644
View file @ 17853757
This diff is collapsed.
doc/user/group/img/transfer_project_to_other_group.png deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
doc/user/group/index.md
View file @ 17853757
This diff is collapsed.
doc/user/profile/index.md
View file @ 17853757
This diff is collapsed.
doc/user/project/clusters/index.md
View file @ 17853757
This diff is collapsed.
doc/user/project/index.md
View file @ 17853757
This diff is collapsed.
doc/user/project/integrations/jira.md
View file @ 17853757
This diff is collapsed.
doc/user/project/integrations/kubernetes.md
View file @ 17853757
This diff is collapsed.
doc/user/project/quick_actions.md
View file @ 17853757
This diff is collapsed.
doc/user/project/settings/index.md
View file @ 17853757
This diff is collapsed.
features/steps/profile/profile.rb
View file @ 17853757
This diff is collapsed.
features/steps/project/deploy_keys.rb
View file @ 17853757
This diff is collapsed.
features/steps/project/fork.rb
View file @ 17853757
This diff is collapsed.
features/steps/shared/group.rb
View file @ 17853757
This diff is collapsed.
features/steps/shared/project.rb
View file @ 17853757
This diff is collapsed.
features/support/capybara.rb
View file @ 17853757
This diff is collapsed.
lib/after_commit_queue.rb
View file @ 17853757
This diff is collapsed.
lib/api/entities.rb
View file @ 17853757
This diff is collapsed.
lib/api/helpers.rb
View file @ 17853757
This diff is collapsed.
lib/api/internal.rb
View file @ 17853757
This diff is collapsed.
lib/api/members.rb
View file @ 17853757
This diff is collapsed.
lib/api/services.rb
View file @ 17853757
This diff is collapsed.
lib/backup/files.rb
View file @ 17853757
This diff is collapsed.
lib/banzai/filter/relative_link_filter.rb
View file @ 17853757
This diff is collapsed.
lib/banzai/filter/upload_link_filter.rb deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
lib/banzai/pipeline/gfm_pipeline.rb
View file @ 17853757
This diff is collapsed.
lib/gitlab/background_migration/copy_column.rb 0 → 100644
View file @ 17853757
This diff is collapsed.
lib/gitlab/checks/project_moved.rb
View file @ 17853757
This diff is collapsed.
lib/gitlab/ci/ansi2html.rb
View file @ 17853757
This diff is collapsed.
lib/gitlab/ci/config/entry/node.rb
View file @ 17853757
This diff is collapsed.
lib/gitlab/conflict/file_collection.rb
View file @ 17853757
This diff is collapsed.
lib/gitlab/database/migration_helpers.rb
View file @ 17853757
This diff is collapsed.
lib/gitlab/diff/file.rb
View file @ 17853757
This diff is collapsed.
lib/gitlab/encoding_helper.rb
View file @ 17853757
This diff is collapsed.
lib/gitlab/git/commit_stats.rb
View file @ 17853757
This diff is collapsed.
lib/gitlab/git/conflict/file.rb
View file @ 17853757
This diff is collapsed.
lib/gitlab/git/conflict/resolution.rb 0 → 100644
View file @ 17853757
This diff is collapsed.
lib/gitlab/git/conflict/resolver.rb
View file @ 17853757
This diff is collapsed.
lib/gitlab/git/gitlab_projects.rb
View file @ 17853757
This diff is collapsed.
lib/gitlab/git/remote_mirror.rb 0 → 100644
View file @ 17853757
This diff is collapsed.
lib/gitlab/git/repository.rb
View file @ 17853757
This diff is collapsed.
lib/gitlab/gitaly_client.rb
View file @ 17853757
This diff is collapsed.
lib/gitlab/gitaly_client/commit_service.rb
View file @ 17853757
This diff is collapsed.
lib/gitlab/gitaly_client/conflicts_service.rb 0 → 100644
View file @ 17853757
This diff is collapsed.
lib/gitlab/gitaly_client/ref_service.rb
View file @ 17853757
This diff is collapsed.
lib/gitlab/gitaly_client/remote_service.rb 0 → 100644
View file @ 17853757
This diff is collapsed.
lib/gitlab/gitaly_client/util.rb
View file @ 17853757
This diff is collapsed.
lib/gitlab/gitaly_client/wiki_service.rb
View file @ 17853757
This diff is collapsed.
lib/gitlab/gon_helper.rb
View file @ 17853757
This diff is collapsed.
lib/gitlab/import_sources.rb
View file @ 17853757
This diff is collapsed.
lib/gitlab/kubernetes/helm.rb
View file @ 17853757
This diff is collapsed.
lib/gitlab/kubernetes/helm/api.rb 0 → 100644
View file @ 17853757
This diff is collapsed.
lib/gitlab/kubernetes/helm/install_command.rb 0 → 100644
View file @ 17853757
This diff is collapsed.
lib/gitlab/kubernetes/helm/pod.rb 0 → 100644
View file @ 17853757
This diff is collapsed.
lib/gitlab/metrics/method_call.rb
View file @ 17853757
This diff is collapsed.
lib/gitlab/search_results.rb
View file @ 17853757
This diff is collapsed.
lib/gitlab/seeder.rb
View file @ 17853757
This diff is collapsed.
lib/gitlab/shell.rb
View file @ 17853757
This diff is collapsed.
lib/gitlab/visibility_level.rb
View file @ 17853757
This diff is collapsed.
lib/tasks/migrate/setup_postgresql.rake
View file @ 17853757
This diff is collapsed.
package.json
View file @ 17853757
This diff is collapsed.
qa/qa.rb
View file @ 17853757
This diff is collapsed.
qa/qa/factory/resource/deploy_key.rb 0 → 100644
View file @ 17853757
This diff is collapsed.
qa/qa/factory/resource/sandbox.rb
View file @ 17853757
This diff is collapsed.
qa/qa/factory/settings/hashed_storage.rb
View file @ 17853757
This diff is collapsed.
qa/qa/git/repository.rb
View file @ 17853757
This diff is collapsed.
qa/qa/page/menu/side.rb 0 → 100644
View file @ 17853757
This diff is collapsed.
qa/qa/page/project/settings/common.rb 0 → 100644
View file @ 17853757
This diff is collapsed.
qa/qa/page/project/settings/deploy_keys.rb 0 → 100644
View file @ 17853757
This diff is collapsed.
qa/qa/page/project/settings/repository.rb 0 → 100644
View file @ 17853757
This diff is collapsed.
qa/qa/runtime/user.rb
View file @ 17853757
This diff is collapsed.
qa/qa/specs/features/login/standard_spec.rb
View file @ 17853757
This diff is collapsed.
qa/qa/specs/features/project/add_deploy_key_spec.rb 0 → 100644
View file @ 17853757
This diff is collapsed.
rubocop/cop/active_record_dependent.rb deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
rubocop/cop/active_record_serialize.rb deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
rubocop/cop/custom_error_class.rb deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
rubocop/cop/gem_fetcher.rb deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
rubocop/cop/in_batches.rb deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
rubocop/cop/include_sidekiq_worker.rb
View file @ 17853757
This diff is collapsed.
rubocop/cop/line_break_after_guard_clauses.rb deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
rubocop/cop/migration/add_column.rb
View file @ 17853757
This diff is collapsed.
rubocop/cop/migration/add_index.rb
View file @ 17853757
This diff is collapsed.
rubocop/cop/migration/add_timestamps.rb
View file @ 17853757
This diff is collapsed.
rubocop/cop/migration/datetime.rb
View file @ 17853757
This diff is collapsed.
rubocop/cop/migration/hash_index.rb
View file @ 17853757
This diff is collapsed.
rubocop/cop/migration/remove_column.rb
View file @ 17853757
This diff is collapsed.
rubocop/cop/migration/remove_index.rb
View file @ 17853757
This diff is collapsed.
rubocop/cop/migration/timestamps.rb
View file @ 17853757
This diff is collapsed.
rubocop/cop/migration/update_large_table.rb
View file @ 17853757
This diff is collapsed.
rubocop/cop/polymorphic_associations.rb deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
rubocop/cop/project_path_helper.rb
View file @ 17853757
This diff is collapsed.
rubocop/cop/redirect_with_status.rb deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
rubocop/cop/rspec/env_assignment.rb
View file @ 17853757
This diff is collapsed.
rubocop/cop/rspec/single_line_hook.rb deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
rubocop/cop/rspec/verbose_include_metadata.rb deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
rubocop/cop/sidekiq_options_queue.rb
View file @ 17853757
This diff is collapsed.
rubocop/model_helpers.rb deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
rubocop/rubocop.rb
View file @ 17853757
This diff is collapsed.
scripts/add-code-formatters 0 → 100755
View file @ 17853757
This diff is collapsed.
scripts/create_mysql_user.sh
View file @ 17853757
This diff is collapsed.
scripts/lint-changelog-yaml
View file @ 17853757
This diff is collapsed.
scripts/pre-commit 0 → 100644
View file @ 17853757
This diff is collapsed.
scripts/static-analysis
View file @ 17853757
This diff is collapsed.
spec/controllers/uploads_controller_spec.rb
View file @ 17853757
This diff is collapsed.
spec/controllers/users_controller_spec.rb
View file @ 17853757
This diff is collapsed.
spec/factories/clusters/applications/ingress.rb deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
spec/factories/issues.rb
View file @ 17853757
This diff is collapsed.
spec/factories/keys.rb
View file @ 17853757
This diff is collapsed.
spec/factories/services.rb
View file @ 17853757
This diff is collapsed.
spec/features/admin/admin_projects_spec.rb
View file @ 17853757
This diff is collapsed.
spec/features/atom/dashboard_issues_spec.rb
View file @ 17853757
This diff is collapsed.
spec/features/atom/dashboard_spec.rb
View file @ 17853757
This diff is collapsed.
spec/features/atom/issues_spec.rb
View file @ 17853757
This diff is collapsed.
spec/features/atom/users_spec.rb
View file @ 17853757
This diff is collapsed.
spec/features/auto_deploy_spec.rb
View file @ 17853757
This diff is collapsed.
spec/features/boards/boards_spec.rb
View file @ 17853757
This diff is collapsed.
spec/features/boards/issue_ordering_spec.rb
View file @ 17853757
This diff is collapsed.
spec/features/boards/modal_filter_spec.rb
View file @ 17853757
This diff is collapsed.
spec/features/boards/new_issue_spec.rb
View file @ 17853757
This diff is collapsed.
spec/features/commits_spec.rb
View file @ 17853757
This diff is collapsed.
spec/features/cycle_analytics_spec.rb
View file @ 17853757
This diff is collapsed.
spec/features/dashboard/activity_spec.rb
View file @ 17853757
This diff is collapsed.
spec/features/dashboard/groups_list_spec.rb
View file @ 17853757
This diff is collapsed.
spec/features/dashboard/issues_spec.rb
View file @ 17853757
This diff is collapsed.
spec/features/dashboard/milestones_spec.rb
View file @ 17853757
This diff is collapsed.
spec/features/dashboard/projects_spec.rb
View file @ 17853757
This diff is collapsed.
spec/features/global_search_spec.rb
View file @ 17853757
This diff is collapsed.
spec/features/issues/award_emoji_spec.rb
View file @ 17853757
This diff is collapsed.
spec/features/issues/form_spec.rb
View file @ 17853757
This diff is collapsed.
spec/features/issues/issue_sidebar_spec.rb
View file @ 17853757
This diff is collapsed.
spec/features/issues/move_spec.rb
View file @ 17853757
This diff is collapsed.
spec/features/issues/spam_issues_spec.rb
View file @ 17853757
This diff is collapsed.
spec/features/issues/todo_spec.rb
View file @ 17853757
This diff is collapsed.
spec/features/issues/update_issues_spec.rb
View file @ 17853757
This diff is collapsed.
spec/features/issues_spec.rb
View file @ 17853757
This diff is collapsed.
spec/features/merge_requests/form_spec.rb
View file @ 17853757
This diff is collapsed.
spec/features/merge_requests/widget_spec.rb
View file @ 17853757
This diff is collapsed.
spec/features/milestone_spec.rb
View file @ 17853757
This diff is collapsed.
spec/features/password_reset_spec.rb
View file @ 17853757
This diff is collapsed.
spec/features/profiles/keys_spec.rb
View file @ 17853757
This diff is collapsed.
spec/features/projects/activity/rss_spec.rb
View file @ 17853757
This diff is collapsed.
spec/features/projects/badges/list_spec.rb
View file @ 17853757
This diff is collapsed.
spec/features/projects/blobs/edit_spec.rb
View file @ 17853757
This diff is collapsed.
spec/features/projects/branches_spec.rb
View file @ 17853757
This diff is collapsed.
spec/features/projects/commits/rss_spec.rb
View file @ 17853757
This diff is collapsed.
spec/features/projects/compare_spec.rb
View file @ 17853757
This diff is collapsed.
spec/features/projects/deploy_keys_spec.rb
View file @ 17853757
This diff is collapsed.
spec/features/projects/edit_spec.rb
View file @ 17853757
This diff is collapsed.
spec/features/projects/issues/rss_spec.rb
View file @ 17853757
This diff is collapsed.
spec/features/projects/jobs_spec.rb
View file @ 17853757
This diff is collapsed.
spec/features/projects/main/rss_spec.rb
View file @ 17853757
This diff is collapsed.
spec/features/projects/pages_spec.rb
View file @ 17853757
This diff is collapsed.
spec/features/projects/tree/rss_spec.rb
View file @ 17853757
This diff is collapsed.
spec/features/projects_spec.rb
View file @ 17853757
This diff is collapsed.
spec/features/runners_spec.rb
View file @ 17853757
This diff is collapsed.
spec/features/signed_commits_spec.rb
View file @ 17853757
This diff is collapsed.
spec/features/triggers_spec.rb
View file @ 17853757
This diff is collapsed.
spec/features/u2f_spec.rb
View file @ 17853757
This diff is collapsed.
spec/features/variables_spec.rb
View file @ 17853757
This diff is collapsed.
spec/finders/access_requests_finder_spec.rb
View file @ 17853757
This diff is collapsed.
spec/finders/group_projects_finder_spec.rb
View file @ 17853757
This diff is collapsed.
spec/finders/issues_finder_spec.rb
View file @ 17853757
This diff is collapsed.
spec/finders/labels_finder_spec.rb
View file @ 17853757
This diff is collapsed.
spec/finders/merge_requests_finder_spec.rb
View file @ 17853757
This diff is collapsed.
spec/finders/move_to_project_finder_spec.rb
View file @ 17853757
This diff is collapsed.
spec/finders/notes_finder_spec.rb
View file @ 17853757
This diff is collapsed.
spec/finders/snippets_finder_spec.rb
View file @ 17853757
This diff is collapsed.
spec/finders/todos_finder_spec.rb
View file @ 17853757
This diff is collapsed.
spec/fixtures/api/schemas/entities/merge_request_metrics.json 0 → 100644
View file @ 17853757
This diff is collapsed.
spec/fixtures/api/schemas/entities/user.json 0 → 100644
View file @ 17853757
This diff is collapsed.
spec/helpers/markup_helper_spec.rb
View file @ 17853757
This diff is collapsed.
spec/helpers/notes_helper_spec.rb
View file @ 17853757
This diff is collapsed.
spec/javascripts/boards/board_card_spec.js
View file @ 17853757
This diff is collapsed.
spec/javascripts/boards/board_list_spec.js
View file @ 17853757
This diff is collapsed.
spec/javascripts/boards/issue_card_spec.js
View file @ 17853757
This diff is collapsed.
spec/javascripts/boards/issue_spec.js
View file @ 17853757
This diff is collapsed.
spec/javascripts/boards/list_spec.js
View file @ 17853757
This diff is collapsed.
spec/javascripts/boards/mock_data.js
View file @ 17853757
This diff is collapsed.
spec/javascripts/groups/components/item_stats_value_spec.js 0 → 100644
View file @ 17853757
This diff is collapsed.
spec/javascripts/groups/mock_data.js
View file @ 17853757
This diff is collapsed.
spec/javascripts/issue_show/mock_data.js
View file @ 17853757
This diff is collapsed.
spec/javascripts/job_spec.js
View file @ 17853757
This diff is collapsed.
spec/javascripts/monitoring/mock_data.js
View file @ 17853757
This diff is collapsed.
spec/javascripts/vue_mr_widget/mock_data.js
View file @ 17853757
This diff is collapsed.
spec/javascripts/vue_shared/components/file_icon_spec.js 0 → 100644
View file @ 17853757
This diff is collapsed.
spec/javascripts/vue_shared/components/panel_resizer_spec.js 0 → 100644
View file @ 17853757
This diff is collapsed.
spec/lib/banzai/filter/upload_link_filter_spec.rb deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
spec/lib/gitlab/ci/ansi2html_spec.rb
View file @ 17853757
This diff is collapsed.
spec/lib/gitlab/diff/file_spec.rb
View file @ 17853757
This diff is collapsed.
spec/lib/gitlab/encoding_helper_spec.rb
View file @ 17853757
This diff is collapsed.
spec/lib/gitlab/git/commit_spec.rb
View file @ 17853757
This diff is collapsed.
spec/lib/gitlab/git/gitlab_projects_spec.rb
View file @ 17853757
This diff is collapsed.
spec/lib/gitlab/git/repository_spec.rb
View file @ 17853757
This diff is collapsed.
spec/lib/gitlab/git_access_spec.rb
View file @ 17853757
This diff is collapsed.
spec/lib/gitlab/git_access_wiki_spec.rb
View file @ 17853757
This diff is collapsed.
spec/lib/gitlab/gitaly_client/conflicts_service_spec.rb 0 → 100644
View file @ 17853757
This diff is collapsed.
spec/lib/gitlab/gitaly_client/remote_service_spec.rb 0 → 100644
View file @ 17853757
This diff is collapsed.
spec/lib/gitlab/gitaly_client_spec.rb
View file @ 17853757
This diff is collapsed.
spec/lib/gitlab/kubernetes/helm/install_command_spec.rb 0 → 100644
View file @ 17853757
This diff is collapsed.
spec/lib/gitlab/kubernetes/helm/pod_spec.rb 0 → 100644
View file @ 17853757
This diff is collapsed.
spec/lib/gitlab/reference_extractor_spec.rb
View file @ 17853757
This diff is collapsed.
spec/lib/gitlab/search_results_spec.rb
View file @ 17853757
This diff is collapsed.
spec/lib/gitlab/shell_spec.rb
View file @ 17853757
This diff is collapsed.
spec/lib/gitlab/user_access_spec.rb
View file @ 17853757
This diff is collapsed.
spec/lib/gitlab/visibility_level_spec.rb
View file @ 17853757
This diff is collapsed.
spec/mailers/notify_spec.rb
View file @ 17853757
This diff is collapsed.
spec/migrations/clean_up_for_members_spec.rb 0 → 100644
View file @ 17853757
This diff is collapsed.
spec/migrations/issues_moved_to_id_foreign_key_spec.rb 0 → 100644
View file @ 17853757
This diff is collapsed.
spec/models/ability_spec.rb
View file @ 17853757
This diff is collapsed.
spec/models/ci/pipeline_spec.rb
View file @ 17853757
This diff is collapsed.
spec/models/ci/trigger_spec.rb
View file @ 17853757
This diff is collapsed.
spec/models/clusters/applications/prometheus_spec.rb 0 → 100644
View file @ 17853757
This diff is collapsed.
spec/models/clusters/cluster_spec.rb
View file @ 17853757
This diff is collapsed.
spec/models/commit_spec.rb
View file @ 17853757
This diff is collapsed.
spec/models/concerns/mentionable_spec.rb
View file @ 17853757
This diff is collapsed.
spec/models/concerns/milestoneish_spec.rb
View file @ 17853757
This diff is collapsed.
spec/models/diff_discussion_spec.rb
View file @ 17853757
This diff is collapsed.
spec/models/diff_note_spec.rb
View file @ 17853757
This diff is collapsed.
spec/models/event_spec.rb
View file @ 17853757
This diff is collapsed.
spec/models/generic_commit_status_spec.rb
View file @ 17853757
This diff is collapsed.
spec/models/hooks/system_hook_spec.rb
View file @ 17853757
This diff is collapsed.
spec/models/issue_collection_spec.rb
View file @ 17853757
This diff is collapsed.
spec/models/issue_spec.rb
View file @ 17853757
This diff is collapsed.
spec/models/member_spec.rb
View file @ 17853757
This diff is collapsed.
spec/models/members/project_member_spec.rb
View file @ 17853757
This diff is collapsed.
spec/models/merge_request/metrics_spec.rb
View file @ 17853757
This diff is collapsed.
spec/models/merge_request_spec.rb
View file @ 17853757
This diff is collapsed.
spec/models/namespace_spec.rb
View file @ 17853757
This diff is collapsed.
spec/models/note_spec.rb
View file @ 17853757
This diff is collapsed.
spec/models/project_feature_spec.rb
View file @ 17853757
This diff is collapsed.
spec/models/project_spec.rb
View file @ 17853757
This diff is collapsed.
spec/models/project_team_spec.rb
View file @ 17853757
This diff is collapsed.
spec/models/service_spec.rb
View file @ 17853757
This diff is collapsed.
spec/models/user_spec.rb
View file @ 17853757
This diff is collapsed.
spec/policies/ci/build_policy_spec.rb
View file @ 17853757
This diff is collapsed.
spec/policies/ci/trigger_policy_spec.rb
View file @ 17853757
This diff is collapsed.
spec/policies/issue_policy_spec.rb
View file @ 17853757
This diff is collapsed.
spec/requests/api/access_requests_spec.rb
View file @ 17853757
This diff is collapsed.
spec/requests/api/award_emoji_spec.rb
View file @ 17853757
This diff is collapsed.
spec/requests/api/boards_spec.rb
View file @ 17853757
This diff is collapsed.
spec/requests/api/deployments_spec.rb
View file @ 17853757
This diff is collapsed.
spec/requests/api/environments_spec.rb
View file @ 17853757
This diff is collapsed.
spec/requests/api/files_spec.rb
View file @ 17853757
This diff is collapsed.
spec/requests/api/groups_spec.rb
View file @ 17853757
This diff is collapsed.
spec/requests/api/internal_spec.rb
View file @ 17853757
This diff is collapsed.
spec/requests/api/issues_spec.rb
View file @ 17853757
This diff is collapsed.
spec/requests/api/jobs_spec.rb
View file @ 17853757
This diff is collapsed.
spec/requests/api/labels_spec.rb
View file @ 17853757
This diff is collapsed.
spec/requests/api/members_spec.rb
View file @ 17853757
This diff is collapsed.
spec/requests/api/merge_requests_spec.rb
View file @ 17853757
This diff is collapsed.
spec/requests/api/notes_spec.rb
View file @ 17853757
This diff is collapsed.
spec/requests/api/pipelines_spec.rb
View file @ 17853757
This diff is collapsed.
spec/requests/api/project_hooks_spec.rb
View file @ 17853757
This diff is collapsed.
spec/requests/api/projects_spec.rb
View file @ 17853757
This diff is collapsed.
spec/requests/api/services_spec.rb
View file @ 17853757
This diff is collapsed.
spec/requests/api/todos_spec.rb
View file @ 17853757
This diff is collapsed.
spec/requests/api/v3/award_emoji_spec.rb
View file @ 17853757
This diff is collapsed.
spec/requests/api/v3/boards_spec.rb
View file @ 17853757
This diff is collapsed.
spec/requests/api/v3/commits_spec.rb
View file @ 17853757
This diff is collapsed.
spec/requests/api/v3/deployments_spec.rb
View file @ 17853757
This diff is collapsed.
spec/requests/api/v3/environments_spec.rb
View file @ 17853757
This diff is collapsed.
spec/requests/api/v3/files_spec.rb
View file @ 17853757
This diff is collapsed.
spec/requests/api/v3/groups_spec.rb
View file @ 17853757
This diff is collapsed.
spec/requests/api/v3/issues_spec.rb
View file @ 17853757
This diff is collapsed.
spec/requests/api/v3/labels_spec.rb
View file @ 17853757
This diff is collapsed.
spec/requests/api/v3/members_spec.rb
View file @ 17853757
This diff is collapsed.
spec/requests/api/v3/merge_requests_spec.rb
View file @ 17853757
This diff is collapsed.
spec/requests/api/v3/milestones_spec.rb
View file @ 17853757
This diff is collapsed.
spec/requests/api/v3/notes_spec.rb
View file @ 17853757
This diff is collapsed.
spec/requests/api/v3/pipelines_spec.rb
View file @ 17853757
This diff is collapsed.
spec/requests/api/v3/project_hooks_spec.rb
View file @ 17853757
This diff is collapsed.
spec/requests/api/v3/projects_spec.rb
View file @ 17853757
This diff is collapsed.
spec/requests/api/v3/services_spec.rb
View file @ 17853757
This diff is collapsed.
spec/requests/api/v3/todos_spec.rb
View file @ 17853757
This diff is collapsed.
spec/requests/api/wikis_spec.rb
View file @ 17853757
This diff is collapsed.
spec/requests/git_http_spec.rb
View file @ 17853757
This diff is collapsed.
spec/requests/lfs_http_spec.rb
View file @ 17853757
This diff is collapsed.
spec/rubocop/cop/active_record_dependent_spec.rb deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
spec/rubocop/cop/active_record_serialize_spec.rb deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
spec/rubocop/cop/custom_error_class_spec.rb deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
spec/rubocop/cop/gem_fetcher_spec.rb deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
spec/rubocop/cop/in_batches_spec.rb deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
spec/rubocop/cop/migration/datetime_spec.rb
View file @ 17853757
This diff is collapsed.
spec/rubocop/cop/polymorphic_associations_spec.rb deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
spec/rubocop/cop/redirect_with_status_spec.rb deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
spec/rubocop/cop/rspec/single_line_hook_spec.rb deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
spec/serializers/event_entity_spec.rb deleted 100644 → 0
View file @ 92a72ce4
This diff is collapsed.
spec/services/delete_branch_service_spec.rb
View file @ 17853757
This diff is collapsed.
spec/services/files/delete_service_spec.rb
View file @ 17853757
This diff is collapsed.
spec/services/files/multi_service_spec.rb
View file @ 17853757
This diff is collapsed.
spec/services/files/update_service_spec.rb
View file @ 17853757
This diff is collapsed.
spec/services/git_push_service_spec.rb
View file @ 17853757
This diff is collapsed.
spec/services/git_tag_push_service_spec.rb
View file @ 17853757
This diff is collapsed.
spec/services/issues/build_service_spec.rb
View file @ 17853757
This diff is collapsed.
spec/services/issues/close_service_spec.rb
View file @ 17853757
This diff is collapsed.
spec/services/issues/create_service_spec.rb
View file @ 17853757
This diff is collapsed.
spec/services/issues/move_service_spec.rb
View file @ 17853757
This diff is collapsed.
spec/services/issues/reopen_service_spec.rb
View file @ 17853757
This diff is collapsed.
spec/services/issues/update_service_spec.rb
View file @ 17853757
This diff is collapsed.
spec/services/notes/create_service_spec.rb
View file @ 17853757
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