Update upstream source from tag 'upstream/10.7.3+dfsg'
Update to upstream version '10.7.3+dfsg'
with Debian dir 9760eb3097
This commit is contained in:
Pirate Praveen
commit
77c78a3f93
2200 changed files with 89163 additions and 28549 deletions
26
.babelrc
26
.babelrc
|
|
@ -1,20 +1,20 @@
|
||||||
{
|
{
|
||||||
"presets": [
|
"presets": [["latest", { "es2015": { "modules": false } }], "stage-2"],
|
||||||
["latest", { "es2015": { "modules": false } }],
|
|
||||||
"stage-2"
|
|
||||||
],
|
|
||||||
"env": {
|
"env": {
|
||||||
"coverage": {
|
"coverage": {
|
||||||
"plugins": [
|
"plugins": [
|
||||||
["istanbul", {
|
[
|
||||||
"exclude": [
|
"istanbul",
|
||||||
"spec/javascripts/**/*",
|
{
|
||||||
"app/assets/javascripts/locale/**/app.js"
|
"exclude": ["spec/javascripts/**/*", "app/assets/javascripts/locale/**/app.js"]
|
||||||
]
|
}
|
||||||
}],
|
],
|
||||||
["transform-define", {
|
[
|
||||||
"process.env.BABEL_ENV": "coverage"
|
"transform-define",
|
||||||
}]
|
{
|
||||||
|
"process.env.BABEL_ENV": "coverage"
|
||||||
|
}
|
||||||
|
]
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -10,12 +10,6 @@ engines:
|
||||||
- javascript
|
- javascript
|
||||||
exclude_paths:
|
exclude_paths:
|
||||||
- "lib/api/v3/*"
|
- "lib/api/v3/*"
|
||||||
eslint:
|
|
||||||
enabled: true
|
|
||||||
channel: "eslint-4"
|
|
||||||
rubocop:
|
|
||||||
enabled: true
|
|
||||||
channel: "gitlab-rubocop-0-52-1"
|
|
||||||
ratings:
|
ratings:
|
||||||
paths:
|
paths:
|
||||||
- Gemfile.lock
|
- Gemfile.lock
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,12 @@
|
||||||
|
/app/assets/javascripts/locale/**/app.js
|
||||||
|
/config/
|
||||||
/builds/
|
/builds/
|
||||||
/coverage/
|
/coverage/
|
||||||
/coverage-javascript/
|
/coverage-javascript/
|
||||||
/node_modules/
|
/node_modules/
|
||||||
/public/
|
/public/
|
||||||
|
/scripts/
|
||||||
/tmp/
|
/tmp/
|
||||||
/vendor/
|
/vendor/
|
||||||
karma.config.js
|
karma.config.js
|
||||||
webpack.config.js
|
webpack.config.js
|
||||||
svg.config.js
|
|
||||||
/app/assets/javascripts/locale/**/app.js
|
|
||||||
|
|
|
||||||
28
.eslintrc
28
.eslintrc
|
|
@ -1,6 +1,5 @@
|
||||||
{
|
{
|
||||||
"env": {
|
"env": {
|
||||||
"jquery": true,
|
|
||||||
"browser": true,
|
"browser": true,
|
||||||
"es6": true
|
"es6": true
|
||||||
},
|
},
|
||||||
|
|
@ -36,15 +35,22 @@
|
||||||
"import/no-commonjs": "error",
|
"import/no-commonjs": "error",
|
||||||
"no-multiple-empty-lines": ["error", { "max": 1 }],
|
"no-multiple-empty-lines": ["error", { "max": 1 }],
|
||||||
"promise/catch-or-return": "error",
|
"promise/catch-or-return": "error",
|
||||||
"no-underscore-dangle": ["error", { "allow": ["__", "_links"]}],
|
"no-underscore-dangle": ["error", { "allow": ["__", "_links"] }],
|
||||||
"vue/html-self-closing": ["error", {
|
"no-mixed-operators": 0,
|
||||||
"html": {
|
"space-before-function-paren": 0,
|
||||||
"void": "always",
|
"curly": 0,
|
||||||
"normal": "never",
|
"arrow-parens": 0,
|
||||||
"component": "always"
|
"vue/html-self-closing": [
|
||||||
},
|
"error",
|
||||||
"svg": "always",
|
{
|
||||||
"math": "always"
|
"html": {
|
||||||
}]
|
"void": "always",
|
||||||
|
"normal": "never",
|
||||||
|
"component": "always"
|
||||||
|
},
|
||||||
|
"svg": "always",
|
||||||
|
"math": "always"
|
||||||
|
}
|
||||||
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -8,3 +8,4 @@ lib/gitlab/redis/*.rb
|
||||||
lib/gitlab/gitaly_client/operation_service.rb
|
lib/gitlab/gitaly_client/operation_service.rb
|
||||||
lib/gitlab/background_migration/*
|
lib/gitlab/background_migration/*
|
||||||
app/models/project_services/kubernetes_service.rb
|
app/models/project_services/kubernetes_service.rb
|
||||||
|
lib/gitlab/workhorse.rb
|
||||||
|
|
|
||||||
5
.gitignore
vendored
5
.gitignore
vendored
|
|
@ -11,6 +11,7 @@
|
||||||
eslint-report.html
|
eslint-report.html
|
||||||
/.gitlab_shell_secret
|
/.gitlab_shell_secret
|
||||||
.idea
|
.idea
|
||||||
|
/.vscode/*
|
||||||
/.rbenv-version
|
/.rbenv-version
|
||||||
.rbx/
|
.rbx/
|
||||||
/.ruby-gemset
|
/.ruby-gemset
|
||||||
|
|
@ -22,6 +23,9 @@ eslint-report.html
|
||||||
/.yarn-cache
|
/.yarn-cache
|
||||||
/.byebug_history
|
/.byebug_history
|
||||||
/Vagrantfile
|
/Vagrantfile
|
||||||
|
/app/assets/images/icons.json
|
||||||
|
/app/assets/images/icons.svg
|
||||||
|
/app/assets/images/illustrations/
|
||||||
/app/assets/javascripts/locale/**/app.js
|
/app/assets/javascripts/locale/**/app.js
|
||||||
/backups/*
|
/backups/*
|
||||||
/config/aws.yml
|
/config/aws.yml
|
||||||
|
|
@ -46,6 +50,7 @@ eslint-report.html
|
||||||
/db/data.yml
|
/db/data.yml
|
||||||
/doc/code/*
|
/doc/code/*
|
||||||
/dump.rdb
|
/dump.rdb
|
||||||
|
/jsconfig.json
|
||||||
/log/*.log*
|
/log/*.log*
|
||||||
/node_modules/
|
/node_modules/
|
||||||
/nohup.out
|
/nohup.out
|
||||||
|
|
|
||||||
133
.gitlab-ci.yml
133
.gitlab-ci.yml
|
|
@ -78,6 +78,19 @@ stages:
|
||||||
- mysql:5.7
|
- mysql:5.7
|
||||||
- redis:alpine
|
- redis:alpine
|
||||||
|
|
||||||
|
.rails5-variables: &rails5-variables
|
||||||
|
script:
|
||||||
|
- export RAILS5=${RAILS5}
|
||||||
|
- export BUNDLE_GEMFILE=${BUNDLE_GEMFILE}
|
||||||
|
|
||||||
|
.rails5: &rails5
|
||||||
|
allow_failure: true
|
||||||
|
only:
|
||||||
|
- /rails5/
|
||||||
|
variables:
|
||||||
|
BUNDLE_GEMFILE: "Gemfile.rails5"
|
||||||
|
RAILS5: "true"
|
||||||
|
|
||||||
# Skip all jobs except the ones that begin with 'docs/'.
|
# Skip all jobs except the ones that begin with 'docs/'.
|
||||||
# Used for commits including ONLY documentation changes.
|
# Used for commits including ONLY documentation changes.
|
||||||
# https://docs.gitlab.com/ce/development/writing_documentation.html#testing
|
# https://docs.gitlab.com/ce/development/writing_documentation.html#testing
|
||||||
|
|
@ -118,6 +131,7 @@ stages:
|
||||||
<<: *dedicated-runner
|
<<: *dedicated-runner
|
||||||
<<: *except-docs-and-qa
|
<<: *except-docs-and-qa
|
||||||
<<: *pull-cache
|
<<: *pull-cache
|
||||||
|
<<: *rails5-variables
|
||||||
stage: test
|
stage: test
|
||||||
script:
|
script:
|
||||||
- JOB_NAME=( $CI_JOB_NAME )
|
- JOB_NAME=( $CI_JOB_NAME )
|
||||||
|
|
@ -148,14 +162,23 @@ stages:
|
||||||
<<: *rspec-metadata
|
<<: *rspec-metadata
|
||||||
<<: *use-pg
|
<<: *use-pg
|
||||||
|
|
||||||
|
.rspec-metadata-pg-rails5: &rspec-metadata-pg-rails5
|
||||||
|
<<: *rspec-metadata-pg
|
||||||
|
<<: *rails5
|
||||||
|
|
||||||
.rspec-metadata-mysql: &rspec-metadata-mysql
|
.rspec-metadata-mysql: &rspec-metadata-mysql
|
||||||
<<: *rspec-metadata
|
<<: *rspec-metadata
|
||||||
<<: *use-mysql
|
<<: *use-mysql
|
||||||
|
|
||||||
|
.rspec-metadata-mysql-rails5: &rspec-metadata-mysql-rails5
|
||||||
|
<<: *rspec-metadata-mysql
|
||||||
|
<<: *rails5
|
||||||
|
|
||||||
.spinach-metadata: &spinach-metadata
|
.spinach-metadata: &spinach-metadata
|
||||||
<<: *dedicated-runner
|
<<: *dedicated-runner
|
||||||
<<: *except-docs-and-qa
|
<<: *except-docs-and-qa
|
||||||
<<: *pull-cache
|
<<: *pull-cache
|
||||||
|
<<: *rails5-variables
|
||||||
stage: test
|
stage: test
|
||||||
script:
|
script:
|
||||||
- JOB_NAME=( $CI_JOB_NAME )
|
- JOB_NAME=( $CI_JOB_NAME )
|
||||||
|
|
@ -179,10 +202,18 @@ stages:
|
||||||
<<: *spinach-metadata
|
<<: *spinach-metadata
|
||||||
<<: *use-pg
|
<<: *use-pg
|
||||||
|
|
||||||
|
.spinach-metadata-pg-rails5: &spinach-metadata-pg-rails5
|
||||||
|
<<: *spinach-metadata-pg
|
||||||
|
<<: *rails5
|
||||||
|
|
||||||
.spinach-metadata-mysql: &spinach-metadata-mysql
|
.spinach-metadata-mysql: &spinach-metadata-mysql
|
||||||
<<: *spinach-metadata
|
<<: *spinach-metadata
|
||||||
<<: *use-mysql
|
<<: *use-mysql
|
||||||
|
|
||||||
|
.spinach-metadata-mysql-rails5: &spinach-metadata-mysql-rails5
|
||||||
|
<<: *spinach-metadata-mysql
|
||||||
|
<<: *rails5
|
||||||
|
|
||||||
.only-canonical-masters: &only-canonical-masters
|
.only-canonical-masters: &only-canonical-masters
|
||||||
only:
|
only:
|
||||||
- master@gitlab-org/gitlab-ce
|
- master@gitlab-org/gitlab-ce
|
||||||
|
|
@ -257,15 +288,25 @@ stages:
|
||||||
##
|
##
|
||||||
# Trigger a package build in omnibus-gitlab repository
|
# Trigger a package build in omnibus-gitlab repository
|
||||||
#
|
#
|
||||||
package-qa:
|
package-and-qa:
|
||||||
<<: *dedicated-runner
|
<<: *dedicated-runner
|
||||||
image: ruby:2.4-alpine
|
image: ruby:2.4-alpine
|
||||||
before_script: []
|
before_script: []
|
||||||
stage: build
|
stage: build
|
||||||
cache: {}
|
cache: {}
|
||||||
when: manual
|
when: manual
|
||||||
|
variables:
|
||||||
|
GIT_STRATEGY: none
|
||||||
|
retry: 0
|
||||||
|
before_script:
|
||||||
|
# We need to download the script rather than clone the repo since the
|
||||||
|
# package-and-qa job will not be able to run when the branch gets
|
||||||
|
# deleted (when merging the MR).
|
||||||
|
- apk add --update openssl
|
||||||
|
- wget https://gitlab.com/$CI_PROJECT_PATH/raw/$CI_COMMIT_SHA/scripts/trigger-build-omnibus
|
||||||
|
- chmod 755 trigger-build-omnibus
|
||||||
script:
|
script:
|
||||||
- scripts/trigger-build-omnibus
|
- ./trigger-build-omnibus
|
||||||
only:
|
only:
|
||||||
- //@gitlab-org/gitlab-ce
|
- //@gitlab-org/gitlab-ce
|
||||||
- //@gitlab-org/gitlab-ee
|
- //@gitlab-org/gitlab-ee
|
||||||
|
|
@ -458,6 +499,70 @@ spinach-pg 1 2: *spinach-metadata-pg
|
||||||
spinach-mysql 0 2: *spinach-metadata-mysql
|
spinach-mysql 0 2: *spinach-metadata-mysql
|
||||||
spinach-mysql 1 2: *spinach-metadata-mysql
|
spinach-mysql 1 2: *spinach-metadata-mysql
|
||||||
|
|
||||||
|
rspec-pg-rails5 0 28: *rspec-metadata-pg-rails5
|
||||||
|
rspec-pg-rails5 1 28: *rspec-metadata-pg-rails5
|
||||||
|
rspec-pg-rails5 2 28: *rspec-metadata-pg-rails5
|
||||||
|
rspec-pg-rails5 3 28: *rspec-metadata-pg-rails5
|
||||||
|
rspec-pg-rails5 4 28: *rspec-metadata-pg-rails5
|
||||||
|
rspec-pg-rails5 5 28: *rspec-metadata-pg-rails5
|
||||||
|
rspec-pg-rails5 6 28: *rspec-metadata-pg-rails5
|
||||||
|
rspec-pg-rails5 7 28: *rspec-metadata-pg-rails5
|
||||||
|
rspec-pg-rails5 8 28: *rspec-metadata-pg-rails5
|
||||||
|
rspec-pg-rails5 9 28: *rspec-metadata-pg-rails5
|
||||||
|
rspec-pg-rails5 10 28: *rspec-metadata-pg-rails5
|
||||||
|
rspec-pg-rails5 11 28: *rspec-metadata-pg-rails5
|
||||||
|
rspec-pg-rails5 12 28: *rspec-metadata-pg-rails5
|
||||||
|
rspec-pg-rails5 13 28: *rspec-metadata-pg-rails5
|
||||||
|
rspec-pg-rails5 14 28: *rspec-metadata-pg-rails5
|
||||||
|
rspec-pg-rails5 15 28: *rspec-metadata-pg-rails5
|
||||||
|
rspec-pg-rails5 16 28: *rspec-metadata-pg-rails5
|
||||||
|
rspec-pg-rails5 17 28: *rspec-metadata-pg-rails5
|
||||||
|
rspec-pg-rails5 18 28: *rspec-metadata-pg-rails5
|
||||||
|
rspec-pg-rails5 19 28: *rspec-metadata-pg-rails5
|
||||||
|
rspec-pg-rails5 20 28: *rspec-metadata-pg-rails5
|
||||||
|
rspec-pg-rails5 21 28: *rspec-metadata-pg-rails5
|
||||||
|
rspec-pg-rails5 22 28: *rspec-metadata-pg-rails5
|
||||||
|
rspec-pg-rails5 23 28: *rspec-metadata-pg-rails5
|
||||||
|
rspec-pg-rails5 24 28: *rspec-metadata-pg-rails5
|
||||||
|
rspec-pg-rails5 25 28: *rspec-metadata-pg-rails5
|
||||||
|
rspec-pg-rails5 26 28: *rspec-metadata-pg-rails5
|
||||||
|
rspec-pg-rails5 27 28: *rspec-metadata-pg-rails5
|
||||||
|
|
||||||
|
rspec-mysql-rails5 0 28: *rspec-metadata-mysql-rails5
|
||||||
|
rspec-mysql-rails5 1 28: *rspec-metadata-mysql-rails5
|
||||||
|
rspec-mysql-rails5 2 28: *rspec-metadata-mysql-rails5
|
||||||
|
rspec-mysql-rails5 3 28: *rspec-metadata-mysql-rails5
|
||||||
|
rspec-mysql-rails5 4 28: *rspec-metadata-mysql-rails5
|
||||||
|
rspec-mysql-rails5 5 28: *rspec-metadata-mysql-rails5
|
||||||
|
rspec-mysql-rails5 6 28: *rspec-metadata-mysql-rails5
|
||||||
|
rspec-mysql-rails5 7 28: *rspec-metadata-mysql-rails5
|
||||||
|
rspec-mysql-rails5 8 28: *rspec-metadata-mysql-rails5
|
||||||
|
rspec-mysql-rails5 9 28: *rspec-metadata-mysql-rails5
|
||||||
|
rspec-mysql-rails5 10 28: *rspec-metadata-mysql-rails5
|
||||||
|
rspec-mysql-rails5 11 28: *rspec-metadata-mysql-rails5
|
||||||
|
rspec-mysql-rails5 12 28: *rspec-metadata-mysql-rails5
|
||||||
|
rspec-mysql-rails5 13 28: *rspec-metadata-mysql-rails5
|
||||||
|
rspec-mysql-rails5 14 28: *rspec-metadata-mysql-rails5
|
||||||
|
rspec-mysql-rails5 15 28: *rspec-metadata-mysql-rails5
|
||||||
|
rspec-mysql-rails5 16 28: *rspec-metadata-mysql-rails5
|
||||||
|
rspec-mysql-rails5 17 28: *rspec-metadata-mysql-rails5
|
||||||
|
rspec-mysql-rails5 18 28: *rspec-metadata-mysql-rails5
|
||||||
|
rspec-mysql-rails5 19 28: *rspec-metadata-mysql-rails5
|
||||||
|
rspec-mysql-rails5 20 28: *rspec-metadata-mysql-rails5
|
||||||
|
rspec-mysql-rails5 21 28: *rspec-metadata-mysql-rails5
|
||||||
|
rspec-mysql-rails5 22 28: *rspec-metadata-mysql-rails5
|
||||||
|
rspec-mysql-rails5 23 28: *rspec-metadata-mysql-rails5
|
||||||
|
rspec-mysql-rails5 24 28: *rspec-metadata-mysql-rails5
|
||||||
|
rspec-mysql-rails5 25 28: *rspec-metadata-mysql-rails5
|
||||||
|
rspec-mysql-rails5 26 28: *rspec-metadata-mysql-rails5
|
||||||
|
rspec-mysql-rails5 27 28: *rspec-metadata-mysql-rails5
|
||||||
|
|
||||||
|
spinach-pg-rails5 0 2: *spinach-metadata-pg-rails5
|
||||||
|
spinach-pg-rails5 1 2: *spinach-metadata-pg-rails5
|
||||||
|
|
||||||
|
spinach-mysql-rails5 0 2: *spinach-metadata-mysql-rails5
|
||||||
|
spinach-mysql-rails5 1 2: *spinach-metadata-mysql-rails5
|
||||||
|
|
||||||
static-analysis:
|
static-analysis:
|
||||||
<<: *dedicated-no-docs-no-db-pull-cache-job
|
<<: *dedicated-no-docs-no-db-pull-cache-job
|
||||||
dependencies:
|
dependencies:
|
||||||
|
|
@ -544,7 +649,7 @@ migration:path-mysql:
|
||||||
.db-rollback: &db-rollback
|
.db-rollback: &db-rollback
|
||||||
<<: *dedicated-no-docs-pull-cache-job
|
<<: *dedicated-no-docs-pull-cache-job
|
||||||
script:
|
script:
|
||||||
- bundle exec rake db:rollback STEP=119
|
- bundle exec rake db:migrate VERSION=20170523121229
|
||||||
- bundle exec rake db:migrate
|
- bundle exec rake db:migrate
|
||||||
|
|
||||||
db:rollback-pg:
|
db:rollback-pg:
|
||||||
|
|
@ -608,21 +713,23 @@ karma:
|
||||||
|
|
||||||
codequality:
|
codequality:
|
||||||
<<: *dedicated-no-docs-no-db-pull-cache-job
|
<<: *dedicated-no-docs-no-db-pull-cache-job
|
||||||
image: docker:latest
|
image: docker:stable
|
||||||
|
allow_failure: true
|
||||||
|
# gitlab-org runners set `privileged: false` but we need to have it set to true
|
||||||
|
# since we're using Docker in Docker
|
||||||
|
tags: []
|
||||||
before_script: []
|
before_script: []
|
||||||
services:
|
services:
|
||||||
- docker:dind
|
- docker:dind
|
||||||
variables:
|
variables:
|
||||||
SETUP_DB: "false"
|
SETUP_DB: "false"
|
||||||
DOCKER_DRIVER: overlay2
|
DOCKER_DRIVER: overlay2
|
||||||
CODECLIMATE_FORMAT: json
|
|
||||||
cache: {}
|
cache: {}
|
||||||
dependencies: []
|
dependencies: []
|
||||||
script:
|
script:
|
||||||
- apk update && apk add jq
|
# Extract "MAJOR.MINOR" from CI_SERVER_VERSION and generate "MAJOR-MINOR-stable" for Security Products
|
||||||
- ./scripts/codequality analyze -f json > raw_codeclimate.json || true
|
- export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
|
||||||
# The following line keeps only the fields used in the MR widget, reducing the JSON artifact size
|
- docker run --env SOURCE_CODE="$PWD" --volume "$PWD":/code --volume /var/run/docker.sock:/var/run/docker.sock "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code
|
||||||
- jq -c 'map({check_name,description,fingerprint,location})' raw_codeclimate.json > codeclimate.json
|
|
||||||
artifacts:
|
artifacts:
|
||||||
paths: [codeclimate.json]
|
paths: [codeclimate.json]
|
||||||
expire_in: 1 week
|
expire_in: 1 week
|
||||||
|
|
@ -655,7 +762,13 @@ qa:selectors:
|
||||||
- bundle exec bin/qa Test::Sanity::Selectors
|
- bundle exec bin/qa Test::Sanity::Selectors
|
||||||
|
|
||||||
coverage:
|
coverage:
|
||||||
<<: *dedicated-no-docs-no-db-pull-cache-job
|
# Don't include dedicated-no-docs-no-db-pull-cache-job here since we need to
|
||||||
|
# download artifacts from all the rspec jobs instead of from setup-test-env only
|
||||||
|
<<: *dedicated-runner
|
||||||
|
<<: *except-docs-and-qa
|
||||||
|
<<: *pull-cache
|
||||||
|
variables:
|
||||||
|
SETUP_DB: "false"
|
||||||
stage: post-test
|
stage: post-test
|
||||||
script:
|
script:
|
||||||
- bundle exec scripts/merge-simplecov
|
- bundle exec scripts/merge-simplecov
|
||||||
|
|
|
||||||
|
|
@ -33,13 +33,16 @@ When removing columns, tables, indexes or other structures:
|
||||||
|
|
||||||
## General Checklist
|
## General Checklist
|
||||||
|
|
||||||
- [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added, if necessary
|
- [ ] [Changelog entry](https://docs.gitlab.com/ee/development/changelog.html) added, if necessary
|
||||||
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
|
- [ ] [Documentation created/updated](https://docs.gitlab.com/ee/development/doc_styleguide.html)
|
||||||
- [ ] API support added
|
- [ ] API support added
|
||||||
- [ ] Tests added for this feature/bug
|
- [ ] Tests added for this feature/bug
|
||||||
- Review
|
- Review
|
||||||
- [ ] Has been reviewed by Backend
|
- [ ] Has been reviewed by Backend
|
||||||
- [ ] Has been reviewed by Database
|
- [ ] Has been reviewed by Database
|
||||||
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
|
- [ ] Conform by the [merge request performance guides](https://docs.gitlab.com/ee/development/merge_request_performance_guidelines.html)
|
||||||
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
|
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/CONTRIBUTING.md#style-guides)
|
||||||
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
|
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
|
||||||
|
- [ ] Internationalization required/considered
|
||||||
|
- [ ] If paid feature, have we considered GitLab.com plan and how it works for groups and is there a design for promoting it to users who aren't on the correct plan
|
||||||
|
- [ ] End-to-end tests pass (`package-qa` manual pipeline job)
|
||||||
|
|
|
||||||
|
|
@ -1,16 +1,29 @@
|
||||||
See the general Documentation guidelines http://docs.gitlab.com/ce/development/doc_styleguide.html
|
<!--See the general Documentation guidelines https://docs.gitlab.com/ce/development/writing_documentation.html -->
|
||||||
|
|
||||||
## What does this MR do?
|
## What does this MR do?
|
||||||
|
|
||||||
(briefly describe what this MR is about)
|
<!-- Briefly describe what this MR is about -->
|
||||||
|
|
||||||
|
## Related issues
|
||||||
|
|
||||||
|
<!-- Mention the issue(s) this MR closes or is related to -->
|
||||||
|
|
||||||
|
Closes
|
||||||
|
|
||||||
## Moving docs to a new location?
|
## Moving docs to a new location?
|
||||||
|
|
||||||
See the guidelines: http://docs.gitlab.com/ce/development/doc_styleguide.html#changing-document-location
|
Read the guidelines:
|
||||||
|
https://docs.gitlab.com/ce/development/writing_documentation.html#changing-document-location
|
||||||
|
|
||||||
- [ ] Make sure the old link is not removed and has its contents replaced with a link to the new location.
|
- [ ] Make sure the old link is not removed and has its contents replaced with
|
||||||
|
a link to the new location.
|
||||||
- [ ] Make sure internal links pointing to the document in question are not broken.
|
- [ ] Make sure internal links pointing to the document in question are not broken.
|
||||||
- [ ] Search and replace any links referring to old docs in GitLab Rails app, specifically under the `app/views/` directory.
|
- [ ] Search and replace any links referring to old docs in GitLab Rails app,
|
||||||
- [ ] Make sure to add [`redirect_from`](https://docs.gitlab.com/ee/development/doc_styleguide.html#redirections-for-pages-with-disqus-comments) to the new document if there are any Disqus comments on the old document thread.
|
specifically under the `app/views/` and `ee/app/views` (for GitLab EE) directories.
|
||||||
- [ ] If working on CE, submit an MR to EE with the changes as well.
|
- [ ] Make sure to add [`redirect_from`](https://docs.gitlab.com/ce/development/writing_documentation.html#redirections-for-pages-with-disqus-comments)
|
||||||
|
to the new document if there are any Disqus comments on the old document thread.
|
||||||
|
- [ ] If working on CE and the `ee-compat-check` jobs fails, submit an MR to EE
|
||||||
|
with the changes as well (https://docs.gitlab.com/ce/development/writing_documentation.html#cherry-picking-from-ce-to-ee).
|
||||||
- [ ] Ping one of the technical writers for review.
|
- [ ] Ping one of the technical writers for review.
|
||||||
|
|
||||||
|
/label ~Documentation
|
||||||
|
|
|
||||||
5
.prettierignore
Normal file
5
.prettierignore
Normal file
|
|
@ -0,0 +1,5 @@
|
||||||
|
/app/assets/javascripts/locale/**/app.js
|
||||||
|
/node_modules/
|
||||||
|
/public/
|
||||||
|
/vendor/
|
||||||
|
/tmp/
|
||||||
13
.prettierrc
Normal file
13
.prettierrc
Normal file
|
|
@ -0,0 +1,13 @@
|
||||||
|
{
|
||||||
|
"printWidth": 100,
|
||||||
|
"singleQuote": true,
|
||||||
|
"trailingComma": "es5",
|
||||||
|
"overrides": [
|
||||||
|
{
|
||||||
|
"files": ["**/app/**/*", "**/spec/**/*"],
|
||||||
|
"options": {
|
||||||
|
"trailingComma": "all"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
72
.rubocop.yml
72
.rubocop.yml
|
|
@ -31,6 +31,78 @@ Style/MutableConstant:
|
||||||
- 'ee/db/post_migrate/**/*'
|
- 'ee/db/post_migrate/**/*'
|
||||||
- 'ee/db/geo/migrate/**/*'
|
- 'ee/db/geo/migrate/**/*'
|
||||||
|
|
||||||
|
Naming/FileName:
|
||||||
|
ExpectMatchingDefinition: true
|
||||||
|
Exclude:
|
||||||
|
- 'spec/**/*'
|
||||||
|
- 'features/**/*'
|
||||||
|
- 'ee/spec/**/*'
|
||||||
|
- 'qa/spec/**/*'
|
||||||
|
- 'qa/qa/specs/**/*'
|
||||||
|
- 'qa/bin/*'
|
||||||
|
- 'config/**/*'
|
||||||
|
- 'lib/generators/**/*'
|
||||||
|
- 'ee/lib/generators/**/*'
|
||||||
|
IgnoreExecutableScripts: true
|
||||||
|
AllowedAcronyms:
|
||||||
|
- EE
|
||||||
|
- JSON
|
||||||
|
- LDAP
|
||||||
|
- IO
|
||||||
|
- HMAC
|
||||||
|
- QA
|
||||||
|
- ENV
|
||||||
|
- STL
|
||||||
|
- PDF
|
||||||
|
- SVG
|
||||||
|
- CTE
|
||||||
|
- DN
|
||||||
|
- RSA
|
||||||
|
- CI
|
||||||
|
- CD
|
||||||
|
- OAuth
|
||||||
|
# default ones:
|
||||||
|
- CLI
|
||||||
|
- DSL
|
||||||
|
- ACL
|
||||||
|
- API
|
||||||
|
- ASCII
|
||||||
|
- CPU
|
||||||
|
- CSS
|
||||||
|
- DNS
|
||||||
|
- EOF
|
||||||
|
- GUID
|
||||||
|
- HTML
|
||||||
|
- HTTP
|
||||||
|
- HTTPS
|
||||||
|
- ID
|
||||||
|
- IP
|
||||||
|
- JSON
|
||||||
|
- LHS
|
||||||
|
- QPS
|
||||||
|
- RAM
|
||||||
|
- RHS
|
||||||
|
- RPC
|
||||||
|
- SLA
|
||||||
|
- SMTP
|
||||||
|
- SQL
|
||||||
|
- SSH
|
||||||
|
- TCP
|
||||||
|
- TLS
|
||||||
|
- TTL
|
||||||
|
- UDP
|
||||||
|
- UI
|
||||||
|
- UID
|
||||||
|
- UUID
|
||||||
|
- URI
|
||||||
|
- URL
|
||||||
|
- UTF8
|
||||||
|
- VM
|
||||||
|
- XML
|
||||||
|
- XMPP
|
||||||
|
- XSRF
|
||||||
|
- XSS
|
||||||
|
|
||||||
# Gitlab ###################################################################
|
# Gitlab ###################################################################
|
||||||
|
|
||||||
Gitlab/ModuleWithInstanceVariables:
|
Gitlab/ModuleWithInstanceVariables:
|
||||||
|
|
|
||||||
|
|
@ -59,6 +59,8 @@ linters:
|
||||||
# Reports when you define the same property twice in a single rule set.
|
# Reports when you define the same property twice in a single rule set.
|
||||||
DuplicateProperty:
|
DuplicateProperty:
|
||||||
enabled: true
|
enabled: true
|
||||||
|
ignore_consecutive:
|
||||||
|
- cursor
|
||||||
|
|
||||||
# Separate rule, function, and mixin declarations with empty lines.
|
# Separate rule, function, and mixin declarations with empty lines.
|
||||||
EmptyLineBetweenBlocks:
|
EmptyLineBetweenBlocks:
|
||||||
|
|
|
||||||
323
CHANGELOG.md
323
CHANGELOG.md
|
|
@ -2,29 +2,261 @@
|
||||||
documentation](doc/development/changelog.md) for instructions on adding your own
|
documentation](doc/development/changelog.md) for instructions on adding your own
|
||||||
entry.
|
entry.
|
||||||
|
|
||||||
## 10.6.5 (2018-04-24)
|
## 10.7.3 (2018-05-02)
|
||||||
|
|
||||||
### Security (1 change)
|
### Fixed (8 changes)
|
||||||
|
|
||||||
|
- Fixed wrong avatar URL when the avatar is on object storage. !18092
|
||||||
|
- Fix errors on pushing to an empty repository. !18462
|
||||||
|
- Update doorkeeper to 4.3.2 to fix GitLab OAuth authentication. !18543
|
||||||
|
- Ports omniauth-jwt gem onto GitLab OmniAuth Strategies suite. !18580
|
||||||
|
- Fix redirection error for applications using OpenID. !18599
|
||||||
|
- Fix commit trailer rendering when Gravatar is disabled.
|
||||||
|
- Fix file_store for artifacts and lfs when saving.
|
||||||
|
- Fix users not seeing labels from private groups when being a member of a child project.
|
||||||
|
|
||||||
|
|
||||||
|
## 10.7.2 (2018-04-25)
|
||||||
|
|
||||||
|
### Security (2 changes)
|
||||||
|
|
||||||
|
- Serve archive requests with the correct file in all cases.
|
||||||
- Sanitizes user name to avoid XSS attacks.
|
- Sanitizes user name to avoid XSS attacks.
|
||||||
|
|
||||||
|
|
||||||
## 10.6.4 (2018-04-09)
|
## 10.7.1 (2018-04-23)
|
||||||
|
|
||||||
### Fixed (8 changes, 1 of them is from the community)
|
### Fixed (11 changes)
|
||||||
|
|
||||||
|
- [API] Fix URLs in the `Link` header for `GET /projects/:id/repository/contributors` when no value is passed for `order_by` or `sort`. !18393
|
||||||
|
- Fix a case with secret variables being empty sometimes. !18400
|
||||||
|
- Fix `Trace::HttpIO` can not render multi-byte chars. !18417
|
||||||
|
- Fix specifying a non-default ref when requesting an archive using the legacy URL. !18468
|
||||||
|
- Respect visibility options and description when importing project from template. !18473
|
||||||
|
- Removes 'No Job log' message from build trace. !18523
|
||||||
|
- Align action icons in pipeline graph.
|
||||||
|
- Fix direct_upload when records with null file_store are used.
|
||||||
|
- Removed alert box in IDE when redirecting to new merge request.
|
||||||
|
- Fixed IDE not loading for sub groups.
|
||||||
|
- Fixed IDE not showing loading state when tree is loading.
|
||||||
|
|
||||||
|
### Performance (4 changes)
|
||||||
|
|
||||||
|
- Validate project path prior to hitting the database. !18322
|
||||||
|
- Add index to file_store on ci_job_artifacts. !18444
|
||||||
|
- Fix N+1 queries when loading participants for a commit note.
|
||||||
|
- Support Markdown rendering using multiple projects.
|
||||||
|
|
||||||
|
### Added (1 change)
|
||||||
|
|
||||||
|
- Add an API endpoint to download git repository snapshots. !18173
|
||||||
|
|
||||||
|
|
||||||
|
## 10.7.0 (2018-04-22)
|
||||||
|
|
||||||
|
### Security (6 changes, 2 of them are from the community)
|
||||||
|
|
||||||
|
- Fixed some SSRF vulnerabilities in services, hooks and integrations. !2337
|
||||||
|
- Update ruby-saml to 1.7.2 and omniauth-saml to 1.10.0. !17734 (Takuya Noguchi)
|
||||||
|
- Update rack-protection to 2.0.1. !17835 (Takuya Noguchi)
|
||||||
|
- Adds confidential notes channel for Slack/Mattermost.
|
||||||
|
- Fix XSS on diff view stored on filenames.
|
||||||
|
- Fix GitLab Auth0 integration signing in the wrong user.
|
||||||
|
|
||||||
|
### Fixed (65 changes, 20 of them are from the community)
|
||||||
|
|
||||||
|
- File uploads in remote storage now support project renaming. !4597
|
||||||
|
- Fixed bug in dropdown selector when selecting the same selection again. !14631 (bitsapien)
|
||||||
|
- Fixed group deletion linked to Mattermost. !16209 (Julien Millau)
|
||||||
|
- Create commit API and Web IDE obey LFS filters. !16718
|
||||||
|
- Set breadcrumb for admin/runners/show. !17431 (Takuya Noguchi)
|
||||||
|
- Enable restore rake task to handle nested storage directories. !17516 (Balasankar C)
|
||||||
|
- Fix hover style of dropdown items in the right sidebar. !17519
|
||||||
|
- Improve empty state for canceled job. !17646
|
||||||
|
- Fix generated URL when listing repoitories for import. !17692
|
||||||
|
- Use singular in the diff stats if only one line has been changed. !17697 (Jan Beckmann)
|
||||||
|
- Long instance urls do not overflow anymore during project creation. !17717
|
||||||
|
- Fix importing multiple assignees from GitLab export. !17718
|
||||||
- Correct copy text for the promote milestone and label modals. !17726
|
- Correct copy text for the promote milestone and label modals. !17726
|
||||||
|
- Fix search results stripping last endline when parsing the results. !17777 (Jasper Maes)
|
||||||
|
- Add read-only banner to all pages. !17798
|
||||||
|
- Fix viewing diffs on old merge requests. !17805
|
||||||
|
- Fix forking to subgroup via API when namespace is given by name. !17815 (Jan Beckmann)
|
||||||
|
- Fix UI breakdown for Create merge request button. !17821 (Takuya Noguchi)
|
||||||
|
- Unify format for nested non-task lists. !17823 (Takuya Noguchi)
|
||||||
|
- UX re-design branch items with flexbox. !17832 (Takuya Noguchi)
|
||||||
|
- Use porcelain commit lookup method on CI::CreatePipelineService. !17911
|
||||||
|
- Update dashboard milestones breadcrumb link. !17933 (George Tsiolis)
|
||||||
|
- Deleting a MR you are assigned to should decrements counter. !17951 (m b)
|
||||||
|
- Update no repository placeholder. !17964 (George Tsiolis)
|
||||||
|
- Drop JSON response in Project Milestone along with avoiding error. !17977 (Takuya Noguchi)
|
||||||
|
- Fix personal access token clipboard button style. !17978 (Fabian Schneider)
|
||||||
- Avoid validation errors when running the Pages domain verification service. !17992
|
- Avoid validation errors when running the Pages domain verification service. !17992
|
||||||
|
- Project creation will now raise an error if a service template is invalid. !18013
|
||||||
|
- Add better LDAP connection handling. !18039
|
||||||
- Fix autolinking URLs containing ampersands. !18045
|
- Fix autolinking URLs containing ampersands. !18045
|
||||||
- Fix exceptions raised when migrating pipeline stages in the background. !18076
|
- Fix exceptions raised when migrating pipeline stages in the background. !18076
|
||||||
|
- Always display Labels section in issuable sidebar, even when the project has no labels. !18081 (Branka Martinovic)
|
||||||
|
- Fixed gitlab:uploads:migrate task ignoring some uploads. !18082
|
||||||
|
- Fixed gitlab:uploads:migrate task failing for Groups' avatar. !18088
|
||||||
|
- Increase dropdown width in pipeline graph & center action icon. !18089
|
||||||
|
- Fix `JobsController#raw` endpoint can not read traces in database. !18101
|
||||||
|
- Fix `gitlab-rake gitlab:two_factor:disable_for_all_users`. !18154
|
||||||
|
- Adjust 404's for LegacyDiffNote discussion rendering. !18201
|
||||||
- Work around Prometheus Helm chart name changes to fix integration. !18206 (joshlambert)
|
- Work around Prometheus Helm chart name changes to fix integration. !18206 (joshlambert)
|
||||||
- Don't show Jump to Discussion button on Issues.
|
- Prioritize weight over title when sorting charts. !18233
|
||||||
- Fix listing commit branch/tags that contain special characters.
|
- Verify that deploy token has valid access when pulling container registry image. !18260
|
||||||
|
- Stop redirecting the page in pipeline main actions.
|
||||||
|
- Fixed IDE button opening the wrong URL in tree list.
|
||||||
|
- Ensure hooks run when a deploy key without a user pushes.
|
||||||
- Fix 404 in group boards when moving issue between lists.
|
- Fix 404 in group boards when moving issue between lists.
|
||||||
|
- Display state indicator for issuable references in non-project scope (e.g. when referencing issuables from group scope).
|
||||||
|
- Add missing port to artifact links.
|
||||||
|
- Fix data race between ObjectStorage background_upload and Pages publishing.
|
||||||
|
- Fixes unresolved discussions rendering the error state instead of the diff.
|
||||||
|
- Don't show Jump to Discussion button on Issues.
|
||||||
|
- Fix bug rendering group icons when forking.
|
||||||
|
- Automatically cleanup stale worktrees and lock files upon a push.
|
||||||
|
- Use the GitLab version as part of the appearances cache key.
|
||||||
|
- Fix Firefox stealing formatting characters on issue notes.
|
||||||
|
- Include matching branches and tags in protected branches / tags count. (Jan Beckmann)
|
||||||
|
- Fix 500 error when a merge request from a fork has conflicts and has not yet been updated.
|
||||||
|
- Test if remote repository exists when importing wikis.
|
||||||
|
- Hide emoji popup after multiple spaces. (Jan Beckmann)
|
||||||
|
- Fix relative uri when "#" is in branch name. (Jan)
|
||||||
|
- Escape Markdown characters properly when using autocomplete.
|
||||||
|
- Ignore project internal references in group context.
|
||||||
|
- Fix finding wiki file when Gitaly is enabled.
|
||||||
|
- Fix listing commit branch/tags that contain special characters.
|
||||||
|
- Ensure internal users (ghost, support bot) get assigned a namespace.
|
||||||
|
- Fix links to subdirectories of a directory with a plus character in its path.
|
||||||
|
|
||||||
### Performance (1 change)
|
### Deprecated (1 change)
|
||||||
|
|
||||||
|
- Remove support for legacy tar.gz pages artifacts. !18090
|
||||||
|
|
||||||
|
### Changed (22 changes, 2 of them are from the community)
|
||||||
|
|
||||||
|
- Add yellow favicon when `CANARY=true` to differientate canary environment. !12477
|
||||||
|
- Use human readable value build_timeout in Project. !17386
|
||||||
|
- Improved visual styles and consistency for commit hash and possible actions across commit lists. !17406
|
||||||
|
- Don't create permanent redirect routes. !17521
|
||||||
|
- Add empty repo check before running AutoDevOps pipeline. !17605
|
||||||
|
- Update wording to specify create/manage project vs group labels in labels dropdown. !17640
|
||||||
|
- Add tooltips to icons in lists of issues and merge requests. !17700
|
||||||
|
- Change avatar error message to include allowed file formats. !17747 (Fabian Schneider)
|
||||||
|
- Polish design for verifying domains. !17767
|
||||||
|
- Move email footer info to a single line. !17916
|
||||||
|
- Add average and maximum summary statistics to the prometheus dashboard. !17921
|
||||||
|
- Add additional cluster usage metrics to usage ping. !17922
|
||||||
|
- Move 'Registry' after 'CI/CD' in project navigation sidebar. !18018 (Elias Werberich)
|
||||||
|
- Redesign application settings to match project settings. !18019
|
||||||
|
- Allow HTTP(s) when git request is made by GitLab CI. !18021
|
||||||
|
- Added hover background color to IDE file list rows.
|
||||||
|
- Make project avatar in IDE consistent with the rest of GitLab.
|
||||||
|
- Show issues of subgroups in group-level issue board.
|
||||||
|
- Repository checksum calculation is handled by Gitaly when feature is enabled.
|
||||||
|
- Allow viewing timings for AJAX requests in the performance bar.
|
||||||
|
- Fixes remove source branch checkbox being visible when user cannot remove the branch.
|
||||||
|
- Make /-/ delimiter optional for search endpoints.
|
||||||
|
|
||||||
|
### Performance (24 changes, 11 of them are from the community)
|
||||||
|
|
||||||
|
- Move AssigneeTitle vue component. !17397 (George Tsiolis)
|
||||||
|
- Move TimeTrackingCollapsedState vue component. !17399 (George Tsiolis)
|
||||||
|
- Move MemoryGraph and MemoryUsage vue components. !17533 (George Tsiolis)
|
||||||
|
- Move UnresolvedDiscussions vue component. !17538 (George Tsiolis)
|
||||||
|
- Move NothingToMerge vue component. !17544 (George Tsiolis)
|
||||||
|
- Move ShaMismatch vue component. !17546 (George Tsiolis)
|
||||||
|
- Stop caching highlighted diffs in Redis unnecessarily. !17746
|
||||||
|
- Add i18n and update specs for ShaMismatch vue component. !17870 (George Tsiolis)
|
||||||
|
- Update spec import path for vue mount component helper. !17880 (George Tsiolis)
|
||||||
|
- Move TimeTrackingComparisonPane vue component. !17931 (George Tsiolis)
|
||||||
|
- Improves the performance of projects list page. !17934
|
||||||
|
- Remove N+1 query for Noteable association. !17956
|
||||||
|
- Improve performance of loading issues with lots of references to merge requests. !17986
|
||||||
|
- Reuse root_ref_hash for performance on Branches. !17998 (Takuya Noguchi)
|
||||||
|
- Update asciidoctor-plantuml to 0.0.8. !18022 (Takuya Noguchi)
|
||||||
|
- Cache personal projects count. !18197
|
||||||
|
- Reduce complexity of issuable finder query. !18219
|
||||||
|
- Reduce number of queries when viewing a merge request.
|
||||||
- Free open file descriptors and libgit2 buffers in UpdatePagesService.
|
- Free open file descriptors and libgit2 buffers in UpdatePagesService.
|
||||||
|
- Memoize Git::Repository#has_visible_content?.
|
||||||
|
- Require at least one filter when listing issues or merge requests on dashboard page.
|
||||||
|
- lazy load diffs on merge request discussions.
|
||||||
|
- Bulk deleting refs is handled by Gitaly by default.
|
||||||
|
- ListCommitsByOid is executed by Gitaly by default.
|
||||||
|
|
||||||
|
### Added (38 changes, 7 of them are from the community)
|
||||||
|
|
||||||
|
- Add HTTPS-only pages. !16273 (rfwatson)
|
||||||
|
- adds closed by informations in issue api. !17042 (haseebeqx)
|
||||||
|
- Projects and groups badges settings UI. !17114
|
||||||
|
- Add per-runner configured job timeout. !17221
|
||||||
|
- Add alternate archive route for simplified packaging. !17225
|
||||||
|
- Add support for pipeline variables expressions in only/except. !17316
|
||||||
|
- Add object storage support for LFS objects, CI artifacts, and uploads. !17358
|
||||||
|
- Added confirmation modal for changing username. !17405
|
||||||
|
- Implement foreground verification of CI artifacts. !17578
|
||||||
|
- Extend API for exporting a project with direct upload URL. !17686
|
||||||
|
- Move ci/lint under project's namespace. !17729
|
||||||
|
- Add Total CPU/Memory consumption metrics for Kubernetes. !17731
|
||||||
|
- Adds the option to the project export API to override the project description and display GitLab export description once imported. !17744
|
||||||
|
- Port direct upload of LFS artifacts from EE. !17752
|
||||||
|
- Adds support for OmniAuth JWT provider. !17774
|
||||||
|
- Display error message on job's tooltip if this one fails. !17782
|
||||||
|
- Add 'Assigned Issues' and 'Assigned Merge Requests' as dashboard view choices for users. !17860 (Elias Werberich)
|
||||||
|
- Extend API for importing a project export with overwrite support. !17883
|
||||||
|
- Create Deploy Tokens to allow permanent access to repository and registry. !17894
|
||||||
|
- Detect commit message trailers and link users properly to their accounts on Gitlab. !17919 (cousine)
|
||||||
|
- Adds cancel btn to new pages domain page. !18026 (Jacopo Beschi @jacopo-beschi)
|
||||||
|
- API: Add parameter merge_method to projects. !18031 (Jan Beckmann)
|
||||||
|
- Introduce simpler env vars for auto devops REPLICAS and CANARY_REPLICAS #41436. !18036
|
||||||
|
- Allow overriding params on project import through API. !18086
|
||||||
|
- Support LFS objects when importing/exporting GitLab project archives. !18115
|
||||||
|
- Store sha256 checksum of artifact metadata. !18149
|
||||||
|
- Limit the number of failed logins when using LDAP for authentication. !43525
|
||||||
|
- Allow assigning and filtering issuables by ancestor group labels.
|
||||||
|
- Include subgroup issues when searching for group issues using the API.
|
||||||
|
- Allow to store uploads by default on Object Storage.
|
||||||
|
- Add slash command for moving issues. (Adam Pahlevi)
|
||||||
|
- Render MR commit SHA instead "diffs" when viable.
|
||||||
|
- Send @mention notifications even if a user has explicitly unsubscribed from item.
|
||||||
|
- Add support for Sidekiq JSON logging.
|
||||||
|
- Add Gitaly call details to performance bar.
|
||||||
|
- Add support for patch link extension for commit links on GitLab Flavored Markdown.
|
||||||
|
- Allow feature gates to be removed through the API.
|
||||||
|
- Allow merge requests related to a commit to be found via API.
|
||||||
|
|
||||||
|
### Other (27 changes, 11 of them are from the community)
|
||||||
|
|
||||||
|
- Send notification emails when push to a merge request. !7610 (YarNayar)
|
||||||
|
- Rename modal.vue to deprecated_modal.vue. !17438
|
||||||
|
- Atomic generation of internal ids for issues. !17580
|
||||||
|
- Use object ID to prevent duplicate keys Vue warning on Issue Boards page during development. !17682
|
||||||
|
- Update foreman from 0.78.0 to 0.84.0. !17690 (Takuya Noguchi)
|
||||||
|
- Add realtime pipeline status for adding/viewing files. !17705
|
||||||
|
- Update documentation to reflect current minimum required versions of node and yarn. !17706
|
||||||
|
- Update knapsack to 1.16.0. !17735 (Takuya Noguchi)
|
||||||
|
- Update CI services documnetation. !17749
|
||||||
|
- Added i18n support for the prometheus memory widget. !17753
|
||||||
|
- Use specific names for filtered CI variable controller parameters. !17796
|
||||||
|
- Apply NestingDepth (level 5) (framework/dropdowns.scss). !17820 (Takuya Noguchi)
|
||||||
|
- Clean up selectors in framework/header.scss. !17822 (Takuya Noguchi)
|
||||||
|
- Bump `state_machines-activerecord` to 0.5.1. !17924 (blackst0ne)
|
||||||
|
- Increase the memory limits used in the unicorn killer. !17948
|
||||||
|
- Replace the spinach test with an rspec analog. !17950 (blackst0ne)
|
||||||
|
- Remove unused index from events table. !18014
|
||||||
|
- Make all workhorse gitaly calls opt-out, take 2. !18043
|
||||||
|
- Update brakeman 3.6.1 to 4.2.1. !18122 (Takuya Noguchi)
|
||||||
|
- Replace the `project/issues/labels.feature` spinach test with an rspec analog. !18126 (blackst0ne)
|
||||||
|
- Bump html-pipeline to 2.7.1. !18132 (@blackst0ne)
|
||||||
|
- Remove test_ci rake task. !18139 (Takuya Noguchi)
|
||||||
|
- Add documentation for Pipelines failure reasons. !18352
|
||||||
|
- Improve JIRA event descriptions.
|
||||||
|
- Add query counts to profiler output.
|
||||||
|
- Move Sidekiq exporter logs to log/sidekiq_exporter.log.
|
||||||
|
- Upgrade Gitaly to upgrade its charlock_holmes.
|
||||||
|
|
||||||
|
|
||||||
## 10.6.3 (2018-04-03)
|
## 10.6.3 (2018-04-03)
|
||||||
|
|
@ -224,7 +456,6 @@ entry.
|
||||||
- Enable privileged mode for GitLab Runner. !17528
|
- Enable privileged mode for GitLab Runner. !17528
|
||||||
- Expose GITLAB_FEATURES as CI/CD variable (fixes #40994).
|
- Expose GITLAB_FEATURES as CI/CD variable (fixes #40994).
|
||||||
- Upgrade GitLab Workhorse to 4.0.0.
|
- Upgrade GitLab Workhorse to 4.0.0.
|
||||||
- Allow CI/CD Jobs being grouped on version strings.
|
|
||||||
- Add discussions API for Issues and Snippets.
|
- Add discussions API for Issues and Snippets.
|
||||||
- Add one group board to Libre.
|
- Add one group board to Libre.
|
||||||
- Add support for filtering by source and target branch to merge requests API.
|
- Add support for filtering by source and target branch to merge requests API.
|
||||||
|
|
@ -251,6 +482,57 @@ entry.
|
||||||
- Use host URL to build JIRA remote link icon.
|
- Use host URL to build JIRA remote link icon.
|
||||||
|
|
||||||
|
|
||||||
|
## 10.5.7 (2018-04-03)
|
||||||
|
|
||||||
|
### Security (2 changes)
|
||||||
|
|
||||||
|
- Fix XSS on diff view stored on filenames.
|
||||||
|
- Adds confidential notes channel for Slack/Mattermost.
|
||||||
|
|
||||||
|
|
||||||
|
## 10.5.6 (2018-03-16)
|
||||||
|
|
||||||
|
### Security (2 changes)
|
||||||
|
|
||||||
|
- Fixed some SSRF vulnerabilities in services, hooks and integrations. !2337
|
||||||
|
- Fix GitLab Auth0 integration signing in the wrong user.
|
||||||
|
|
||||||
|
|
||||||
|
## 10.5.5 (2018-03-15)
|
||||||
|
|
||||||
|
### Fixed (3 changes)
|
||||||
|
|
||||||
|
- Fix missing uploads after group transfer. !17658
|
||||||
|
- Fix code and wiki search results when filename is non-ASCII.
|
||||||
|
- Remove double caching of Repository#empty?.
|
||||||
|
|
||||||
|
### Performance (2 changes)
|
||||||
|
|
||||||
|
- Adding missing indexes on taggings table.
|
||||||
|
- Add index on section_name_id on ci_build_trace_sections table.
|
||||||
|
|
||||||
|
|
||||||
|
## 10.5.4 (2018-03-08)
|
||||||
|
|
||||||
|
### Fixed (11 changes)
|
||||||
|
|
||||||
|
- Encode branch name as binary before creating a RPC request to copy attributes. !17291
|
||||||
|
- Restart Unicorn and Sidekiq when GRPC throws 14:Endpoint read failed. !17293
|
||||||
|
- Ensure group issues and merge requests pages show results from subgroups when there are no results from the current group. !17312
|
||||||
|
- Prevent trace artifact migration to incur data loss. !17313
|
||||||
|
- Return a 404 instead of 403 if the repository does not exist on disk. !17341
|
||||||
|
- Allow Prometheus application to be installed from Cluster applications. !17372
|
||||||
|
- Fixes Prometheus admin configuration page. !17377
|
||||||
|
- Fix code and wiki search results pages when non-ASCII text is displayed. !17413
|
||||||
|
- Fix pages flaky failure by reloading stale object. !17522
|
||||||
|
- Fixed issue edit shortcut not opening edit form.
|
||||||
|
- Revert Project.public_or_visible_to_user changes and only apply to snippets.
|
||||||
|
|
||||||
|
### Performance (1 change)
|
||||||
|
|
||||||
|
- Don't use ProjectsFinder in TodosFinder.
|
||||||
|
|
||||||
|
|
||||||
## 10.5.3 (2018-03-01)
|
## 10.5.3 (2018-03-01)
|
||||||
|
|
||||||
### Security (1 change)
|
### Security (1 change)
|
||||||
|
|
@ -475,6 +757,22 @@ entry.
|
||||||
- Adds empty state illustration for pending job.
|
- Adds empty state illustration for pending job.
|
||||||
|
|
||||||
|
|
||||||
|
## 10.4.7 (2018-04-03)
|
||||||
|
|
||||||
|
### Security (2 changes)
|
||||||
|
|
||||||
|
- Fix XSS on diff view stored on filenames.
|
||||||
|
- Adds confidential notes channel for Slack/Mattermost.
|
||||||
|
|
||||||
|
|
||||||
|
## 10.4.6 (2018-03-16)
|
||||||
|
|
||||||
|
### Security (2 changes)
|
||||||
|
|
||||||
|
- Fixed some SSRF vulnerabilities in services, hooks and integrations. !2337
|
||||||
|
- Fix GitLab Auth0 integration signing in the wrong user.
|
||||||
|
|
||||||
|
|
||||||
## 10.4.5 (2018-03-01)
|
## 10.4.5 (2018-03-01)
|
||||||
|
|
||||||
### Security (1 change)
|
### Security (1 change)
|
||||||
|
|
@ -706,6 +1004,15 @@ entry.
|
||||||
- Use a background migration for issues.closed_at.
|
- Use a background migration for issues.closed_at.
|
||||||
|
|
||||||
|
|
||||||
|
## 10.3.9 (2018-03-16)
|
||||||
|
|
||||||
|
### Security (3 changes)
|
||||||
|
|
||||||
|
- Fixed some SSRF vulnerabilities in services, hooks and integrations. !2337
|
||||||
|
- Update nokogiri to 1.8.2. !16807
|
||||||
|
- Fix GitLab Auth0 integration signing in the wrong user.
|
||||||
|
|
||||||
|
|
||||||
## 10.3.8 (2018-03-01)
|
## 10.3.8 (2018-03-01)
|
||||||
|
|
||||||
### Security (1 change)
|
### Security (1 change)
|
||||||
|
|
|
||||||
|
|
@ -26,7 +26,7 @@ _This notice should stay as the first item in the CONTRIBUTING.md file._
|
||||||
- [Type labels (~"feature proposal", ~bug, ~customer, etc.)](#type-labels-feature-proposal-bug-customer-etc)
|
- [Type labels (~"feature proposal", ~bug, ~customer, etc.)](#type-labels-feature-proposal-bug-customer-etc)
|
||||||
- [Subject labels (~wiki, ~"container registry", ~ldap, ~api, etc.)](#subject-labels-wiki-container-registry-ldap-api-etc)
|
- [Subject labels (~wiki, ~"container registry", ~ldap, ~api, etc.)](#subject-labels-wiki-container-registry-ldap-api-etc)
|
||||||
- [Team labels (~"CI/CD", ~Discussion, ~Edge, ~Platform, etc.)](#team-labels-cicd-discussion-edge-platform-etc)
|
- [Team labels (~"CI/CD", ~Discussion, ~Edge, ~Platform, etc.)](#team-labels-cicd-discussion-edge-platform-etc)
|
||||||
- [Priority labels (~Deliverable and ~Stretch)](#priority-labels-deliverable-and-stretch)
|
- [Priority labels (~Deliverable, ~Stretch, ~"Next Patch Release")](#priority-labels-deliverable-stretch-next-patch-release)
|
||||||
- [Label for community contributors (~"Accepting Merge Requests")](#label-for-community-contributors-accepting-merge-requests)
|
- [Label for community contributors (~"Accepting Merge Requests")](#label-for-community-contributors-accepting-merge-requests)
|
||||||
- [Implement design & UI elements](#implement-design-ui-elements)
|
- [Implement design & UI elements](#implement-design-ui-elements)
|
||||||
- [Issue tracker](#issue-tracker)
|
- [Issue tracker](#issue-tracker)
|
||||||
|
|
@ -98,8 +98,8 @@ coach is going to finish the merge request we assign the
|
||||||
|
|
||||||
## Helping others
|
## Helping others
|
||||||
|
|
||||||
Please help other GitLab users when you can. The channels people will reach out
|
Please help other GitLab users when you can.
|
||||||
on can be found on the [getting help page][getting-help].
|
The methods people will use to seek help can be found on the [getting help page][getting-help].
|
||||||
|
|
||||||
Sign up for the mailing list, answer GitLab questions on StackOverflow or
|
Sign up for the mailing list, answer GitLab questions on StackOverflow or
|
||||||
respond in the IRC channel. You can also sign up on [CodeTriage][codetriage] to help with
|
respond in the IRC channel. You can also sign up on [CodeTriage][codetriage] to help with
|
||||||
|
|
@ -126,7 +126,7 @@ Most issues will have labels for at least one of the following:
|
||||||
- Type: ~"feature proposal", ~bug, ~customer, etc.
|
- Type: ~"feature proposal", ~bug, ~customer, etc.
|
||||||
- Subject: ~wiki, ~"container registry", ~ldap, ~api, ~frontend, etc.
|
- Subject: ~wiki, ~"container registry", ~ldap, ~api, ~frontend, etc.
|
||||||
- Team: ~"CI/CD", ~Discussion, ~Edge, ~Platform, etc.
|
- Team: ~"CI/CD", ~Discussion, ~Edge, ~Platform, etc.
|
||||||
- Priority: ~Deliverable, ~Stretch
|
- Priority: ~Deliverable, ~Stretch, ~"Next Patch Release"
|
||||||
|
|
||||||
All labels, their meaning and priority are defined on the
|
All labels, their meaning and priority are defined on the
|
||||||
[labels page][labels-page].
|
[labels page][labels-page].
|
||||||
|
|
@ -185,7 +185,7 @@ indicate if an issue needs backend work, frontend work, or both.
|
||||||
Team labels are always capitalized so that they show up as the first label for
|
Team labels are always capitalized so that they show up as the first label for
|
||||||
any issue.
|
any issue.
|
||||||
|
|
||||||
### Priority labels (~Deliverable and ~Stretch)
|
### Priority labels (~Deliverable, ~Stretch, ~"Next Patch Release")
|
||||||
|
|
||||||
Priority labels help us clearly communicate expectations of the work for the
|
Priority labels help us clearly communicate expectations of the work for the
|
||||||
release. There are two levels of priority labels:
|
release. There are two levels of priority labels:
|
||||||
|
|
@ -195,6 +195,13 @@ release. There are two levels of priority labels:
|
||||||
- ~Stretch: Issues that are a stretch goal for delivering in the current
|
- ~Stretch: Issues that are a stretch goal for delivering in the current
|
||||||
milestone. If these issues are not done in the current release, they will
|
milestone. If these issues are not done in the current release, they will
|
||||||
strongly be considered for the next release.
|
strongly be considered for the next release.
|
||||||
|
- ~"Next Patch Release": Issues to put in the next patch release. Work on these
|
||||||
|
first, and add the "Pick Into X" label to the merge request, along with the
|
||||||
|
appropriate milestone.
|
||||||
|
|
||||||
|
Each issue scheduled for the current milestone should be labeled ~Deliverable
|
||||||
|
or ~"Stretch". Any open issue for a previous milestone should be labeled
|
||||||
|
~"Next Patch Release", or otherwise rescheduled to a different milestone.
|
||||||
|
|
||||||
### Severity labels (~S1, ~S2, etc.)
|
### Severity labels (~S1, ~S2, etc.)
|
||||||
|
|
||||||
|
|
@ -686,3 +693,4 @@ available at [http://contributor-covenant.org/version/1/1/0/](http://contributor
|
||||||
|
|
||||||
[^1]: Please note that specs other than JavaScript specs are considered backend
|
[^1]: Please note that specs other than JavaScript specs are considered backend
|
||||||
code.
|
code.
|
||||||
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
0.91.0
|
0.96.1
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
0.7.1
|
0.8.1
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
6.0.4
|
7.1.2
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
4.0.0
|
4.1.0
|
||||||
|
|
|
||||||
90
Gemfile
90
Gemfile
|
|
@ -1,6 +1,18 @@
|
||||||
|
# --- Special code for migrating to Rails 5.0 ---
|
||||||
|
def rails5?
|
||||||
|
%w[1 true].include?(ENV["RAILS5"])
|
||||||
|
end
|
||||||
|
|
||||||
|
gem_versions = {}
|
||||||
|
gem_versions['activerecord_sane_schema_dumper'] = rails5? ? '1.0' : '0.2'
|
||||||
|
gem_versions['default_value_for'] = rails5? ? '~> 3.0.5' : '~> 3.0.0'
|
||||||
|
gem_versions['rails'] = rails5? ? '5.0.6' : '4.2.10'
|
||||||
|
gem_versions['rails-i18n'] = rails5? ? '~> 5.1' : '~> 4.0.9'
|
||||||
|
# --- The end of special code for migrating to Rails 5.0 ---
|
||||||
|
|
||||||
source 'https://rubygems.org'
|
source 'https://rubygems.org'
|
||||||
|
|
||||||
gem 'rails', '4.2.10'
|
gem 'rails', gem_versions['rails']
|
||||||
gem 'rails-deprecated_sanitizer', '~> 1.0.3'
|
gem 'rails-deprecated_sanitizer', '~> 1.0.3'
|
||||||
|
|
||||||
# Responders respond_to and respond_with
|
# Responders respond_to and respond_with
|
||||||
|
|
@ -9,34 +21,34 @@ gem 'responders', '~> 2.0'
|
||||||
gem 'sprockets', '~> 3.7.0'
|
gem 'sprockets', '~> 3.7.0'
|
||||||
|
|
||||||
# Default values for AR models
|
# Default values for AR models
|
||||||
gem 'default_value_for', '~> 3.0.0'
|
gem 'default_value_for', gem_versions['default_value_for']
|
||||||
|
|
||||||
# Supported DBs
|
# Supported DBs
|
||||||
gem 'mysql2', '~> 0.4.10', group: :mysql
|
gem 'mysql2', '~> 0.4.10', group: :mysql
|
||||||
gem 'pg', '~> 0.18.2', group: :postgres
|
gem 'pg', '~> 0.18.2', group: :postgres
|
||||||
|
|
||||||
gem 'rugged', '~> 0.26.0'
|
gem 'rugged', '~> 0.27'
|
||||||
gem 'grape-route-helpers', '~> 2.1.0'
|
gem 'grape-route-helpers', '~> 2.1.0'
|
||||||
|
|
||||||
gem 'faraday', '~> 0.12'
|
gem 'faraday', '~> 0.12'
|
||||||
|
|
||||||
# Authentication libraries
|
# Authentication libraries
|
||||||
gem 'devise', '~> 4.2'
|
gem 'devise', '~> 4.2'
|
||||||
gem 'doorkeeper', '~> 4.2.0'
|
gem 'doorkeeper', '~> 4.3'
|
||||||
gem 'doorkeeper-openid_connect', '~> 1.2.0'
|
gem 'doorkeeper-openid_connect', '~> 1.3'
|
||||||
gem 'omniauth', '~> 1.4.2'
|
gem 'omniauth', '~> 1.8'
|
||||||
gem 'omniauth-auth0', '~> 2.0.0'
|
gem 'omniauth-auth0', '~> 2.0.0'
|
||||||
gem 'omniauth-azure-oauth2', '~> 0.0.9'
|
gem 'omniauth-azure-oauth2', '~> 0.0.9'
|
||||||
gem 'omniauth-cas3', '~> 1.1.4'
|
gem 'omniauth-cas3', '~> 1.1.4'
|
||||||
gem 'omniauth-facebook', '~> 4.0.0'
|
gem 'omniauth-facebook', '~> 4.0.0'
|
||||||
gem 'omniauth-github', '~> 1.1.1'
|
gem 'omniauth-github', '~> 1.1.1'
|
||||||
gem 'omniauth-gitlab', '~> 1.0.2'
|
gem 'omniauth-gitlab', '~> 1.0.2'
|
||||||
gem 'omniauth-google-oauth2', '~> 0.5.2'
|
gem 'omniauth-google-oauth2', '~> 0.5.3'
|
||||||
gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos
|
gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos
|
||||||
gem 'omniauth-oauth2-generic', '~> 0.2.2'
|
gem 'omniauth-oauth2-generic', '~> 0.2.2'
|
||||||
gem 'omniauth-saml', '~> 1.7.0'
|
gem 'omniauth-saml', '~> 1.10'
|
||||||
gem 'omniauth-shibboleth', '~> 1.2.0'
|
gem 'omniauth-shibboleth', '~> 1.2.0'
|
||||||
gem 'omniauth-twitter', '~> 1.2.0'
|
gem 'omniauth-twitter', '~> 1.4'
|
||||||
gem 'omniauth_crowd', '~> 2.2.0'
|
gem 'omniauth_crowd', '~> 2.2.0'
|
||||||
gem 'omniauth-authentiq', '~> 0.3.1'
|
gem 'omniauth-authentiq', '~> 0.3.1'
|
||||||
gem 'rack-oauth2', '~> 1.2.1'
|
gem 'rack-oauth2', '~> 1.2.1'
|
||||||
|
|
@ -49,7 +61,7 @@ gem 'akismet', '~> 2.0'
|
||||||
# Two-factor authentication
|
# Two-factor authentication
|
||||||
gem 'devise-two-factor', '~> 3.0.0'
|
gem 'devise-two-factor', '~> 3.0.0'
|
||||||
gem 'rqrcode-rails3', '~> 0.1.7'
|
gem 'rqrcode-rails3', '~> 0.1.7'
|
||||||
gem 'attr_encrypted', '~> 3.0.0'
|
gem 'attr_encrypted', '~> 3.1.0'
|
||||||
gem 'u2f', '~> 0.2.1'
|
gem 'u2f', '~> 0.2.1'
|
||||||
|
|
||||||
# GitLab Pages
|
# GitLab Pages
|
||||||
|
|
@ -104,16 +116,16 @@ gem 'carrierwave', '~> 1.2'
|
||||||
gem 'dropzonejs-rails', '~> 0.7.1'
|
gem 'dropzonejs-rails', '~> 0.7.1'
|
||||||
|
|
||||||
# for backups
|
# for backups
|
||||||
gem 'fog-aws', '~> 1.4'
|
gem 'fog-aws', '~> 2.0.1'
|
||||||
gem 'fog-core', '~> 1.44'
|
gem 'fog-core', '~> 1.44'
|
||||||
gem 'fog-google', '~> 0.5'
|
gem 'fog-google', '~> 1.3.3'
|
||||||
gem 'fog-local', '~> 0.3'
|
gem 'fog-local', '~> 0.3'
|
||||||
gem 'fog-openstack', '~> 0.1'
|
gem 'fog-openstack', '~> 0.1'
|
||||||
gem 'fog-rackspace', '~> 0.1.1'
|
gem 'fog-rackspace', '~> 0.1.1'
|
||||||
gem 'fog-aliyun', '~> 0.2.0'
|
gem 'fog-aliyun', '~> 0.2.0'
|
||||||
|
|
||||||
# for Google storage
|
# for Google storage
|
||||||
gem 'google-api-client', '~> 0.13.6'
|
gem 'google-api-client', '~> 0.19.8'
|
||||||
|
|
||||||
# for aws storage
|
# for aws storage
|
||||||
gem 'unf', '~> 0.1.4'
|
gem 'unf', '~> 0.1.4'
|
||||||
|
|
@ -122,7 +134,7 @@ gem 'unf', '~> 0.1.4'
|
||||||
gem 'seed-fu', '~> 2.3.7'
|
gem 'seed-fu', '~> 2.3.7'
|
||||||
|
|
||||||
# Markdown and HTML processing
|
# Markdown and HTML processing
|
||||||
gem 'html-pipeline', '~> 1.11.0'
|
gem 'html-pipeline', '~> 2.7.1'
|
||||||
gem 'deckar01-task_list', '2.0.0'
|
gem 'deckar01-task_list', '2.0.0'
|
||||||
gem 'gitlab-markup', '~> 1.6.2'
|
gem 'gitlab-markup', '~> 1.6.2'
|
||||||
gem 'redcarpet', '~> 3.4'
|
gem 'redcarpet', '~> 3.4'
|
||||||
|
|
@ -132,8 +144,8 @@ gem 'rdoc', '~> 4.2'
|
||||||
gem 'org-ruby', '~> 0.9.12'
|
gem 'org-ruby', '~> 0.9.12'
|
||||||
gem 'creole', '~> 0.5.0'
|
gem 'creole', '~> 0.5.0'
|
||||||
gem 'wikicloth', '0.8.1'
|
gem 'wikicloth', '0.8.1'
|
||||||
gem 'asciidoctor', '~> 1.5.2'
|
gem 'asciidoctor', '~> 1.5.6'
|
||||||
gem 'asciidoctor-plantuml', '0.0.7'
|
gem 'asciidoctor-plantuml', '0.0.8'
|
||||||
gem 'rouge', '~> 2.0'
|
gem 'rouge', '~> 2.0'
|
||||||
gem 'truncato', '~> 0.7.9'
|
gem 'truncato', '~> 0.7.9'
|
||||||
gem 'bootstrap_form', '~> 2.7.0'
|
gem 'bootstrap_form', '~> 2.7.0'
|
||||||
|
|
@ -149,10 +161,10 @@ group :unicorn do
|
||||||
end
|
end
|
||||||
|
|
||||||
# State machine
|
# State machine
|
||||||
gem 'state_machines-activerecord', '~> 0.4.0'
|
gem 'state_machines-activerecord', '~> 0.5.1'
|
||||||
|
|
||||||
# Issue tags
|
# Issue tags
|
||||||
gem 'acts-as-taggable-on', '~> 4.0'
|
gem 'acts-as-taggable-on', '~> 5.0'
|
||||||
|
|
||||||
# Background jobs
|
# Background jobs
|
||||||
gem 'sidekiq', '~> 5.0'
|
gem 'sidekiq', '~> 5.0'
|
||||||
|
|
@ -208,7 +220,7 @@ gem 'asana', '~> 0.6.0'
|
||||||
gem 'ruby-fogbugz', '~> 0.2.1'
|
gem 'ruby-fogbugz', '~> 0.2.1'
|
||||||
|
|
||||||
# Kubernetes integration
|
# Kubernetes integration
|
||||||
gem 'kubeclient', '~> 2.2.0'
|
gem 'kubeclient', '~> 3.0'
|
||||||
|
|
||||||
# d3
|
# d3
|
||||||
gem 'd3_rails', '~> 3.5.0'
|
gem 'd3_rails', '~> 3.5.0'
|
||||||
|
|
@ -221,7 +233,7 @@ gem 'babosa', '~> 1.0.2'
|
||||||
gem 'loofah', '~> 2.2'
|
gem 'loofah', '~> 2.2'
|
||||||
|
|
||||||
# Working with license
|
# Working with license
|
||||||
gem 'licensee', '~> 8.7.0'
|
gem 'licensee', '~> 8.9'
|
||||||
|
|
||||||
# Protect against bruteforcing
|
# Protect against bruteforcing
|
||||||
gem 'rack-attack', '~> 4.4.1'
|
gem 'rack-attack', '~> 4.4.1'
|
||||||
|
|
@ -235,9 +247,6 @@ gem 'mousetrap-rails', '~> 1.4.6'
|
||||||
# Detect and convert string character encoding
|
# Detect and convert string character encoding
|
||||||
gem 'charlock_holmes', '~> 0.7.5'
|
gem 'charlock_holmes', '~> 0.7.5'
|
||||||
|
|
||||||
# Faster JSON
|
|
||||||
gem 'oj', '~> 2.17.4'
|
|
||||||
|
|
||||||
# Faster blank
|
# Faster blank
|
||||||
gem 'fast_blank'
|
gem 'fast_blank'
|
||||||
|
|
||||||
|
|
@ -257,22 +266,21 @@ gem 'font-awesome-rails', '~> 4.7'
|
||||||
gem 'gemojione', '~> 3.3'
|
gem 'gemojione', '~> 3.3'
|
||||||
gem 'gon', '~> 6.1.0'
|
gem 'gon', '~> 6.1.0'
|
||||||
gem 'jquery-atwho-rails', '~> 1.3.2'
|
gem 'jquery-atwho-rails', '~> 1.3.2'
|
||||||
gem 'jquery-rails', '~> 4.3.1'
|
|
||||||
gem 'request_store', '~> 1.3'
|
gem 'request_store', '~> 1.3'
|
||||||
gem 'select2-rails', '~> 3.5.9'
|
gem 'select2-rails', '~> 3.5.9'
|
||||||
gem 'virtus', '~> 1.0.1'
|
gem 'virtus', '~> 1.0.1'
|
||||||
gem 'base32', '~> 0.3.0'
|
gem 'base32', '~> 0.3.0'
|
||||||
|
|
||||||
# Sentry integration
|
# Sentry integration
|
||||||
gem 'sentry-raven', '~> 2.5.3'
|
gem 'sentry-raven', '~> 2.7'
|
||||||
|
|
||||||
gem 'premailer-rails', '~> 1.9.7'
|
gem 'premailer-rails', '~> 1.9.7'
|
||||||
|
|
||||||
# I18n
|
# I18n
|
||||||
gem 'ruby_parser', '~> 3.8', require: false
|
gem 'ruby_parser', '~> 3.8', require: false
|
||||||
gem 'rails-i18n', '~> 4.0.9'
|
gem 'rails-i18n', gem_versions['rails-i18n']
|
||||||
gem 'gettext_i18n_rails', '~> 1.8.0'
|
gem 'gettext_i18n_rails', '~> 1.8.0'
|
||||||
gem 'gettext_i18n_rails_js', '~> 1.2.0'
|
gem 'gettext_i18n_rails_js', '~> 1.3'
|
||||||
gem 'gettext', '~> 3.2.2', require: false, group: :development
|
gem 'gettext', '~> 3.2.2', require: false, group: :development
|
||||||
|
|
||||||
gem 'batch-loader', '~> 1.2.1'
|
gem 'batch-loader', '~> 1.2.1'
|
||||||
|
|
@ -280,7 +288,6 @@ gem 'batch-loader', '~> 1.2.1'
|
||||||
# Perf bar
|
# Perf bar
|
||||||
gem 'peek', '~> 1.0.1'
|
gem 'peek', '~> 1.0.1'
|
||||||
gem 'peek-gc', '~> 0.0.2'
|
gem 'peek-gc', '~> 0.0.2'
|
||||||
gem 'peek-host', '~> 1.0.0'
|
|
||||||
gem 'peek-mysql2', '~> 1.1.0', group: :mysql
|
gem 'peek-mysql2', '~> 1.1.0', group: :mysql
|
||||||
gem 'peek-performance_bar', '~> 1.3.0'
|
gem 'peek-performance_bar', '~> 1.3.0'
|
||||||
gem 'peek-pg', '~> 1.3.0', group: :postgres
|
gem 'peek-pg', '~> 1.3.0', group: :postgres
|
||||||
|
|
@ -300,8 +307,8 @@ group :metrics do
|
||||||
end
|
end
|
||||||
|
|
||||||
group :development do
|
group :development do
|
||||||
gem 'foreman', '~> 0.78.0'
|
gem 'foreman', '~> 0.84.0'
|
||||||
gem 'brakeman', '~> 3.6.0', require: false
|
gem 'brakeman', '~> 4.2', require: false
|
||||||
|
|
||||||
gem 'letter_opener_web', '~> 1.3.0'
|
gem 'letter_opener_web', '~> 1.3.0'
|
||||||
gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
|
gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
|
||||||
|
|
@ -360,13 +367,15 @@ group :development, :test do
|
||||||
gem 'benchmark-ips', '~> 2.3.0', require: false
|
gem 'benchmark-ips', '~> 2.3.0', require: false
|
||||||
|
|
||||||
gem 'license_finder', '~> 3.1', require: false
|
gem 'license_finder', '~> 3.1', require: false
|
||||||
gem 'knapsack', '~> 1.11.0'
|
gem 'knapsack', '~> 1.16'
|
||||||
|
|
||||||
gem 'activerecord_sane_schema_dumper', '0.2'
|
gem 'activerecord_sane_schema_dumper', gem_versions['activerecord_sane_schema_dumper']
|
||||||
|
|
||||||
gem 'stackprof', '~> 0.2.10', require: false
|
gem 'stackprof', '~> 0.2.10', require: false
|
||||||
|
|
||||||
gem 'simple_po_parser', '~> 1.1.2', require: false
|
gem 'simple_po_parser', '~> 1.1.2', require: false
|
||||||
|
|
||||||
|
gem 'timecop', '~> 0.8.0'
|
||||||
end
|
end
|
||||||
|
|
||||||
group :test do
|
group :test do
|
||||||
|
|
@ -374,21 +383,20 @@ group :test do
|
||||||
gem 'email_spec', '~> 1.6.0'
|
gem 'email_spec', '~> 1.6.0'
|
||||||
gem 'json-schema', '~> 2.8.0'
|
gem 'json-schema', '~> 2.8.0'
|
||||||
gem 'webmock', '~> 2.3.2'
|
gem 'webmock', '~> 2.3.2'
|
||||||
gem 'test_after_commit', '~> 1.1'
|
gem 'test_after_commit', '~> 1.1' unless rails5? # Remove this gem when migrated to rails 5.0. It's been integrated to rails 5.0.
|
||||||
gem 'sham_rack', '~> 1.3.6'
|
gem 'sham_rack', '~> 1.3.6'
|
||||||
gem 'timecop', '~> 0.8.0'
|
|
||||||
gem 'concurrent-ruby', '~> 1.0.5'
|
gem 'concurrent-ruby', '~> 1.0.5'
|
||||||
gem 'test-prof', '~> 0.2.5'
|
gem 'test-prof', '~> 0.2.5'
|
||||||
end
|
end
|
||||||
|
|
||||||
gem 'octokit', '~> 4.6.2'
|
gem 'octokit', '~> 4.8'
|
||||||
|
|
||||||
gem 'mail_room', '~> 0.9.1'
|
gem 'mail_room', '~> 0.9.1'
|
||||||
|
|
||||||
gem 'email_reply_trimmer', '~> 0.1'
|
gem 'email_reply_trimmer', '~> 0.1'
|
||||||
gem 'html2text'
|
gem 'html2text'
|
||||||
|
|
||||||
gem 'ruby-prof', '~> 0.16.2'
|
gem 'ruby-prof', '~> 0.17.0'
|
||||||
|
|
||||||
# OAuth
|
# OAuth
|
||||||
gem 'oauth2', '~> 1.4'
|
gem 'oauth2', '~> 1.4'
|
||||||
|
|
@ -401,7 +409,7 @@ gem 'vmstat', '~> 2.3.0'
|
||||||
gem 'sys-filesystem', '~> 1.1.6'
|
gem 'sys-filesystem', '~> 1.1.6'
|
||||||
|
|
||||||
# SSH host key support
|
# SSH host key support
|
||||||
gem 'net-ssh', '~> 4.1.0'
|
gem 'net-ssh', '~> 4.2.0'
|
||||||
gem 'sshkey', '~> 1.9.0'
|
gem 'sshkey', '~> 1.9.0'
|
||||||
|
|
||||||
# Required for ED25519 SSH host key support
|
# Required for ED25519 SSH host key support
|
||||||
|
|
@ -412,7 +420,7 @@ group :ed25519 do
|
||||||
end
|
end
|
||||||
|
|
||||||
# Gitaly GRPC client
|
# Gitaly GRPC client
|
||||||
gem 'gitaly-proto', '~> 0.88.0', require: 'gitaly'
|
gem 'gitaly-proto', '~> 0.96.0', require: 'gitaly'
|
||||||
gem 'grpc', '~> 1.10.0'
|
gem 'grpc', '~> 1.10.0'
|
||||||
|
|
||||||
# Locked until https://github.com/google/protobuf/issues/4210 is closed
|
# Locked until https://github.com/google/protobuf/issues/4210 is closed
|
||||||
|
|
@ -421,9 +429,9 @@ gem 'google-protobuf', '= 3.5.1'
|
||||||
gem 'toml-rb', '~> 1.0.0', require: false
|
gem 'toml-rb', '~> 1.0.0', require: false
|
||||||
|
|
||||||
# Feature toggles
|
# Feature toggles
|
||||||
gem 'flipper', '~> 0.11.0'
|
gem 'flipper', '~> 0.13.0'
|
||||||
gem 'flipper-active_record', '~> 0.11.0'
|
gem 'flipper-active_record', '~> 0.13.0'
|
||||||
gem 'flipper-active_support_cache_store', '~> 0.11.0'
|
gem 'flipper-active_support_cache_store', '~> 0.13.0'
|
||||||
|
|
||||||
# Structured logging
|
# Structured logging
|
||||||
gem 'lograge', '~> 0.5'
|
gem 'lograge', '~> 0.5'
|
||||||
|
|
|
||||||
249
Gemfile.lock
249
Gemfile.lock
|
|
@ -40,13 +40,14 @@ GEM
|
||||||
minitest (~> 5.1)
|
minitest (~> 5.1)
|
||||||
thread_safe (~> 0.3, >= 0.3.4)
|
thread_safe (~> 0.3, >= 0.3.4)
|
||||||
tzinfo (~> 1.1)
|
tzinfo (~> 1.1)
|
||||||
acts-as-taggable-on (4.0.0)
|
acts-as-taggable-on (5.0.0)
|
||||||
activerecord (>= 4.0)
|
activerecord (>= 4.2.8)
|
||||||
adamantium (0.2.0)
|
adamantium (0.2.0)
|
||||||
ice_nine (~> 0.11.0)
|
ice_nine (~> 0.11.0)
|
||||||
memoizable (~> 0.4.0)
|
memoizable (~> 0.4.0)
|
||||||
addressable (2.5.2)
|
addressable (2.5.2)
|
||||||
public_suffix (>= 2.0.2, < 4.0)
|
public_suffix (>= 2.0.2, < 4.0)
|
||||||
|
aes_key_wrap (1.0.1)
|
||||||
akismet (2.0.0)
|
akismet (2.0.0)
|
||||||
allocations (1.0.5)
|
allocations (1.0.5)
|
||||||
arel (6.0.4)
|
arel (6.0.4)
|
||||||
|
|
@ -55,17 +56,17 @@ GEM
|
||||||
faraday_middleware (~> 0.9)
|
faraday_middleware (~> 0.9)
|
||||||
faraday_middleware-multi_json (~> 0.0)
|
faraday_middleware-multi_json (~> 0.0)
|
||||||
oauth2 (~> 1.0)
|
oauth2 (~> 1.0)
|
||||||
asciidoctor (1.5.3)
|
asciidoctor (1.5.6.2)
|
||||||
asciidoctor-plantuml (0.0.7)
|
asciidoctor-plantuml (0.0.8)
|
||||||
asciidoctor (~> 1.5)
|
asciidoctor (~> 1.5)
|
||||||
asset_sync (2.2.0)
|
asset_sync (2.2.0)
|
||||||
activemodel (>= 4.1.0)
|
activemodel (>= 4.1.0)
|
||||||
fog-core
|
fog-core
|
||||||
mime-types (>= 2.99)
|
mime-types (>= 2.99)
|
||||||
unf
|
unf
|
||||||
ast (2.3.0)
|
ast (2.4.0)
|
||||||
atomic (1.1.99)
|
atomic (1.1.99)
|
||||||
attr_encrypted (3.0.3)
|
attr_encrypted (3.1.0)
|
||||||
encryptor (~> 3.0.0)
|
encryptor (~> 3.0.0)
|
||||||
attr_required (1.0.0)
|
attr_required (1.0.0)
|
||||||
autoprefixer-rails (6.2.3)
|
autoprefixer-rails (6.2.3)
|
||||||
|
|
@ -86,7 +87,7 @@ GEM
|
||||||
coderay (>= 1.0.0)
|
coderay (>= 1.0.0)
|
||||||
erubis (>= 2.6.6)
|
erubis (>= 2.6.6)
|
||||||
rack (>= 0.9.0)
|
rack (>= 0.9.0)
|
||||||
bindata (2.4.1)
|
bindata (2.4.3)
|
||||||
binding_of_caller (0.7.2)
|
binding_of_caller (0.7.2)
|
||||||
debug_inspector (>= 0.0.1)
|
debug_inspector (>= 0.0.1)
|
||||||
blankslate (2.1.2.4)
|
blankslate (2.1.2.4)
|
||||||
|
|
@ -94,7 +95,7 @@ GEM
|
||||||
autoprefixer-rails (>= 5.2.1)
|
autoprefixer-rails (>= 5.2.1)
|
||||||
sass (>= 3.3.4)
|
sass (>= 3.3.4)
|
||||||
bootstrap_form (2.7.0)
|
bootstrap_form (2.7.0)
|
||||||
brakeman (3.6.1)
|
brakeman (4.2.1)
|
||||||
browser (2.2.0)
|
browser (2.2.0)
|
||||||
builder (3.2.3)
|
builder (3.2.3)
|
||||||
bullet (5.5.1)
|
bullet (5.5.1)
|
||||||
|
|
@ -119,7 +120,7 @@ GEM
|
||||||
activesupport (>= 4.0.0)
|
activesupport (>= 4.0.0)
|
||||||
mime-types (>= 1.16)
|
mime-types (>= 1.16)
|
||||||
cause (0.1)
|
cause (0.1)
|
||||||
charlock_holmes (0.7.5)
|
charlock_holmes (0.7.6)
|
||||||
childprocess (0.7.0)
|
childprocess (0.7.0)
|
||||||
ffi (~> 1.0, >= 1.0.11)
|
ffi (~> 1.0, >= 1.0.11)
|
||||||
chronic (0.10.2)
|
chronic (0.10.2)
|
||||||
|
|
@ -175,12 +176,12 @@ GEM
|
||||||
diff-lcs (1.3)
|
diff-lcs (1.3)
|
||||||
diffy (3.1.0)
|
diffy (3.1.0)
|
||||||
docile (1.1.5)
|
docile (1.1.5)
|
||||||
domain_name (0.5.20161021)
|
domain_name (0.5.20170404)
|
||||||
unf (>= 0.0.5, < 1.0.0)
|
unf (>= 0.0.5, < 1.0.0)
|
||||||
doorkeeper (4.2.6)
|
doorkeeper (4.3.2)
|
||||||
railties (>= 4.2)
|
railties (>= 4.2)
|
||||||
doorkeeper-openid_connect (1.2.0)
|
doorkeeper-openid_connect (1.3.0)
|
||||||
doorkeeper (~> 4.0)
|
doorkeeper (~> 4.3)
|
||||||
json-jwt (~> 1.6)
|
json-jwt (~> 1.6)
|
||||||
dropzonejs-rails (0.7.2)
|
dropzonejs-rails (0.7.2)
|
||||||
rails (> 3.1)
|
rails (> 3.1)
|
||||||
|
|
@ -195,7 +196,7 @@ GEM
|
||||||
et-orbi (1.0.3)
|
et-orbi (1.0.3)
|
||||||
tzinfo
|
tzinfo
|
||||||
eventmachine (1.0.8)
|
eventmachine (1.0.8)
|
||||||
excon (0.57.1)
|
excon (0.60.0)
|
||||||
execjs (2.6.0)
|
execjs (2.6.0)
|
||||||
expression_parser (0.9.0)
|
expression_parser (0.9.0)
|
||||||
factory_bot (4.8.2)
|
factory_bot (4.8.2)
|
||||||
|
|
@ -211,7 +212,7 @@ GEM
|
||||||
faraday_middleware
|
faraday_middleware
|
||||||
multi_json
|
multi_json
|
||||||
fast_blank (1.0.0)
|
fast_blank (1.0.0)
|
||||||
fast_gettext (1.4.0)
|
fast_gettext (1.6.0)
|
||||||
ffaker (2.4.0)
|
ffaker (2.4.0)
|
||||||
ffi (1.9.18)
|
ffi (1.9.18)
|
||||||
flay (2.10.0)
|
flay (2.10.0)
|
||||||
|
|
@ -219,13 +220,13 @@ GEM
|
||||||
path_expander (~> 1.0)
|
path_expander (~> 1.0)
|
||||||
ruby_parser (~> 3.0)
|
ruby_parser (~> 3.0)
|
||||||
sexp_processor (~> 4.0)
|
sexp_processor (~> 4.0)
|
||||||
flipper (0.11.0)
|
flipper (0.13.0)
|
||||||
flipper-active_record (0.11.0)
|
flipper-active_record (0.13.0)
|
||||||
activerecord (>= 3.2, < 6)
|
activerecord (>= 3.2, < 6)
|
||||||
flipper (~> 0.11.0)
|
flipper (~> 0.13.0)
|
||||||
flipper-active_support_cache_store (0.11.0)
|
flipper-active_support_cache_store (0.13.0)
|
||||||
activesupport (>= 3.2, < 6)
|
activesupport (>= 3.2, < 6)
|
||||||
flipper (~> 0.11.0)
|
flipper (~> 0.13.0)
|
||||||
flowdock (0.7.1)
|
flowdock (0.7.1)
|
||||||
httparty (~> 0.7)
|
httparty (~> 0.7)
|
||||||
multi_json
|
multi_json
|
||||||
|
|
@ -234,19 +235,20 @@ GEM
|
||||||
fog-json (~> 1.0)
|
fog-json (~> 1.0)
|
||||||
ipaddress (~> 0.8)
|
ipaddress (~> 0.8)
|
||||||
xml-simple (~> 1.1)
|
xml-simple (~> 1.1)
|
||||||
fog-aws (1.4.0)
|
fog-aws (2.0.1)
|
||||||
fog-core (~> 1.38)
|
fog-core (~> 1.38)
|
||||||
fog-json (~> 1.0)
|
fog-json (~> 1.0)
|
||||||
fog-xml (~> 0.1)
|
fog-xml (~> 0.1)
|
||||||
ipaddress (~> 0.8)
|
ipaddress (~> 0.8)
|
||||||
fog-core (1.44.3)
|
fog-core (1.45.0)
|
||||||
builder
|
builder
|
||||||
excon (~> 0.49)
|
excon (~> 0.58)
|
||||||
formatador (~> 0.2)
|
formatador (~> 0.2)
|
||||||
fog-google (0.5.3)
|
fog-google (1.3.3)
|
||||||
fog-core
|
fog-core
|
||||||
fog-json
|
fog-json
|
||||||
fog-xml
|
fog-xml
|
||||||
|
google-api-client (~> 0.19.1)
|
||||||
fog-json (1.0.2)
|
fog-json (1.0.2)
|
||||||
fog-core (~> 1.0)
|
fog-core (~> 1.0)
|
||||||
multi_json (~> 1.10)
|
multi_json (~> 1.10)
|
||||||
|
|
@ -266,7 +268,7 @@ GEM
|
||||||
nokogiri (>= 1.5.11, < 2.0.0)
|
nokogiri (>= 1.5.11, < 2.0.0)
|
||||||
font-awesome-rails (4.7.0.1)
|
font-awesome-rails (4.7.0.1)
|
||||||
railties (>= 3.2, < 5.1)
|
railties (>= 3.2, < 5.1)
|
||||||
foreman (0.78.0)
|
foreman (0.84.0)
|
||||||
thor (~> 0.19.1)
|
thor (~> 0.19.1)
|
||||||
formatador (0.2.5)
|
formatador (0.2.5)
|
||||||
fuubar (2.2.0)
|
fuubar (2.2.0)
|
||||||
|
|
@ -277,20 +279,20 @@ GEM
|
||||||
gemojione (3.3.0)
|
gemojione (3.3.0)
|
||||||
json
|
json
|
||||||
get_process_mem (0.2.0)
|
get_process_mem (0.2.0)
|
||||||
gettext (3.2.2)
|
gettext (3.2.9)
|
||||||
locale (>= 2.0.5)
|
locale (>= 2.0.5)
|
||||||
text (>= 1.3.0)
|
text (>= 1.3.0)
|
||||||
gettext_i18n_rails (1.8.0)
|
gettext_i18n_rails (1.8.0)
|
||||||
fast_gettext (>= 0.9.0)
|
fast_gettext (>= 0.9.0)
|
||||||
gettext_i18n_rails_js (1.2.0)
|
gettext_i18n_rails_js (1.3.0)
|
||||||
gettext (>= 3.0.2)
|
gettext (>= 3.0.2)
|
||||||
gettext_i18n_rails (>= 0.7.1)
|
gettext_i18n_rails (>= 0.7.1)
|
||||||
po_to_json (>= 1.0.0)
|
po_to_json (>= 1.0.0)
|
||||||
rails (>= 3.2.0)
|
rails (>= 3.2.0)
|
||||||
gherkin-ruby (0.3.2)
|
gherkin-ruby (0.3.2)
|
||||||
gitaly-proto (0.88.0)
|
gitaly-proto (0.96.0)
|
||||||
google-protobuf (~> 3.1)
|
google-protobuf (~> 3.1)
|
||||||
grpc (~> 1.0)
|
grpc (~> 1.10)
|
||||||
github-linguist (5.3.3)
|
github-linguist (5.3.3)
|
||||||
charlock_holmes (~> 0.7.5)
|
charlock_holmes (~> 0.7.5)
|
||||||
escape_utils (~> 1.1.0)
|
escape_utils (~> 1.1.0)
|
||||||
|
|
@ -336,9 +338,9 @@ GEM
|
||||||
json
|
json
|
||||||
multi_json
|
multi_json
|
||||||
request_store (>= 1.0)
|
request_store (>= 1.0)
|
||||||
google-api-client (0.13.6)
|
google-api-client (0.19.8)
|
||||||
addressable (~> 2.5, >= 2.5.1)
|
addressable (~> 2.5, >= 2.5.1)
|
||||||
googleauth (~> 0.5)
|
googleauth (>= 0.5, < 0.7.0)
|
||||||
httpclient (>= 2.8.1, < 3.0)
|
httpclient (>= 2.8.1, < 3.0)
|
||||||
mime-types (~> 3.0)
|
mime-types (~> 3.0)
|
||||||
representable (~> 3.0)
|
representable (~> 3.0)
|
||||||
|
|
@ -356,7 +358,7 @@ GEM
|
||||||
signet (~> 0.7)
|
signet (~> 0.7)
|
||||||
gpgme (2.0.13)
|
gpgme (2.0.13)
|
||||||
mini_portile2 (~> 2.1)
|
mini_portile2 (~> 2.1)
|
||||||
grape (1.0.0)
|
grape (1.0.2)
|
||||||
activesupport
|
activesupport
|
||||||
builder
|
builder
|
||||||
mustermann-grape (~> 1.0.0)
|
mustermann-grape (~> 1.0.0)
|
||||||
|
|
@ -389,7 +391,7 @@ GEM
|
||||||
thor
|
thor
|
||||||
tilt
|
tilt
|
||||||
hashdiff (0.3.4)
|
hashdiff (0.3.4)
|
||||||
hashie (3.5.6)
|
hashie (3.5.7)
|
||||||
hashie-forbidden_attributes (0.1.1)
|
hashie-forbidden_attributes (0.1.1)
|
||||||
hashie (>= 3.0)
|
hashie (>= 3.0)
|
||||||
health_check (2.6.0)
|
health_check (2.6.0)
|
||||||
|
|
@ -397,26 +399,26 @@ GEM
|
||||||
hipchat (1.5.2)
|
hipchat (1.5.2)
|
||||||
httparty
|
httparty
|
||||||
mimemagic
|
mimemagic
|
||||||
html-pipeline (1.11.0)
|
html-pipeline (2.7.1)
|
||||||
activesupport (>= 2)
|
activesupport (>= 2)
|
||||||
nokogiri (~> 1.4)
|
nokogiri (>= 1.4)
|
||||||
html2text (0.2.0)
|
html2text (0.2.0)
|
||||||
nokogiri (~> 1.6)
|
nokogiri (~> 1.6)
|
||||||
htmlentities (4.3.4)
|
htmlentities (4.3.4)
|
||||||
http (0.9.8)
|
http (2.2.2)
|
||||||
addressable (~> 2.3)
|
addressable (~> 2.3)
|
||||||
http-cookie (~> 1.0)
|
http-cookie (~> 1.0)
|
||||||
http-form_data (~> 1.0.1)
|
http-form_data (~> 1.0.1)
|
||||||
http_parser.rb (~> 0.6.0)
|
http_parser.rb (~> 0.6.0)
|
||||||
http-cookie (1.0.3)
|
http-cookie (1.0.3)
|
||||||
domain_name (~> 0.5)
|
domain_name (~> 0.5)
|
||||||
http-form_data (1.0.1)
|
http-form_data (1.0.3)
|
||||||
http_parser.rb (0.6.0)
|
http_parser.rb (0.6.0)
|
||||||
httparty (0.13.7)
|
httparty (0.13.7)
|
||||||
json (~> 1.8)
|
json (~> 1.8)
|
||||||
multi_xml (>= 0.5.2)
|
multi_xml (>= 0.5.2)
|
||||||
httpclient (2.8.2)
|
httpclient (2.8.3)
|
||||||
i18n (0.9.1)
|
i18n (0.9.5)
|
||||||
concurrent-ruby (~> 1.0)
|
concurrent-ruby (~> 1.0)
|
||||||
ice_nine (0.11.2)
|
ice_nine (0.11.2)
|
||||||
influxdb (0.2.3)
|
influxdb (0.2.3)
|
||||||
|
|
@ -428,15 +430,11 @@ GEM
|
||||||
multipart-post
|
multipart-post
|
||||||
oauth (~> 0.5, >= 0.5.0)
|
oauth (~> 0.5, >= 0.5.0)
|
||||||
jquery-atwho-rails (1.3.2)
|
jquery-atwho-rails (1.3.2)
|
||||||
jquery-rails (4.3.1)
|
|
||||||
rails-dom-testing (>= 1, < 3)
|
|
||||||
railties (>= 4.2.0)
|
|
||||||
thor (>= 0.14, < 2.0)
|
|
||||||
json (1.8.6)
|
json (1.8.6)
|
||||||
json-jwt (1.7.2)
|
json-jwt (1.9.2)
|
||||||
activesupport
|
activesupport
|
||||||
|
aes_key_wrap
|
||||||
bindata
|
bindata
|
||||||
multi_json (>= 1.3)
|
|
||||||
securecompare
|
securecompare
|
||||||
url_safe_base64
|
url_safe_base64
|
||||||
json-schema (2.8.0)
|
json-schema (2.8.0)
|
||||||
|
|
@ -455,13 +453,13 @@ GEM
|
||||||
kaminari-core (= 1.0.1)
|
kaminari-core (= 1.0.1)
|
||||||
kaminari-core (1.0.1)
|
kaminari-core (1.0.1)
|
||||||
kgio (2.10.0)
|
kgio (2.10.0)
|
||||||
knapsack (1.11.0)
|
knapsack (1.16.0)
|
||||||
rake
|
rake
|
||||||
timecop (>= 0.1.0)
|
timecop (>= 0.1.0)
|
||||||
kubeclient (2.2.0)
|
kubeclient (3.0.0)
|
||||||
http (= 0.9.8)
|
http (~> 2.2.2)
|
||||||
recursive-open-struct (= 1.0.0)
|
recursive-open-struct (~> 1.0.4)
|
||||||
rest-client
|
rest-client (~> 2.0)
|
||||||
launchy (2.4.3)
|
launchy (2.4.3)
|
||||||
addressable (~> 2.3)
|
addressable (~> 2.3)
|
||||||
letter_opener (1.4.1)
|
letter_opener (1.4.1)
|
||||||
|
|
@ -478,7 +476,7 @@ GEM
|
||||||
toml (= 0.1.2)
|
toml (= 0.1.2)
|
||||||
with_env (> 1.0)
|
with_env (> 1.0)
|
||||||
xml-simple
|
xml-simple
|
||||||
licensee (8.7.0)
|
licensee (8.9.2)
|
||||||
rugged (~> 0.24)
|
rugged (~> 0.24)
|
||||||
little-plugger (1.1.4)
|
little-plugger (1.1.4)
|
||||||
locale (2.1.2)
|
locale (2.1.2)
|
||||||
|
|
@ -503,36 +501,35 @@ GEM
|
||||||
mime-types-data (~> 3.2015)
|
mime-types-data (~> 3.2015)
|
||||||
mime-types-data (3.2016.0521)
|
mime-types-data (3.2016.0521)
|
||||||
mimemagic (0.3.0)
|
mimemagic (0.3.0)
|
||||||
mini_mime (0.1.4)
|
mini_mime (1.0.0)
|
||||||
mini_portile2 (2.3.0)
|
mini_portile2 (2.3.0)
|
||||||
minitest (5.7.0)
|
minitest (5.7.0)
|
||||||
mousetrap-rails (1.4.6)
|
mousetrap-rails (1.4.6)
|
||||||
multi_json (1.13.1)
|
multi_json (1.13.1)
|
||||||
multi_xml (0.6.0)
|
multi_xml (0.6.0)
|
||||||
multipart-post (2.0.0)
|
multipart-post (2.0.0)
|
||||||
mustermann (1.0.0)
|
mustermann (1.0.2)
|
||||||
mustermann-grape (1.0.0)
|
mustermann-grape (1.0.0)
|
||||||
mustermann (~> 1.0.0)
|
mustermann (~> 1.0.0)
|
||||||
mysql2 (0.4.10)
|
mysql2 (0.4.10)
|
||||||
net-ldap (0.16.0)
|
net-ldap (0.16.0)
|
||||||
net-ssh (4.1.0)
|
net-ssh (4.2.0)
|
||||||
netrc (0.11.0)
|
netrc (0.11.0)
|
||||||
nokogiri (1.8.2)
|
nokogiri (1.8.2)
|
||||||
mini_portile2 (~> 2.3.0)
|
mini_portile2 (~> 2.3.0)
|
||||||
numerizer (0.1.1)
|
numerizer (0.1.1)
|
||||||
oauth (0.5.1)
|
oauth (0.5.4)
|
||||||
oauth2 (1.4.0)
|
oauth2 (1.4.0)
|
||||||
faraday (>= 0.8, < 0.13)
|
faraday (>= 0.8, < 0.13)
|
||||||
jwt (~> 1.0)
|
jwt (~> 1.0)
|
||||||
multi_json (~> 1.3)
|
multi_json (~> 1.3)
|
||||||
multi_xml (~> 0.5)
|
multi_xml (~> 0.5)
|
||||||
rack (>= 1.2, < 3)
|
rack (>= 1.2, < 3)
|
||||||
octokit (4.6.2)
|
octokit (4.8.0)
|
||||||
sawyer (~> 0.8.0, >= 0.5.3)
|
sawyer (~> 0.8.0, >= 0.5.3)
|
||||||
oj (2.17.5)
|
omniauth (1.8.1)
|
||||||
omniauth (1.4.2)
|
hashie (>= 3.4.6, < 3.6.0)
|
||||||
hashie (>= 1.2, < 4)
|
rack (>= 1.6.2, < 3)
|
||||||
rack (>= 1.0, < 3)
|
|
||||||
omniauth-auth0 (2.0.0)
|
omniauth-auth0 (2.0.0)
|
||||||
omniauth-oauth2 (~> 1.4)
|
omniauth-oauth2 (~> 1.4)
|
||||||
omniauth-authentiq (0.3.1)
|
omniauth-authentiq (0.3.1)
|
||||||
|
|
@ -553,11 +550,10 @@ GEM
|
||||||
omniauth-gitlab (1.0.2)
|
omniauth-gitlab (1.0.2)
|
||||||
omniauth (~> 1.0)
|
omniauth (~> 1.0)
|
||||||
omniauth-oauth2 (~> 1.0)
|
omniauth-oauth2 (~> 1.0)
|
||||||
omniauth-google-oauth2 (0.5.2)
|
omniauth-google-oauth2 (0.5.3)
|
||||||
jwt (~> 1.5)
|
jwt (>= 1.5)
|
||||||
multi_json (~> 1.3)
|
|
||||||
omniauth (>= 1.1.1)
|
omniauth (>= 1.1.1)
|
||||||
omniauth-oauth2 (>= 1.3.1)
|
omniauth-oauth2 (>= 1.5)
|
||||||
omniauth-kerberos (0.3.0)
|
omniauth-kerberos (0.3.0)
|
||||||
omniauth-multipassword
|
omniauth-multipassword
|
||||||
timfel-krb5-auth (~> 0.8)
|
timfel-krb5-auth (~> 0.8)
|
||||||
|
|
@ -566,19 +562,19 @@ GEM
|
||||||
omniauth-oauth (1.1.0)
|
omniauth-oauth (1.1.0)
|
||||||
oauth
|
oauth
|
||||||
omniauth (~> 1.0)
|
omniauth (~> 1.0)
|
||||||
omniauth-oauth2 (1.4.0)
|
omniauth-oauth2 (1.5.0)
|
||||||
oauth2 (~> 1.0)
|
oauth2 (~> 1.1)
|
||||||
omniauth (~> 1.2)
|
omniauth (~> 1.2)
|
||||||
omniauth-oauth2-generic (0.2.2)
|
omniauth-oauth2-generic (0.2.2)
|
||||||
omniauth-oauth2 (~> 1.0)
|
omniauth-oauth2 (~> 1.0)
|
||||||
omniauth-saml (1.7.0)
|
omniauth-saml (1.10.0)
|
||||||
omniauth (~> 1.3)
|
omniauth (~> 1.3, >= 1.3.2)
|
||||||
ruby-saml (~> 1.4)
|
ruby-saml (~> 1.7)
|
||||||
omniauth-shibboleth (1.2.1)
|
omniauth-shibboleth (1.2.1)
|
||||||
omniauth (>= 1.0.0)
|
omniauth (>= 1.0.0)
|
||||||
omniauth-twitter (1.2.1)
|
omniauth-twitter (1.4.0)
|
||||||
json (~> 1.3)
|
|
||||||
omniauth-oauth (~> 1.1)
|
omniauth-oauth (~> 1.1)
|
||||||
|
rack
|
||||||
omniauth_crowd (2.2.3)
|
omniauth_crowd (2.2.3)
|
||||||
activesupport
|
activesupport
|
||||||
nokogiri (>= 1.4.4)
|
nokogiri (>= 1.4.4)
|
||||||
|
|
@ -588,8 +584,8 @@ GEM
|
||||||
orm_adapter (0.5.0)
|
orm_adapter (0.5.0)
|
||||||
os (0.9.6)
|
os (0.9.6)
|
||||||
parallel (1.12.1)
|
parallel (1.12.1)
|
||||||
parser (2.4.0.2)
|
parser (2.5.0.5)
|
||||||
ast (~> 2.3)
|
ast (~> 2.4.0)
|
||||||
parslet (1.5.0)
|
parslet (1.5.0)
|
||||||
blankslate (~> 2.0)
|
blankslate (~> 2.0)
|
||||||
path_expander (1.0.2)
|
path_expander (1.0.2)
|
||||||
|
|
@ -599,8 +595,6 @@ GEM
|
||||||
railties (>= 4.0.0)
|
railties (>= 4.0.0)
|
||||||
peek-gc (0.0.2)
|
peek-gc (0.0.2)
|
||||||
peek
|
peek
|
||||||
peek-host (1.0.0)
|
|
||||||
peek
|
|
||||||
peek-mysql2 (1.1.0)
|
peek-mysql2 (1.1.0)
|
||||||
atomic (>= 1.0.0)
|
atomic (>= 1.0.0)
|
||||||
mysql2
|
mysql2
|
||||||
|
|
@ -652,7 +646,7 @@ GEM
|
||||||
pry (>= 0.9.10)
|
pry (>= 0.9.10)
|
||||||
public_suffix (3.0.2)
|
public_suffix (3.0.2)
|
||||||
pyu-ruby-sasl (0.0.3.3)
|
pyu-ruby-sasl (0.0.3.3)
|
||||||
rack (1.6.8)
|
rack (1.6.9)
|
||||||
rack-accept (0.4.5)
|
rack-accept (0.4.5)
|
||||||
rack (>= 0.4)
|
rack (>= 0.4)
|
||||||
rack-attack (4.4.1)
|
rack-attack (4.4.1)
|
||||||
|
|
@ -664,7 +658,7 @@ GEM
|
||||||
httpclient (>= 2.4)
|
httpclient (>= 2.4)
|
||||||
multi_json (>= 1.3.6)
|
multi_json (>= 1.3.6)
|
||||||
rack (>= 1.1)
|
rack (>= 1.1)
|
||||||
rack-protection (1.5.3)
|
rack-protection (2.0.1)
|
||||||
rack
|
rack
|
||||||
rack-proxy (0.6.0)
|
rack-proxy (0.6.0)
|
||||||
rack
|
rack
|
||||||
|
|
@ -683,8 +677,8 @@ GEM
|
||||||
sprockets-rails
|
sprockets-rails
|
||||||
rails-deprecated_sanitizer (1.0.3)
|
rails-deprecated_sanitizer (1.0.3)
|
||||||
activesupport (>= 4.2.0.alpha)
|
activesupport (>= 4.2.0.alpha)
|
||||||
rails-dom-testing (1.0.8)
|
rails-dom-testing (1.0.9)
|
||||||
activesupport (>= 4.2.0.beta, < 5.0)
|
activesupport (>= 4.2.0, < 5.0)
|
||||||
nokogiri (~> 1.6)
|
nokogiri (~> 1.6)
|
||||||
rails-deprecated_sanitizer (>= 1.0.1)
|
rails-deprecated_sanitizer (>= 1.0.1)
|
||||||
rails-html-sanitizer (1.0.4)
|
rails-html-sanitizer (1.0.4)
|
||||||
|
|
@ -715,7 +709,7 @@ GEM
|
||||||
re2 (1.1.1)
|
re2 (1.1.1)
|
||||||
recaptcha (3.0.0)
|
recaptcha (3.0.0)
|
||||||
json
|
json
|
||||||
recursive-open-struct (1.0.0)
|
recursive-open-struct (1.0.5)
|
||||||
redcarpet (3.4.0)
|
redcarpet (3.4.0)
|
||||||
redis (3.3.5)
|
redis (3.3.5)
|
||||||
redis-actionpack (5.0.2)
|
redis-actionpack (5.0.2)
|
||||||
|
|
@ -743,7 +737,7 @@ GEM
|
||||||
request_store (1.3.1)
|
request_store (1.3.1)
|
||||||
responders (2.3.0)
|
responders (2.3.0)
|
||||||
railties (>= 4.2.0, < 5.1)
|
railties (>= 4.2.0, < 5.1)
|
||||||
rest-client (2.0.0)
|
rest-client (2.0.2)
|
||||||
http-cookie (>= 1.0.2, < 2.0)
|
http-cookie (>= 1.0.2, < 2.0)
|
||||||
mime-types (>= 1.16, < 4.0)
|
mime-types (>= 1.16, < 4.0)
|
||||||
netrc (~> 0.8)
|
netrc (~> 0.8)
|
||||||
|
|
@ -805,9 +799,9 @@ GEM
|
||||||
i18n
|
i18n
|
||||||
ruby-fogbugz (0.2.1)
|
ruby-fogbugz (0.2.1)
|
||||||
crack (~> 0.4)
|
crack (~> 0.4)
|
||||||
ruby-prof (0.16.2)
|
ruby-prof (0.17.0)
|
||||||
ruby-progressbar (1.9.0)
|
ruby-progressbar (1.9.0)
|
||||||
ruby-saml (1.4.1)
|
ruby-saml (1.7.2)
|
||||||
nokogiri (>= 1.5.10)
|
nokogiri (>= 1.5.10)
|
||||||
ruby_parser (3.9.0)
|
ruby_parser (3.9.0)
|
||||||
sexp_processor (~> 4.1)
|
sexp_processor (~> 4.1)
|
||||||
|
|
@ -816,7 +810,7 @@ GEM
|
||||||
rubyzip (1.2.1)
|
rubyzip (1.2.1)
|
||||||
rufus-scheduler (3.4.0)
|
rufus-scheduler (3.4.0)
|
||||||
et-orbi (~> 1.0)
|
et-orbi (~> 1.0)
|
||||||
rugged (0.26.0)
|
rugged (0.27.0)
|
||||||
safe_yaml (1.0.4)
|
safe_yaml (1.0.4)
|
||||||
sanitize (2.1.0)
|
sanitize (2.1.0)
|
||||||
nokogiri (>= 1.4.4)
|
nokogiri (>= 1.4.4)
|
||||||
|
|
@ -846,7 +840,7 @@ GEM
|
||||||
selenium-webdriver (3.5.0)
|
selenium-webdriver (3.5.0)
|
||||||
childprocess (~> 0.5)
|
childprocess (~> 0.5)
|
||||||
rubyzip (~> 1.0)
|
rubyzip (~> 1.0)
|
||||||
sentry-raven (2.5.3)
|
sentry-raven (2.7.2)
|
||||||
faraday (>= 0.7.6, < 1.0)
|
faraday (>= 0.7.6, < 1.0)
|
||||||
settingslogic (2.0.9)
|
settingslogic (2.0.9)
|
||||||
sexp_processor (4.9.0)
|
sexp_processor (4.9.0)
|
||||||
|
|
@ -903,13 +897,13 @@ GEM
|
||||||
sqlite3 (1.3.13)
|
sqlite3 (1.3.13)
|
||||||
sshkey (1.9.0)
|
sshkey (1.9.0)
|
||||||
stackprof (0.2.10)
|
stackprof (0.2.10)
|
||||||
state_machines (0.4.0)
|
state_machines (0.5.0)
|
||||||
state_machines-activemodel (0.4.0)
|
state_machines-activemodel (0.5.1)
|
||||||
activemodel (>= 4.1, < 5.1)
|
activemodel (>= 4.1, < 6.0)
|
||||||
state_machines (>= 0.4.0)
|
state_machines (>= 0.5.0)
|
||||||
state_machines-activerecord (0.4.0)
|
state_machines-activerecord (0.5.1)
|
||||||
activerecord (>= 4.1, < 5.1)
|
activerecord (>= 4.1, < 6.0)
|
||||||
state_machines-activemodel (>= 0.3.0)
|
state_machines-activemodel (>= 0.5.0)
|
||||||
stringex (2.7.1)
|
stringex (2.7.1)
|
||||||
sys-filesystem (1.1.6)
|
sys-filesystem (1.1.6)
|
||||||
ffi
|
ffi
|
||||||
|
|
@ -935,7 +929,7 @@ GEM
|
||||||
truncato (0.7.10)
|
truncato (0.7.10)
|
||||||
htmlentities (~> 4.3.1)
|
htmlentities (~> 4.3.1)
|
||||||
nokogiri (~> 1.8.0, >= 1.7.0)
|
nokogiri (~> 1.8.0, >= 1.7.0)
|
||||||
tzinfo (1.2.4)
|
tzinfo (1.2.5)
|
||||||
thread_safe (~> 0.1)
|
thread_safe (~> 0.1)
|
||||||
u2f (0.2.1)
|
u2f (0.2.1)
|
||||||
uber (0.1.0)
|
uber (0.1.0)
|
||||||
|
|
@ -944,7 +938,7 @@ GEM
|
||||||
json (>= 1.8.0)
|
json (>= 1.8.0)
|
||||||
unf (0.1.4)
|
unf (0.1.4)
|
||||||
unf_ext
|
unf_ext
|
||||||
unf_ext (0.0.7.4)
|
unf_ext (0.0.7.5)
|
||||||
unicode-display_width (1.3.0)
|
unicode-display_width (1.3.0)
|
||||||
unicorn (5.1.0)
|
unicorn (5.1.0)
|
||||||
kgio (~> 2.6)
|
kgio (~> 2.6)
|
||||||
|
|
@ -953,13 +947,13 @@ GEM
|
||||||
get_process_mem (~> 0)
|
get_process_mem (~> 0)
|
||||||
unicorn (>= 4, < 6)
|
unicorn (>= 4, < 6)
|
||||||
uniform_notifier (1.10.0)
|
uniform_notifier (1.10.0)
|
||||||
unparser (0.2.6)
|
unparser (0.2.7)
|
||||||
abstract_type (~> 0.0.7)
|
abstract_type (~> 0.0.7)
|
||||||
adamantium (~> 0.2.0)
|
adamantium (~> 0.2.0)
|
||||||
concord (~> 0.1.5)
|
concord (~> 0.1.5)
|
||||||
diff-lcs (~> 1.3)
|
diff-lcs (~> 1.3)
|
||||||
equalizer (~> 0.0.9)
|
equalizer (~> 0.0.9)
|
||||||
parser (>= 2.3.1.2, < 2.5)
|
parser (>= 2.3.1.2, < 2.6)
|
||||||
procto (~> 0.0.2)
|
procto (~> 0.0.2)
|
||||||
url_safe_base64 (0.2.2)
|
url_safe_base64 (0.2.2)
|
||||||
validates_hostname (1.0.6)
|
validates_hostname (1.0.6)
|
||||||
|
|
@ -996,15 +990,15 @@ DEPENDENCIES
|
||||||
RedCloth (~> 4.3.2)
|
RedCloth (~> 4.3.2)
|
||||||
ace-rails-ap (~> 4.1.0)
|
ace-rails-ap (~> 4.1.0)
|
||||||
activerecord_sane_schema_dumper (= 0.2)
|
activerecord_sane_schema_dumper (= 0.2)
|
||||||
acts-as-taggable-on (~> 4.0)
|
acts-as-taggable-on (~> 5.0)
|
||||||
addressable (~> 2.5.2)
|
addressable (~> 2.5.2)
|
||||||
akismet (~> 2.0)
|
akismet (~> 2.0)
|
||||||
allocations (~> 1.0)
|
allocations (~> 1.0)
|
||||||
asana (~> 0.6.0)
|
asana (~> 0.6.0)
|
||||||
asciidoctor (~> 1.5.2)
|
asciidoctor (~> 1.5.6)
|
||||||
asciidoctor-plantuml (= 0.0.7)
|
asciidoctor-plantuml (= 0.0.8)
|
||||||
asset_sync (~> 2.2.0)
|
asset_sync (~> 2.2.0)
|
||||||
attr_encrypted (~> 3.0.0)
|
attr_encrypted (~> 3.1.0)
|
||||||
awesome_print (~> 1.2.0)
|
awesome_print (~> 1.2.0)
|
||||||
babosa (~> 1.0.2)
|
babosa (~> 1.0.2)
|
||||||
base32 (~> 0.3.0)
|
base32 (~> 0.3.0)
|
||||||
|
|
@ -1015,7 +1009,7 @@ DEPENDENCIES
|
||||||
binding_of_caller (~> 0.7.2)
|
binding_of_caller (~> 0.7.2)
|
||||||
bootstrap-sass (~> 3.3.0)
|
bootstrap-sass (~> 3.3.0)
|
||||||
bootstrap_form (~> 2.7.0)
|
bootstrap_form (~> 2.7.0)
|
||||||
brakeman (~> 3.6.0)
|
brakeman (~> 4.2)
|
||||||
browser (~> 2.2)
|
browser (~> 2.2)
|
||||||
bullet (~> 5.5.0)
|
bullet (~> 5.5.0)
|
||||||
bundler-audit (~> 0.5.0)
|
bundler-audit (~> 0.5.0)
|
||||||
|
|
@ -1036,8 +1030,8 @@ DEPENDENCIES
|
||||||
devise (~> 4.2)
|
devise (~> 4.2)
|
||||||
devise-two-factor (~> 3.0.0)
|
devise-two-factor (~> 3.0.0)
|
||||||
diffy (~> 3.1.0)
|
diffy (~> 3.1.0)
|
||||||
doorkeeper (~> 4.2.0)
|
doorkeeper (~> 4.3)
|
||||||
doorkeeper-openid_connect (~> 1.2.0)
|
doorkeeper-openid_connect (~> 1.3)
|
||||||
dropzonejs-rails (~> 0.7.1)
|
dropzonejs-rails (~> 0.7.1)
|
||||||
email_reply_trimmer (~> 0.1)
|
email_reply_trimmer (~> 0.1)
|
||||||
email_spec (~> 1.6.0)
|
email_spec (~> 1.6.0)
|
||||||
|
|
@ -1046,25 +1040,25 @@ DEPENDENCIES
|
||||||
fast_blank
|
fast_blank
|
||||||
ffaker (~> 2.4)
|
ffaker (~> 2.4)
|
||||||
flay (~> 2.10.0)
|
flay (~> 2.10.0)
|
||||||
flipper (~> 0.11.0)
|
flipper (~> 0.13.0)
|
||||||
flipper-active_record (~> 0.11.0)
|
flipper-active_record (~> 0.13.0)
|
||||||
flipper-active_support_cache_store (~> 0.11.0)
|
flipper-active_support_cache_store (~> 0.13.0)
|
||||||
fog-aliyun (~> 0.2.0)
|
fog-aliyun (~> 0.2.0)
|
||||||
fog-aws (~> 1.4)
|
fog-aws (~> 2.0.1)
|
||||||
fog-core (~> 1.44)
|
fog-core (~> 1.44)
|
||||||
fog-google (~> 0.5)
|
fog-google (~> 1.3.3)
|
||||||
fog-local (~> 0.3)
|
fog-local (~> 0.3)
|
||||||
fog-openstack (~> 0.1)
|
fog-openstack (~> 0.1)
|
||||||
fog-rackspace (~> 0.1.1)
|
fog-rackspace (~> 0.1.1)
|
||||||
font-awesome-rails (~> 4.7)
|
font-awesome-rails (~> 4.7)
|
||||||
foreman (~> 0.78.0)
|
foreman (~> 0.84.0)
|
||||||
fuubar (~> 2.2.0)
|
fuubar (~> 2.2.0)
|
||||||
gemnasium-gitlab-service (~> 0.2)
|
gemnasium-gitlab-service (~> 0.2)
|
||||||
gemojione (~> 3.3)
|
gemojione (~> 3.3)
|
||||||
gettext (~> 3.2.2)
|
gettext (~> 3.2.2)
|
||||||
gettext_i18n_rails (~> 1.8.0)
|
gettext_i18n_rails (~> 1.8.0)
|
||||||
gettext_i18n_rails_js (~> 1.2.0)
|
gettext_i18n_rails_js (~> 1.3)
|
||||||
gitaly-proto (~> 0.88.0)
|
gitaly-proto (~> 0.96.0)
|
||||||
github-linguist (~> 5.3.3)
|
github-linguist (~> 5.3.3)
|
||||||
gitlab-flowdock-git-hook (~> 1.0.1)
|
gitlab-flowdock-git-hook (~> 1.0.1)
|
||||||
gitlab-markup (~> 1.6.2)
|
gitlab-markup (~> 1.6.2)
|
||||||
|
|
@ -1073,7 +1067,7 @@ DEPENDENCIES
|
||||||
gollum-lib (~> 4.2)
|
gollum-lib (~> 4.2)
|
||||||
gollum-rugged_adapter (~> 0.4.4)
|
gollum-rugged_adapter (~> 0.4.4)
|
||||||
gon (~> 6.1.0)
|
gon (~> 6.1.0)
|
||||||
google-api-client (~> 0.13.6)
|
google-api-client (~> 0.19.8)
|
||||||
google-protobuf (= 3.5.1)
|
google-protobuf (= 3.5.1)
|
||||||
gpgme
|
gpgme
|
||||||
grape (~> 1.0)
|
grape (~> 1.0)
|
||||||
|
|
@ -1086,21 +1080,20 @@ DEPENDENCIES
|
||||||
hashie-forbidden_attributes
|
hashie-forbidden_attributes
|
||||||
health_check (~> 2.6.0)
|
health_check (~> 2.6.0)
|
||||||
hipchat (~> 1.5.0)
|
hipchat (~> 1.5.0)
|
||||||
html-pipeline (~> 1.11.0)
|
html-pipeline (~> 2.7.1)
|
||||||
html2text
|
html2text
|
||||||
httparty (~> 0.13.3)
|
httparty (~> 0.13.3)
|
||||||
influxdb (~> 0.2)
|
influxdb (~> 0.2)
|
||||||
jira-ruby (~> 1.4)
|
jira-ruby (~> 1.4)
|
||||||
jquery-atwho-rails (~> 1.3.2)
|
jquery-atwho-rails (~> 1.3.2)
|
||||||
jquery-rails (~> 4.3.1)
|
|
||||||
json-schema (~> 2.8.0)
|
json-schema (~> 2.8.0)
|
||||||
jwt (~> 1.5.6)
|
jwt (~> 1.5.6)
|
||||||
kaminari (~> 1.0)
|
kaminari (~> 1.0)
|
||||||
knapsack (~> 1.11.0)
|
knapsack (~> 1.16)
|
||||||
kubeclient (~> 2.2.0)
|
kubeclient (~> 3.0)
|
||||||
letter_opener_web (~> 1.3.0)
|
letter_opener_web (~> 1.3.0)
|
||||||
license_finder (~> 3.1)
|
license_finder (~> 3.1)
|
||||||
licensee (~> 8.7.0)
|
licensee (~> 8.9)
|
||||||
lograge (~> 0.5)
|
lograge (~> 0.5)
|
||||||
loofah (~> 2.2)
|
loofah (~> 2.2)
|
||||||
mail_room (~> 0.9.1)
|
mail_room (~> 0.9.1)
|
||||||
|
|
@ -1109,12 +1102,11 @@ DEPENDENCIES
|
||||||
mousetrap-rails (~> 1.4.6)
|
mousetrap-rails (~> 1.4.6)
|
||||||
mysql2 (~> 0.4.10)
|
mysql2 (~> 0.4.10)
|
||||||
net-ldap
|
net-ldap
|
||||||
net-ssh (~> 4.1.0)
|
net-ssh (~> 4.2.0)
|
||||||
nokogiri (~> 1.8.2)
|
nokogiri (~> 1.8.2)
|
||||||
oauth2 (~> 1.4)
|
oauth2 (~> 1.4)
|
||||||
octokit (~> 4.6.2)
|
octokit (~> 4.8)
|
||||||
oj (~> 2.17.4)
|
omniauth (~> 1.8)
|
||||||
omniauth (~> 1.4.2)
|
|
||||||
omniauth-auth0 (~> 2.0.0)
|
omniauth-auth0 (~> 2.0.0)
|
||||||
omniauth-authentiq (~> 0.3.1)
|
omniauth-authentiq (~> 0.3.1)
|
||||||
omniauth-azure-oauth2 (~> 0.0.9)
|
omniauth-azure-oauth2 (~> 0.0.9)
|
||||||
|
|
@ -1122,17 +1114,16 @@ DEPENDENCIES
|
||||||
omniauth-facebook (~> 4.0.0)
|
omniauth-facebook (~> 4.0.0)
|
||||||
omniauth-github (~> 1.1.1)
|
omniauth-github (~> 1.1.1)
|
||||||
omniauth-gitlab (~> 1.0.2)
|
omniauth-gitlab (~> 1.0.2)
|
||||||
omniauth-google-oauth2 (~> 0.5.2)
|
omniauth-google-oauth2 (~> 0.5.3)
|
||||||
omniauth-kerberos (~> 0.3.0)
|
omniauth-kerberos (~> 0.3.0)
|
||||||
omniauth-oauth2-generic (~> 0.2.2)
|
omniauth-oauth2-generic (~> 0.2.2)
|
||||||
omniauth-saml (~> 1.7.0)
|
omniauth-saml (~> 1.10)
|
||||||
omniauth-shibboleth (~> 1.2.0)
|
omniauth-shibboleth (~> 1.2.0)
|
||||||
omniauth-twitter (~> 1.2.0)
|
omniauth-twitter (~> 1.4)
|
||||||
omniauth_crowd (~> 2.2.0)
|
omniauth_crowd (~> 2.2.0)
|
||||||
org-ruby (~> 0.9.12)
|
org-ruby (~> 0.9.12)
|
||||||
peek (~> 1.0.1)
|
peek (~> 1.0.1)
|
||||||
peek-gc (~> 0.0.2)
|
peek-gc (~> 0.0.2)
|
||||||
peek-host (~> 1.0.0)
|
|
||||||
peek-mysql2 (~> 1.1.0)
|
peek-mysql2 (~> 1.1.0)
|
||||||
peek-performance_bar (~> 1.3.0)
|
peek-performance_bar (~> 1.3.0)
|
||||||
peek-pg (~> 1.3.0)
|
peek-pg (~> 1.3.0)
|
||||||
|
|
@ -1175,17 +1166,17 @@ DEPENDENCIES
|
||||||
rubocop (~> 0.52.1)
|
rubocop (~> 0.52.1)
|
||||||
rubocop-rspec (~> 1.22.1)
|
rubocop-rspec (~> 1.22.1)
|
||||||
ruby-fogbugz (~> 0.2.1)
|
ruby-fogbugz (~> 0.2.1)
|
||||||
ruby-prof (~> 0.16.2)
|
ruby-prof (~> 0.17.0)
|
||||||
ruby_parser (~> 3.8)
|
ruby_parser (~> 3.8)
|
||||||
rufus-scheduler (~> 3.4)
|
rufus-scheduler (~> 3.4)
|
||||||
rugged (~> 0.26.0)
|
rugged (~> 0.27)
|
||||||
sanitize (~> 2.0)
|
sanitize (~> 2.0)
|
||||||
sass-rails (~> 5.0.6)
|
sass-rails (~> 5.0.6)
|
||||||
scss_lint (~> 0.56.0)
|
scss_lint (~> 0.56.0)
|
||||||
seed-fu (~> 2.3.7)
|
seed-fu (~> 2.3.7)
|
||||||
select2-rails (~> 3.5.9)
|
select2-rails (~> 3.5.9)
|
||||||
selenium-webdriver (~> 3.5)
|
selenium-webdriver (~> 3.5)
|
||||||
sentry-raven (~> 2.5.3)
|
sentry-raven (~> 2.7)
|
||||||
settingslogic (~> 2.0.9)
|
settingslogic (~> 2.0.9)
|
||||||
sham_rack (~> 1.3.6)
|
sham_rack (~> 1.3.6)
|
||||||
shoulda-matchers (~> 3.1.2)
|
shoulda-matchers (~> 3.1.2)
|
||||||
|
|
@ -1203,7 +1194,7 @@ DEPENDENCIES
|
||||||
sprockets (~> 3.7.0)
|
sprockets (~> 3.7.0)
|
||||||
sshkey (~> 1.9.0)
|
sshkey (~> 1.9.0)
|
||||||
stackprof (~> 0.2.10)
|
stackprof (~> 0.2.10)
|
||||||
state_machines-activerecord (~> 0.4.0)
|
state_machines-activerecord (~> 0.5.1)
|
||||||
sys-filesystem (~> 1.1.6)
|
sys-filesystem (~> 1.1.6)
|
||||||
test-prof (~> 0.2.5)
|
test-prof (~> 0.2.5)
|
||||||
test_after_commit (~> 1.1)
|
test_after_commit (~> 1.1)
|
||||||
|
|
|
||||||
7
Gemfile.rails5
Normal file
7
Gemfile.rails5
Normal file
|
|
@ -0,0 +1,7 @@
|
||||||
|
# BUNDLE_GEMFILE=Gemfile.rails5 bundle install
|
||||||
|
|
||||||
|
ENV["RAILS5"] = "true"
|
||||||
|
|
||||||
|
gemfile = File.expand_path("../Gemfile", __FILE__)
|
||||||
|
|
||||||
|
eval(File.read(gemfile), nil, gemfile)
|
||||||
1223
Gemfile.rails5.lock
Normal file
1223
Gemfile.rails5.lock
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -53,7 +53,7 @@ Below we describe the contributing process to GitLab for two reasons:
|
||||||
Several people from the [GitLab team][team] are helping community members to get
|
Several people from the [GitLab team][team] are helping community members to get
|
||||||
their contributions accepted by meeting our [Definition of done][done].
|
their contributions accepted by meeting our [Definition of done][done].
|
||||||
|
|
||||||
What you can expect from them is described at https://about.gitlab.com/jobs/merge-request-coach/.
|
What you can expect from them is described at https://about.gitlab.com/roles/merge-request-coach/.
|
||||||
|
|
||||||
## Assigning issues
|
## Assigning issues
|
||||||
|
|
||||||
|
|
@ -202,6 +202,9 @@ you can ask for an exception to be made.
|
||||||
Go to [Release tasks issue tracker](https://gitlab.com/gitlab-org/release/tasks/issues/new) and create an issue
|
Go to [Release tasks issue tracker](https://gitlab.com/gitlab-org/release/tasks/issues/new) and create an issue
|
||||||
using the `Exception-request` issue template.
|
using the `Exception-request` issue template.
|
||||||
|
|
||||||
|
**Do not** set the relevant `Pick into X.Y` label (see above) before request an
|
||||||
|
exception; this should be done after the exception is approved.
|
||||||
|
|
||||||
You can find who is who on the [team page](https://about.gitlab.com/team/).
|
You can find who is who on the [team page](https://about.gitlab.com/team/).
|
||||||
|
|
||||||
Whether an exception is made is determined by weighing the benefit and urgency of the change
|
Whether an exception is made is determined by weighing the benefit and urgency of the change
|
||||||
|
|
|
||||||
1
Procfile
1
Procfile
|
|
@ -4,4 +4,3 @@
|
||||||
#
|
#
|
||||||
web: RAILS_ENV=development bin/web start_foreground
|
web: RAILS_ENV=development bin/web start_foreground
|
||||||
worker: RAILS_ENV=development bin/background_jobs start_foreground
|
worker: RAILS_ENV=development bin/background_jobs start_foreground
|
||||||
# mail_room: bundle exec mail_room -q -c config/mail_room.yml
|
|
||||||
|
|
|
||||||
2
VERSION
2
VERSION
|
|
@ -1 +1 @@
|
||||||
10.6.5
|
10.7.3
|
||||||
|
|
|
||||||
BIN
app/assets/images/ci_favicons/canary/favicon_status_canceled.ico
Normal file
BIN
app/assets/images/ci_favicons/canary/favicon_status_canceled.ico
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.2 KiB |
BIN
app/assets/images/ci_favicons/canary/favicon_status_created.ico
Normal file
BIN
app/assets/images/ci_favicons/canary/favicon_status_created.ico
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.2 KiB |
BIN
app/assets/images/ci_favicons/canary/favicon_status_failed.ico
Normal file
BIN
app/assets/images/ci_favicons/canary/favicon_status_failed.ico
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.2 KiB |
BIN
app/assets/images/ci_favicons/canary/favicon_status_manual.ico
Normal file
BIN
app/assets/images/ci_favicons/canary/favicon_status_manual.ico
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.2 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 4.2 KiB |
BIN
app/assets/images/ci_favicons/canary/favicon_status_pending.ico
Normal file
BIN
app/assets/images/ci_favicons/canary/favicon_status_pending.ico
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.2 KiB |
BIN
app/assets/images/ci_favicons/canary/favicon_status_running.ico
Normal file
BIN
app/assets/images/ci_favicons/canary/favicon_status_running.ico
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.2 KiB |
BIN
app/assets/images/ci_favicons/canary/favicon_status_skipped.ico
Normal file
BIN
app/assets/images/ci_favicons/canary/favicon_status_skipped.ico
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.2 KiB |
BIN
app/assets/images/ci_favicons/canary/favicon_status_success.ico
Normal file
BIN
app/assets/images/ci_favicons/canary/favicon_status_success.ico
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.2 KiB |
BIN
app/assets/images/ci_favicons/canary/favicon_status_warning.ico
Normal file
BIN
app/assets/images/ci_favicons/canary/favicon_status_warning.ico
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.2 KiB |
BIN
app/assets/images/favicon-yellow.ico
Normal file
BIN
app/assets/images/favicon-yellow.ico
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 5.3 KiB |
|
|
@ -1 +0,0 @@
|
||||||
{"iconCount":191,"spriteSize":86607,"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","soft-unwrap","soft-wrap","spam","spinner","staged","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_notfound","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","unstaged","user","users","volume-up","warning","work"]}
|
|
||||||
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 85 KiB |
|
|
@ -1 +0,0 @@
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" width="142" height="104" viewBox="0 0 142 104"><g fill="none" fill-rule="evenodd"><g transform="translate(112 4)"><path fill="#FFF" d="M8 4a4 4 0 0 0-4 4v14a4 4 0 0 0 4 4h14a4 4 0 0 0 4-4V8a4 4 0 0 0-4-4H8z"/><path fill="#FDC4A8" fill-rule="nonzero" d="M8 4a4 4 0 0 0-4 4v14a4 4 0 0 0 4 4h14a4 4 0 0 0 4-4V8a4 4 0 0 0-4-4H8zm0-4h14a8 8 0 0 1 8 8v14a8 8 0 0 1-8 8H8a8 8 0 0 1-8-8V8a8 8 0 0 1 8-8z"/><rect width="10" height="10" x="10" y="10" fill="#FC6D26" rx="5"/></g><g transform="translate(5 74)"><rect width="30" height="30" fill="#FFF" rx="8"/><path fill="#E1DBF1" fill-rule="nonzero" d="M8 4a4 4 0 0 0-4 4v14a4 4 0 0 0 4 4h14a4 4 0 0 0 4-4V8a4 4 0 0 0-4-4H8zm0-4h14a8 8 0 0 1 8 8v14a8 8 0 0 1-8 8H8a8 8 0 0 1-8-8V8a8 8 0 0 1 8-8z"/><rect width="10" height="10" x="10" y="10" fill="#6B4FBB" rx="5"/></g><path fill="#FFF" d="M6 4a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V6a2 2 0 0 0-2-2H6z"/><path fill="#FDC4A8" fill-rule="nonzero" d="M6 4a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V6a2 2 0 0 0-2-2H6zm0-4h12a6 6 0 0 1 6 6v12a6 6 0 0 1-6 6H6a6 6 0 0 1-6-6V6a6 6 0 0 1 6-6z"/><rect width="8" height="8" x="8" y="8" fill="#FC6D26" rx="4"/><g transform="translate(112 77)"><rect width="24" height="24" fill="#FFF" rx="6"/><path fill="#E1DBF1" fill-rule="nonzero" d="M6 4a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V6a2 2 0 0 0-2-2H6zm0-4h12a6 6 0 0 1 6 6v12a6 6 0 0 1-6 6H6a6 6 0 0 1-6-6V6a6 6 0 0 1 6-6z"/><rect width="8" height="8" x="8" y="8" fill="#6B4FBB" rx="4"/></g><g transform="translate(46 29)"><rect width="46" height="46" y="2" fill="#E1DBF1" rx="10"/><rect width="46" height="46" fill="#E1DBF1" rx="10"/><path fill="#C3B8E3" fill-rule="nonzero" d="M10 4a6 6 0 0 0-6 6v26a6 6 0 0 0 6 6h26a6 6 0 0 0 6-6V10a6 6 0 0 0-6-6H10zm0-4h26c5.523 0 10 4.477 10 10v26c0 5.523-4.477 10-10 10H10C4.477 46 0 41.523 0 36V10C0 4.477 4.477 0 10 0z"/><rect width="14" height="14" x="16" y="16" fill="#6B4FBB" rx="2"/></g><path fill="#E1DBF1" fill-rule="nonzero" d="M98.413 35.682a2 2 0 1 1-2.826-2.83l2.122-2.12a2 2 0 1 1 2.827 2.83l-2.123 2.12z"/><path fill="#C3B8E3" d="M104.78 29.32a2 2 0 0 1-2.826-2.829l2.122-2.12a2 2 0 0 1 2.827 2.83l-2.122 2.12z"/><path fill="#C3B8E3" fill-rule="nonzero" d="M42.413 89.682a2 2 0 1 1-2.826-2.83l2.122-2.12a2 2 0 1 1 2.827 2.83l-2.123 2.12z"/><path fill="#E1DBF1" d="M48.78 83.32a2 2 0 1 1-2.826-2.829l2.122-2.12a2 2 0 1 1 2.827 2.83l-2.122 2.12z"/><path fill="#E1DBF1" fill-rule="nonzero" d="M27.713 26.531a2 2 0 1 1 2.574-3.062l2.296 1.93a2 2 0 1 1-2.573 3.062l-2.297-1.93z"/><path fill="#C3B8E3" d="M34.604 32.321a2 2 0 1 1 2.573-3.062l2.297 1.93A2 2 0 0 1 36.9 34.25l-2.297-1.93z"/><path fill="#C3B8E3" fill-rule="nonzero" d="M93.74 74.553a2 2 0 0 1 2.52-3.106l2.33 1.891a2 2 0 1 1-2.521 3.106l-2.33-1.891z"/><path fill="#E1DBF1" d="M100.727 80.225a2 2 0 1 1 2.521-3.105l2.33 1.89a2 2 0 1 1-2.522 3.106l-2.33-1.89z"/></g></svg>
|
|
||||||
|
Before Width: | Height: | Size: 2.9 KiB |
|
|
@ -1 +0,0 @@
|
||||||
<svg height="128" viewBox="0 0 142 128" width="142" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><path d="M94 62h20v4H94z" fill="#f0edf8"/><path d="M84.828 84l17.678 17.678-2.828 2.828L82 86.828z" fill="#fee1d3"/><path d="M42.828 24l17.678 17.678-2.828 2.828L40 26.828zM40 101.678L57.678 84l2.828 2.828-17.678 17.678z" fill="#f0edf8"/><path d="M82 41.678L99.678 24l2.828 2.828-17.678 17.678zM28 62h20v4H28zM3 52h24v24H3z" fill="#fee1d3"/><path d="M31 3h24v24H31z" fill="#f0edf8"/><path d="M87 3h24v24H87z" fill="#fef0e8"/><path d="M115 52h24v24h-24z" fill="#f0edf8"/><path d="M87 101h24v24H87z" fill="#fee1d3"/><path d="M31 101h24v24H31z" fill="#f0edf8"/><path d="M49 42h44v44H49z" fill="#c3b8e3"/><g fill-rule="nonzero"><path d="M5 53a1 1 0 0 0-1 1v20a1 1 0 0 0 1 1h20a1 1 0 0 0 1-1V54a1 1 0 0 0-1-1zm0-4h20a5 5 0 0 1 5 5v20a5 5 0 0 1-5 5H5a5 5 0 0 1-5-5V54a5 5 0 0 1 5-5z" fill="#fdc4a8"/><path d="M56 43a6 6 0 0 0-6 6v30a6 6 0 0 0 6 6h30a6 6 0 0 0 6-6V49a6 6 0 0 0-6-6zm0-4h30c5.523 0 10 4.477 10 10v30c0 5.523-4.477 10-10 10H56c-5.523 0-10-4.477-10-10V49c0-5.523 4.477-10 10-10z" fill="#6b4fbb"/><path d="M89 4a1 1 0 0 0-1 1v20a1 1 0 0 0 1 1h20a1 1 0 0 0 1-1V5a1 1 0 0 0-1-1zm0-4h20a5 5 0 0 1 5 5v20a5 5 0 0 1-5 5H89a5 5 0 0 1-5-5V5a5 5 0 0 1 5-5z" fill="#fee1d3"/><path d="M89 102a1 1 0 0 0-1 1v20a1 1 0 0 0 1 1h20a1 1 0 0 0 1-1v-20a1 1 0 0 0-1-1zm0-4h20a5 5 0 0 1 5 5v20a5 5 0 0 1-5 5H89a5 5 0 0 1-5-5v-20a5 5 0 0 1 5-5z" fill="#fdc4a8"/><path d="M117 53a1 1 0 0 0-1 1v20a1 1 0 0 0 1 1h20a1 1 0 0 0 1-1V54a1 1 0 0 0-1-1zm0-4h20a5 5 0 0 1 5 5v20a5 5 0 0 1-5 5h-20a5 5 0 0 1-5-5V54a5 5 0 0 1 5-5zM33 102a1 1 0 0 0-1 1v20a1 1 0 0 0 1 1h20a1 1 0 0 0 1-1v-20a1 1 0 0 0-1-1zm0-4h20a5 5 0 0 1 5 5v20a5 5 0 0 1-5 5H33a5 5 0 0 1-5-5v-20a5 5 0 0 1 5-5zM33 4a1 1 0 0 0-1 1v20a1 1 0 0 0 1 1h20a1 1 0 0 0 1-1V5a1 1 0 0 0-1-1zm0-4h20a5 5 0 0 1 5 5v20a5 5 0 0 1-5 5H33a5 5 0 0 1-5-5V5a5 5 0 0 1 5-5z" fill="#e1dbf1"/></g></g></svg>
|
|
||||||
|
Before Width: | Height: | Size: 1.9 KiB |
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 8.3 KiB |
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 10 KiB |
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 14 KiB |
|
|
@ -1 +0,0 @@
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 76 76"><path d="M45.688 18.854c-4.869-1.989-10.488-1.975-15.29-.001a20.014 20.014 0 0 0-6.493 4.268 19.798 19.798 0 0 0-4.346 6.381 19.135 19.135 0 0 0-1.525 7.537c0 2.066.33 4.118.983 6.104a20.142 20.142 0 0 0 1.83 3.937 5.983 5.983 0 0 0-2.086 4.538c0 3.309 2.691 6 6 6s6-2.691 6-6-2.691-6-6-6c-.779 0-1.522.154-2.205.425a18.13 18.13 0 0 1-1.642-3.533 17.467 17.467 0 0 1-.881-5.472c0-2.351.459-4.623 1.391-6.814a17.721 17.721 0 0 1 3.88-5.675 18.057 18.057 0 0 1 5.85-3.845c4.329-1.778 9.392-1.79 13.78.002a18.077 18.077 0 0 1 5.843 3.84c3.39 3.34 5.257 7.776 5.257 12.493a17.463 17.463 0 0 1-.878 5.481 17.451 17.451 0 0 1-2.569 4.923c-2.134 2.866-3.818 4.698-5.174 6.173-2.424 2.643-3.98 4.599-4.383 8.384H32.215a1 1 0 1 0 0 2h11.739a1 1 0 0 0 .999-.947c.19-3.645 1.345-5.263 3.934-8.09 1.385-1.506 3.107-3.381 5.304-6.331a19.422 19.422 0 0 0 2.864-5.489c.651-1.98.98-4.04.979-6.109 0-5.256-2.078-10.198-5.856-13.92a20.079 20.079 0 0 0-6.49-4.265M28.761 51.612c0 2.206-1.794 4-4 4s-4-1.794-4-4 1.794-4 4-4 4 1.794 4 4M40 74h-4a1 1 0 1 0 0 2h4a1 1 0 1 0 0-2M42 70h-8a1 1 0 1 0 0 2h8a1 1 0 1 0 0-2M38 10a1 1 0 0 0 1-1V1a1 1 0 1 0-2 0v8a1 1 0 0 0 1 1M20.828 15.828a.999.999 0 0 0 .707-1.707l-5.656-5.656a.999.999 0 1 0-1.414 1.414l5.656 5.656a.997.997 0 0 0 .707.293M10 33H2a1 1 0 1 0 0 2h8a1 1 0 1 0 0-2M60.12 8.465l-5.656 5.656a.999.999 0 1 0 1.414 1.414l5.656-5.656a.999.999 0 1 0-1.414-1.414M74 33h-8a1 1 0 1 0 0 2h8a1 1 0 1 0 0-2M43 66H33a1 1 0 1 0 0 2h10a1 1 0 1 0 0-2"/></svg>
|
|
||||||
|
Before Width: | Height: | Size: 1.5 KiB |
|
|
@ -1 +0,0 @@
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 76 76"><path d="M5 43a1 1 0 1 0 2 0v-4h4a1 1 0 1 0 0-2H7v-4a1 1 0 1 0-2 0v4H1a1 1 0 1 0 0 2h4v4M75 37h-4v-4a1 1 0 1 0-2 0v4h-4a1 1 0 1 0 0 2h4v4a1 1 0 1 0 2 0v-4h4a1 1 0 1 0 0-2M21 38a1 1 0 0 0 .47.848l8 5a.999.999 0 0 0 1.061-1.696L23.887 38l6.644-4.152a1 1 0 1 0-1.061-1.695l-8 5A.998.998 0 0 0 21 38M55 38a1 1 0 0 0-.47-.848l-8-5a.999.999 0 1 0-1.061 1.695L52.113 38l-6.644 4.152a1 1 0 1 0 1.061 1.696l8-5A1 1 0 0 0 55 38M41.803 26.05a1 1 0 0 0-1.256.65l-7 22a1.001 1.001 0 0 0 .953 1.303 1 1 0 0 0 .953-.697l7-22a1.001 1.001 0 0 0-.65-1.256M62 7c3.859 0 7 3.141 7 7v11a1 1 0 1 0 2 0V14c0-4.963-4.04-9-9-9H45.91c-.479-2.833-2.943-5-5.91-5-3.309 0-6 2.691-6 6s2.691 6 6 6c2.967 0 5.431-2.167 5.91-5H62m-22 3c-2.206 0-4-1.794-4-4s1.794-4 4-4 4 1.794 4 4-1.794 4-4 4M6 26a1 1 0 0 0 1-1V14c0-3.859 3.141-7 7-7h11.09l-3.293 3.293a.999.999 0 1 0 1.414 1.414l5-5a.999.999 0 0 0 0-1.414l-5-5a.999.999 0 1 0-1.414 1.414L25.09 5H14c-4.963 0-9 4.04-9 9v11a1 1 0 0 0 1 1M36 64c-2.967 0-5.431 2.167-5.91 5H14c-3.859 0-7-3.141-7-7V51a1 1 0 1 0-2 0v11c0 4.963 4.04 9 9 9h16.09c.478 2.833 2.942 5 5.91 5 3.309 0 6-2.691 6-6s-2.691-6-6-6m0 10c-2.206 0-4-1.794-4-4s1.794-4 4-4 4 1.794 4 4-1.794 4-4 4M70 50a1 1 0 0 0-1 1v11c0 3.859-3.141 7-7 7H50.91l3.293-3.293a.999.999 0 1 0-1.414-1.414l-5 5a.999.999 0 0 0 0 1.414l5 5a.997.997 0 0 0 1.414 0 .999.999 0 0 0 0-1.414L50.91 71H62c4.963 0 9-4.04 9-9V51a1 1 0 0 0-1-1"/></svg>
|
|
||||||
|
Before Width: | Height: | Size: 1.4 KiB |
|
|
@ -1 +0,0 @@
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 76 76"><path d="M42.26 40.44a.989.989 0 0 0 1.109-.877l2.625-22.444a.997.997 0 0 0-.993-1.117h-14a1 1 0 0 0-.994 1.108l3.454 31.575a6.981 6.981 0 0 0-2.46 5.317c0 3.859 3.141 7 7 7s7-3.141 7-7-3.141-7-7-7c-.94 0-1.835.189-2.655.527l-3.23-29.527h11.761L41.383 39.33a1 1 0 0 0 .877 1.11m.741 13.562c0 2.757-2.243 5-5 5s-5-2.243-5-5 2.243-5 5-5 5 2.243 5 5"/><path d="M73.236 23.749a1 1 0 0 0-1.854.75A35.788 35.788 0 0 1 74 38c0 19.851-16.149 36-36 36S2 57.851 2 38 18.149 2 38 2c7.6 0 14.83 2.332 20.965 6.74A5.955 5.955 0 0 0 58 12c0 1.603.624 3.109 1.758 4.242A5.956 5.956 0 0 0 64 18a5.956 5.956 0 0 0 4.242-1.758C69.376 15.109 70 13.603 70 12s-.624-3.109-1.758-4.242A5.956 5.956 0 0 0 64 6a5.943 5.943 0 0 0-3.668 1.259C53.812 2.512 46.104 0 38 0 17.047 0 0 17.047 0 38s17.047 38 38 38 38-17.047 38-38c0-4.93-.93-9.725-2.764-14.251zM64 8c1.068 0 2.072.416 2.828 1.172S68 10.932 68 12s-.416 2.072-1.172 2.828c-1.512 1.512-4.145 1.512-5.656 0C60.416 14.072 60 13.068 60 12s.416-2.072 1.172-2.828S62.932 8 64 8z"/></svg>
|
|
||||||
|
Before Width: | Height: | Size: 1 KiB |
|
|
@ -1 +0,0 @@
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 76 76"><path d="M12 8c0-3.309-2.691-6-6-6S0 4.691 0 8c0 2.967 2.167 5.431 5 5.91v8.181c-2.833.478-5 2.942-5 5.909s2.167 5.431 5 5.91v8.181c-2.833.478-5 2.942-5 5.909s2.167 5.431 5 5.91v8.181c-2.833.478-5 2.942-5 5.909 0 3.309 2.691 6 6 6s6-2.691 6-6c0-2.967-2.167-5.431-5-5.91v-8.18c2.833-.478 5-2.942 5-5.91s-2.167-5.431-5-5.91v-8.18c2.833-.478 5-2.942 5-5.91s-2.167-5.431-5-5.91v-8.18c2.833-.479 5-2.943 5-5.91M2 8c0-2.206 1.794-4 4-4s4 1.794 4 4-1.794 4-4 4-4-1.794-4-4m8 60c0 2.206-1.794 4-4 4s-4-1.794-4-4 1.794-4 4-4 4 1.794 4 4m0-20c0 2.206-1.794 4-4 4s-4-1.794-4-4 1.794-4 4-4 4 1.794 4 4m0-20c0 2.206-1.794 4-4 4s-4-1.794-4-4 1.794-4 4-4 4 1.794 4 4M21 6h54a1 1 0 1 0 0-2H21a1 1 0 1 0 0 2M21 12h35a1 1 0 1 0 0-2H21a1 1 0 1 0 0 2M75 24H21a1 1 0 1 0 0 2h54a1 1 0 1 0 0-2M21 32h34a1 1 0 1 0 0-2H21a1 1 0 1 0 0 2M75 44H21a1 1 0 1 0 0 2h54a1 1 0 1 0 0-2M21 52h34a1 1 0 1 0 0-2H21a1 1 0 1 0 0 2M75 64H21a1 1 0 1 0 0 2h54a1 1 0 1 0 0-2M55 70H21a1 1 0 1 0 0 2h34a1 1 0 1 0 0-2"/></svg>
|
|
||||||
|
Before Width: | Height: | Size: 1 KiB |
|
|
@ -1 +0,0 @@
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 76 76"><path d="M67.7 10h-6.751C60.442 4.402 55.728 0 50 0c-6.06 0-11 4.935-11 11s4.935 11 11 11c5.728 0 10.442-4.402 10.949-10H67.7c1.269 0 2.3.987 2.3 2.2v57.6c0 1.213-1.031 2.2-2.3 2.2H8.3C7.031 74 6 73.013 6 71.8V14.2C6 12.987 7.031 12 8.3 12h15.15a1 1 0 1 0 0-2H8.3C5.929 10 4 11.884 4 14.2v57.6C4 74.116 5.929 76 8.3 76h59.4c2.371 0 4.3-1.884 4.3-4.2V14.2c0-2.316-1.929-4.2-4.3-4.2M50 20c-4.963 0-9-4.04-9-9s4.04-9 9-9 9 4.04 9 9-4.04 9-9 9"/><path d="M21.293 29.29a.999.999 0 0 0 0 1.414l12.975 12.975-12.975 12.974a.999.999 0 1 0 1.414 1.414l13.682-13.682a.999.999 0 0 0 0-1.414L22.707 29.29a.999.999 0 0 0-1.414 0M54 59a1 1 0 1 0 0-2H42a1 1 0 1 0 0 2h12"/></svg>
|
|
||||||
|
Before Width: | Height: | Size: 724 B |
|
|
@ -1 +0,0 @@
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 76 76"><path d="M48.949 37C48.442 31.402 43.728 27 38 27s-10.442 4.402-10.949 10h-13.05a1 1 0 1 0 0 2h13.05c.507 5.598 5.221 10 10.949 10s10.442-4.402 10.949-10h12.24a1 1 0 1 0 0-2h-12.24M38 47c-4.963 0-9-4.04-9-9s4.04-9 9-9 9 4.04 9 9-4.04 9-9 9"/><path d="M73.236 23.749a1 1 0 0 0-1.854.75A35.788 35.788 0 0 1 74 38c0 19.851-16.149 36-36 36S2 57.851 2 38 18.149 2 38 2c7.6 0 14.83 2.332 20.965 6.74A5.955 5.955 0 0 0 58 12c0 1.603.624 3.109 1.758 4.242A5.956 5.956 0 0 0 64 18a5.956 5.956 0 0 0 4.242-1.758C69.376 15.109 70 13.603 70 12s-.624-3.109-1.758-4.242A5.956 5.956 0 0 0 64 6a5.943 5.943 0 0 0-3.668 1.259C53.812 2.512 46.104 0 38 0 17.047 0 0 17.047 0 38s17.047 38 38 38 38-17.047 38-38c0-4.93-.93-9.725-2.764-14.251zM64 8c1.068 0 2.072.416 2.828 1.172S68 10.932 68 12s-.416 2.072-1.172 2.828c-1.512 1.512-4.145 1.512-5.656 0C60.416 14.072 60 13.068 60 12s.416-2.072 1.172-2.828S62.932 8 64 8z"/></svg>
|
|
||||||
|
Before Width: | Height: | Size: 966 B |
|
|
@ -1 +0,0 @@
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 76 76"><path d="M14.267 7.32l-4.896 5.277-1.702-1.533a.999.999 0 1 0-1.338 1.486l2.434 2.192c.064.058.139.091.212.13.035.018.065.048.101.062a.99.99 0 0 0 .752-.016c.044-.019.077-.058.118-.084.076-.047.155-.086.219-.154l5.566-6a1 1 0 0 0-1.466-1.36M31 9h44a1 1 0 1 0 0-2H31a1 1 0 1 0 0 2M31 15h24a1 1 0 1 0 0-2H31a1 1 0 1 0 0 2"/><path d="M11 0C4.93 0 0 4.935 0 11s4.935 11 11 11 11-4.935 11-11S17.065 0 11 0m0 20c-4.963 0-9-4.04-9-9s4.04-9 9-9 9 4.04 9 9-4.04 9-9 9M14.267 34.32l-4.896 5.277-1.702-1.533a1 1 0 1 0-1.338 1.486l2.434 2.192c.064.058.139.091.212.13.035.018.065.048.101.062a.99.99 0 0 0 .752-.016c.044-.019.077-.058.118-.084.076-.047.155-.086.219-.154l5.566-6a1 1 0 0 0-1.466-1.36M75 34H31a1 1 0 1 0 0 2h44a1 1 0 1 0 0-2M31 42h24a1 1 0 1 0 0-2H31a1 1 0 1 0 0 2"/><path d="M11 27C4.93 27 0 31.935 0 38s4.935 11 11 11 11-4.935 11-11-4.935-11-11-11m0 20c-4.963 0-9-4.04-9-9s4.04-9 9-9 9 4.04 9 9-4.04 9-9 9M14.267 61.32l-4.896 5.277-1.702-1.533a1 1 0 1 0-1.338 1.486l2.434 2.192c.064.058.139.091.212.13.035.018.065.048.101.062a.99.99 0 0 0 .752-.016c.044-.019.077-.058.118-.084.076-.047.155-.086.219-.154l5.566-6a1 1 0 0 0-1.466-1.36"/><path d="M11 54C4.93 54 0 58.935 0 65s4.935 11 11 11 11-4.935 11-11-4.935-11-11-11m0 20c-4.963 0-9-4.04-9-9s4.04-9 9-9 9 4.04 9 9-4.04 9-9 9M75 61H31a1 1 0 1 0 0 2h44a1 1 0 1 0 0-2M55 67H31a1 1 0 1 0 0 2h24a1 1 0 1 0 0-2"/></svg>
|
|
||||||
|
Before Width: | Height: | Size: 1.4 KiB |
|
|
@ -1 +0,0 @@
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 76 76"><path d="M73.236 23.749a1 1 0 1 0-1.854.75A35.788 35.788 0 0 1 74 38c0 19.851-16.149 36-36 36S2 57.851 2 38 18.149 2 38 2c7.6 0 14.83 2.332 20.965 6.74A5.955 5.955 0 0 0 58 12c0 1.603.624 3.109 1.758 4.242A5.956 5.956 0 0 0 64 18a5.956 5.956 0 0 0 4.242-1.758C69.376 15.109 70 13.603 70 12s-.624-3.109-1.758-4.242A5.956 5.956 0 0 0 64 6a5.943 5.943 0 0 0-3.668 1.259C53.812 2.512 46.104 0 38 0 17.047 0 0 17.047 0 38s17.047 38 38 38 38-17.047 38-38c0-4.93-.93-9.725-2.764-14.251zM64 8c1.068 0 2.072.416 2.828 1.172S68 10.932 68 12s-.416 2.072-1.172 2.828c-1.512 1.512-4.145 1.512-5.656 0C60.416 14.072 60 13.068 60 12s.416-2.072 1.172-2.828S62.932 8 64 8z"/><path d="M27.19 32.17a.997.997 0 0 0-1.366-.364L13.17 39.132a1 1 0 0 0 0 1.73l12.654 7.326a1 1 0 0 0 1.002-1.73l-11.159-6.461 11.159-6.461a.998.998 0 0 0 .364-1.366M48.808 47.827a1 1 0 0 0 1.366.364l12.654-7.326a1 1 0 0 0 0-1.73l-12.654-7.326a1 1 0 0 0-1.002 1.73L60.331 40l-11.159 6.461a.998.998 0 0 0-.364 1.366M42.71 23.06L31.398 56.29a1 1 0 0 0 1.892.645l11.312-33.23a1 1 0 0 0-1.892-.645"/></svg>
|
|
||||||
|
Before Width: | Height: | Size: 1.1 KiB |
|
|
@ -1 +0,0 @@
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 76 76"><path d="M62.44 54.765l-9.912-11.09c.315-3.881.481-7.241.508-10.271-.029-13.871-3.789-23.05-13.413-32.746-.855-.859-2.411-.828-3.294.059-7.594 7.65-11.139 13.934-12.575 22.3a6.94 6.94 0 0 0-4.699 2.039c-1.321 1.321-2.05 3.079-2.05 4.949s.729 3.628 2.051 4.949c1.321 1.322 3.079 2.051 4.949 2.051s3.628-.729 4.949-2.051a6.951 6.951 0 0 0 2.051-4.949 6.955 6.955 0 0 0-2.051-4.949c-.9-.9-2-1.517-3.205-1.824 1.373-7.859 4.764-13.818 11.999-21.11.128-.13.356-.158.456-.059 9.207 9.274 12.805 18.06 12.832 31.33-.026 3.079-.202 6.527-.536 10.54a.997.997 0 0 0 .25.749l10.166 11.379c.062.076.109.23.093.32l-4.547 17.407c-.004.015-.009.036-.079.106a.403.403 0 0 1-.2.106l-3.577.002c-.144-.009-.265-.077-.309-.153l-5.425-10.328a1.002 1.002 0 0 0-.886-.535H30.024c-.371 0-.713.206-.886.535l-5.407 10.303-.069.072a.366.366 0 0 1-.199.105l-3.588.001c-.179-.009-.304-.123-.33-.227l-4.531-17.338a.525.525 0 0 1 .049-.34L25.26 44.682a1 1 0 0 0-1.492-1.332L13.539 54.803c-.448.554-.63 1.312-.474 2.084l4.544 17.396c.253.963 1.146 1.669 2.218 1.719h3.636c.581 0 1.187-.261 1.615-.693.114-.114.286-.286.406-.528l5.144-9.793h14.754l5.16 9.822c.396.697 1.124 1.143 2.01 1.192l3.712-.003a2.396 2.396 0 0 0 1.544-.694c.313-.316.504-.646.598-1.022l4.557-17.451a2.502 2.502 0 0 0-.518-2.066M29.01 30.001c0 1.335-.521 2.591-1.465 3.535s-2.2 1.465-3.535 1.465-2.591-.521-3.535-1.465-1.465-2.2-1.465-3.535.521-2.591 1.465-3.535 2.2-1.465 3.535-1.465 2.591.521 3.535 1.465 1.465 2.2 1.465 3.535"/></svg>
|
|
||||||
|
Before Width: | Height: | Size: 1.5 KiB |
|
|
@ -1 +0,0 @@
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 76 76"><path d="M68 67c-1.725 0-3.36.541-4.723 1.545A12.998 12.998 0 0 0 52 62c-2.734 0-5.359.853-7.555 2.43L42.159 49h1.228l3.829 7.645c.339.598.962.979 1.724 1.022l2.812-.003a2.07 2.07 0 0 0 1.316-.595c.264-.266.433-.559.514-.882l3.433-13.145a2.138 2.138 0 0 0-.449-1.763l-7.385-8.268c.231-2.875.354-5.376.374-7.641C49.532 14.863 46.684 7.908 39.393.564c-.737-.742-2.072-.715-2.829.044-5.617 5.659-8.309 10.336-9.446 16.463a5.95 5.95 0 0 0-3.36 1.686C22.624 19.891 22 21.397 22 23s.624 3.109 1.758 4.242C24.891 28.376 26.397 29 28 29s3.109-.624 4.242-1.758C33.376 26.109 34 24.603 34 23s-.624-3.109-1.758-4.242a5.952 5.952 0 0 0-3.098-1.648c1.095-5.538 3.637-9.855 8.83-15.14 6.874 6.924 9.561 13.485 9.581 23.392-.021 2.316-.151 4.903-.402 7.91a.999.999 0 0 0 .25.749l7.663 8.572-3.391 13.07-2.695.036-4.081-8.15a1.001 1.001 0 0 0-.895-.553h-12.01c-.379 0-.725.214-.895.553l-4.04 8.114-2.707.015-3.427-13.07 7.671-8.588a1 1 0 0 0-1.492-1.332l-7.7 8.623c-.383.47-.54 1.116-.406 1.787l3.419 13.08c.216.829.98 1.438 1.907 1.48h2.735c.508 0 1.016-.218 1.391-.595.091-.09.242-.241.358-.475l3.804-7.597h1.228l-2.286 15.43a12.914 12.914 0 0 0-7.555-2.43c-4.685 0-8.979 2.53-11.277 6.545a7.943 7.943 0 0 0-4.723-1.545c-4.411 0-8 3.589-8 8a1 1 0 0 0 1 1h74a1 1 0 0 0 1-1c0-4.411-3.589-8-8-8m-36-44a3.973 3.973 0 0 1-1.172 2.828c-1.512 1.512-4.145 1.512-5.656 0-.756-.756-1.172-1.76-1.172-2.828s.416-2.072 1.172-2.828 1.76-1.172 2.828-1.172 2.072.416 2.828 1.172 1.172 1.76 1.172 2.828m-29.917 51a6.01 6.01 0 0 1 5.917-5c1.638 0 3.17.652 4.313 1.836a.998.998 0 0 0 1.634-.289 11.011 11.011 0 0 1 10.05-6.547c2.836 0 5.532 1.085 7.593 3.055a1.001 1.001 0 0 0 1.681-.576l2.588-17.479h4.275l2.589 17.479a.999.999 0 1 0 1.681.576 10.945 10.945 0 0 1 7.593-3.055c4.343 0 8.288 2.57 10.05 6.547a.998.998 0 0 0 1.634.289 5.948 5.948 0 0 1 4.313-1.836 6.01 6.01 0 0 1 5.917 5H2.076"/></svg>
|
|
||||||
|
Before Width: | Height: | Size: 1.9 KiB |
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 11 KiB |
|
|
@ -1 +0,0 @@
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" width="492.509" height="453.68" viewBox="0 0 492.50943 453.67966"><g fill="none" fill-rule="evenodd"><path d="M491.589 259.398l-27.559-84.814L409.413 6.486c-2.81-8.648-15.045-8.648-17.856 0l-54.619 168.098H155.572L100.952 6.486c-2.81-8.648-15.046-8.648-17.856 0L28.478 174.584.921 259.398a18.775 18.775 0 0 0 6.82 20.992l238.513 173.29L484.77 280.39a18.777 18.777 0 0 0 6.82-20.992" fill="#fc6d26"/><path d="M246.255 453.68l90.684-279.096H155.57z" fill="#e24329"/><path d="M246.255 453.68L155.57 174.583H28.479z" fill="#fc6d26"/><path d="M28.479 174.584L.92 259.4a18.773 18.773 0 0 0 6.821 20.99l238.514 173.29z" fill="#fca326"/><path d="M28.479 174.584H155.57L100.952 6.487c-2.81-8.65-15.047-8.65-17.856 0z" fill="#e24329"/><path d="M246.255 453.68l90.684-279.096H464.03z" fill="#fc6d26"/><path d="M464.03 174.584l27.56 84.815a18.773 18.773 0 0 1-6.822 20.99L246.255 453.68z" fill="#fca326"/><path d="M464.03 174.584H336.94L391.557 6.487c2.811-8.65 15.047-8.65 17.856 0z" fill="#e24329"/></g></svg>
|
|
||||||
|
Before Width: | Height: | Size: 1 KiB |
|
|
@ -1 +0,0 @@
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 38 38"><g fill="none" fill-rule="evenodd"><circle cx="19" cy="19" r="18" fill="#FFF"/><path fill="#1F78D1" fill-rule="nonzero" d="M19 38C8.507 38 0 29.493 0 19S8.507 0 19 0s19 8.507 19 19-8.507 19-19 19zm0-2c9.389 0 17-7.611 17-17S28.389 2 19 2 2 9.611 2 19s7.611 17 17 17zm-6.293-8.293c-.63.63-1.707.184-1.707-.707V15a3 3 0 0 1 3-3h10a3 3 0 0 1 3 3v6a3 3 0 0 1-3 3h-7.586l-3.707 3.707zM13 24.586l2.293-2.293A1 1 0 0 1 16 22h8a1 1 0 0 0 1-1v-6a1 1 0 0 0-1-1H14a1 1 0 0 0-1 1v9.586z"/></g></svg>
|
|
||||||
|
Before Width: | Height: | Size: 570 B |
|
|
@ -1 +0,0 @@
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 38 38"><g fill="none" fill-rule="evenodd"><circle cx="19" cy="19" r="18" fill="#FFF"/><path fill="#1F78D1" fill-rule="nonzero" d="M19 38C8.507 38 0 29.493 0 19S8.507 0 19 0s19 8.507 19 19-8.507 19-19 19zm0-2c9.389 0 17-7.611 17-17S28.389 2 19 2 2 9.611 2 19s7.611 17 17 17zm-6.293-8.293c-.63.63-1.707.184-1.707-.707V15a3 3 0 0 1 3-3h10a3 3 0 0 1 3 3v6a3 3 0 0 1-3 3h-7.586l-3.707 3.707zM13 24.586l2.293-2.293A1 1 0 0 1 16 22h8a1 1 0 0 0 1-1v-6a1 1 0 0 0-1-1H14a1 1 0 0 0-1 1v9.586z"/></g></svg>
|
|
||||||
|
Before Width: | Height: | Size: 570 B |
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 12 KiB |
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 5.1 KiB |
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 5.6 KiB |
|
|
@ -1 +0,0 @@
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" width="50" height="50" viewBox="0 0 16 16"><g fill-rule="evenodd"><path d="M14 16.01h1V7.99C15 4.128 11.866.999 8 .999c-3.858 0-7 3.13-7 6.991v8.02h1V7.99c0-3.306 2.691-5.991 6-5.991 3.314 0 6 2.682 6 5.991v8.02M3.48 2.656a2 2 0 1 0-2.155 3.228c.102-.321.226-.631.371-.93a1.001 1.001 0 1 1 1.069-1.599 6.96 6.96 0 0 1 .717-.699m9.04-.002a2 2 0 1 1 2.155 3.23 6.835 6.835 0 0 0-.37-.931 1 1 0 1 0-1.068-1.599 6.96 6.96 0 0 0-.717-.699"/><path d="M5.726 8.04h1.557v.124c0 .283-.033.534-.1.752a1.583 1.583 0 0 1-.33.566c-.35.394-.795.591-1.335.591-.527 0-.979-.19-1.355-.571a1.893 1.893 0 0 1-.564-1.377c0-.547.191-1.01.574-1.391a1.902 1.902 0 0 1 1.396-.574c.295 0 .57.06.825.181.244.12.484.316.72.586l-.405.388c-.309-.412-.686-.618-1.13-.618-.399 0-.733.138-1 .413-.27.27-.405.609-.405 1.015 0 .42.151.766.452 1.037.282.252.587.378.915.378.28 0 .531-.094.754-.283.223-.19.347-.418.373-.683h-.94v-.535m2.884.061c0-.53.194-.986.583-1.367a1.919 1.919 0 0 1 1.396-.571c.537 0 .998.192 1.382.576.386.384.578.845.578 1.384 0 .542-.194 1-.581 1.379a1.944 1.944 0 0 1-1.408.569c-.487 0-.923-.168-1.311-.505-.426-.373-.64-.861-.64-1.465m.574.007c0 .417.14.759.42 1.028.278.269.6.403.964.403.395 0 .729-.137 1-.41.272-.277.408-.613.408-1.01 0-.402-.134-.739-.403-1.01a1.33 1.33 0 0 0-.991-.41c-.392 0-.723.137-.993.41a1.36 1.36 0 0 0-.405 1m-.184 3.918c.525.026.812.063.812.063.271.025.324-.096.116-.273 0 0-.775-.813-1.933-.813-1.159 0-1.923.813-1.923.813-.211.174-.153.3.12.273 0 0 .286-.037.81-.063v.477c0 .268.224.5.5.5.268 0 .5-.223.5-.498v-.252.25c0 .268.224.5.5.5.268 0 .5-.223.5-.498v-.478m-1-1.023c.552 0 1-.224 1-.5s-.448-.5-1-.5-1 .224-1 .5.448.5 1 .5"/></g></svg>
|
|
||||||
|
Before Width: | Height: | Size: 1.7 KiB |
|
|
@ -1 +0,0 @@
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" width="50" height="50" version="1" viewBox="0 0 501 501"><path d="M236 .7C137.7 7.5 54 68.2 18.2 158.5c-32 81-19.6 172.8 33 242.5 39.8 53 97.2 87 164.3 97 16.5 2.7 48 3.2 63.5 1.2 48.7-6.3 92.2-24.6 129-54.2 13-10.5 33-31.2 42.2-43.7 26.4-35.5 42.8-75.8 49-120.3 1.6-12.3 1.6-48.7 0-61-4-28.3-12-54.8-24.2-79.5-12.8-26-26.5-45.3-46.8-65.8C417.8 64 400.2 49 398.4 49c-.6 0-.4 10.5.3 26l1.3 26 7 8.7c19 23.7 32.8 53.5 38.2 83 2.5 14 3 43 1 55.8-4.5 27.8-15.2 54-31 76.5-8.6 12.2-28 31.6-40.2 40.2-24 17-50 27.6-80 33-10 1.8-49 1.8-59 0-43-7.7-78.8-26-107.2-54.8-29.3-29.7-46.5-64-52.4-104.4-2-14-1.5-42 1-55C90 121.4 132 72 192 49.7c8-3 18.4-5.8 29.5-8.2 1.7-.4 34.4-38 35.3-40.6.3-1-10.2-1-20.8-.4z"/><path d="M322.2 24.6c-1.3.8-8.4 9.3-16 18.7-7.4 9.5-22.4 28-33.2 41.2-51 62.2-66 81.6-70.6 91-6 12-8.4 21-9 33-1.2 19.8 5 36 19 50C222 268 230 273 243 277.2c9 3 10.4 3.2 24 3.2 13.8 0 15 0 22.6-3 23.2-9 39-28.4 45-55.7 2-8.2 2-28.7.4-79.7l-2-72c-1-36.8-1.4-41.8-3-44-2-3-4.8-3.6-7.8-1.4z"/></svg>
|
|
||||||
|
Before Width: | Height: | Size: 1 KiB |
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 6.3 KiB |
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 5.4 KiB |
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 7.5 KiB |
|
|
@ -1 +0,0 @@
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 406 305" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><rect id="a" width="159.8" height="127.81" x=".196" y="5" rx="10"/><rect id="b" width="160" height="128" x=".666" y=".41" rx="10"/><rect id="c" width="160.19" height="128.19" x=".339" y=".59" rx="10"/><mask id="d" width="159.8" height="127.81" x="0" y="0" fill="#fff"><use xlink:href="#a"/></mask><mask id="e" width="160" height="128" x="0" y="0" fill="#fff"><use xlink:href="#b"/></mask><mask id="f" width="160.19" height="128.19" x="0" y="0" fill="#fff"><use xlink:href="#c"/></mask></defs><g fill="none" fill-rule="evenodd" transform="translate(12 3)"><rect width="160" height="128" x="122.08" y="146.08" fill="#f9f9f9" transform="rotate(5 202.071 210.085)" rx="10"/><g transform="rotate(15 -104.714 891.23)"><rect width="159.8" height="127.81" x="1.64" y="10.06" fill="#f9f9f9" rx="8"/><use fill="#fff" stroke="#eee" stroke-width="8" mask="url(#d)" xlink:href="#a"/><path fill="#d2caea" fill-rule="nonzero" d="M96.153 81.151a2.001 2.001 0 0 0 2.184-.496l35.956-38.34a2 2 0 1 0-2.918-2.736l-35.03 37.36-41.888-16.285a2 2 0 0 0-2.16.471l-26.368 27.16a2 2 0 1 0 2.87 2.786l25.444-26.21 41.911 16.294"/><g fill="#fff" transform="translate(24.368 36.951)"><circle cx="5.716" cy="5.104" r="5" stroke="#6b4fbb" stroke-width="4" transform="translate(65.917 34.945)"/><g stroke="#fb722e"><ellipse cx="4.632" cy="50.05" stroke-width="3.2" rx="4" ry="3.999"/><g stroke-width="4"><ellipse cx="29.632" cy="27.05" rx="4" ry="3.999"/><ellipse cx="107.63" cy="4.048" rx="4" ry="3.999"/></g></g></g></g><rect width="160.19" height="128.19" x="36.28" y="86.74" fill="#f9f9f9" transform="rotate(-5 116.372 150.825)" rx="10"/><g transform="rotate(5 -1514.687 1518.752)"><use fill="#fff" stroke="#eee" stroke-width="8" mask="url(#e)" xlink:href="#b"/><path fill="#6b4fbb" stroke="#6b4fbb" stroke-width="3.2" d="M84.67 28.41c18.225 0 33 15.07 33 33.651h-33V28.41" stroke-linecap="round" stroke-linejoin="round"/><path fill="#d2caea" fill-rule="nonzero" d="M78.67 66.41h30a2 2 0 0 1 2 2c0 18.778-15.222 34-34 34s-34-15.222-34-34 15.222-34 34-34a2 2 0 0 1 2 2v30m-32 2c0 16.569 13.431 30 30 30 15.896 0 28.905-12.364 29.934-28H76.67a2 2 0 0 1-2-2V38.476c-15.636 1.029-28 14.04-28 29.934"/></g><g transform="rotate(-5 1023.06 -299.524)"><use fill="#fff" stroke="#eee" stroke-width="8" mask="url(#f)" xlink:href="#c"/><path fill="#fef0ea" d="M42 47.391c0-.768.628-1.391 1.4-1.391h9.2c.773 0 1.4.626 1.4 1.391V97H42V47.391"/><path fill="#fb722e" d="M108 55.406c0-.777.628-1.406 1.4-1.406h9.2a1.4 1.4 0 0 1 1.4 1.406V97h-12V55.406"/><path fill="#6b4fbb" d="M64 35.404c0-.776.628-1.404 1.4-1.404h9.2a1.4 1.4 0 0 1 1.4 1.404v61.6H64v-61.6"/><path fill="#d2caea" d="M86 73.4a1.4 1.4 0 0 1 1.4-1.398h9.2c.773 0 1.4.618 1.4 1.398v23.602H86V73.4"/></g><g fill="#fee8dc"><path d="M3.592 93.86l-2.454-1.562c-.93-.592-.924-1.554 0-2.143l2.454-1.562 1.562-2.454c.592-.93 1.554-.925 2.143 0l1.562 2.454 2.454 1.562c.93.591.924 1.554 0 2.143L8.86 93.86l-1.562 2.454c-.591.93-1.554.924-2.143 0L3.592 93.86M309.489 52.07l-3.14-1.998c-1.12-.713-1.128-1.863 0-2.581l3.14-2 1.999-3.14c.713-1.12 1.863-1.127 2.58 0l2 3.14 3.14 2c1.12.713 1.128 1.863 0 2.58l-3.14 2-2 3.14c-.712 1.12-1.862 1.128-2.58 0l-1.999-3.14"/></g><path fill="#e1dcf1" d="M128.073 11.066l-1.99 3.126c-.718 1.129-1.88 1.131-2.6 0l-1.99-3.126-3.126-1.989c-1.128-.718-1.13-1.88 0-2.6l3.127-1.99 1.989-3.126c.718-1.128 1.88-1.13 2.6 0l1.99 3.126 3.126 1.99c1.128.718 1.13 1.88 0 2.6l-3.126 1.99"/><path fill="#d2caea" d="M378.07 243.068l-1.989 3.126c-.718 1.129-1.88 1.131-2.6 0l-1.99-3.126-3.126-1.989c-1.128-.718-1.13-1.88 0-2.6l3.127-1.99 1.989-3.126c.718-1.128 1.88-1.13 2.6 0l1.99 3.126 3.126 1.99c1.128.718 1.13 1.88 0 2.6l-3.126 1.99"/></g></svg>
|
|
||||||
|
Before Width: | Height: | Size: 3.7 KiB |
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 5.8 KiB |
|
|
@ -1 +0,0 @@
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 406 305" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><use id="g" xlink:href="#a"/><use id="f" xlink:href="#a"/><use id="h" xlink:href="#a"/><path id="e" d="M74 93h26v47H74z"/><path id="c" d="M74 93h26v47H74z"/><rect id="b" width="65" height="14" x="55" y="135" rx="4"/><rect id="d" width="175" height="118" rx="10"/><rect id="a" width="159" rx="10" height="56"/><rect id="i" width="160" y="2" rx="10" height="56" fill="#f9f9f9"/><mask id="q" width="65" height="14" x="0" y="0" fill="#fff"><use xlink:href="#b"/></mask><mask id="p" width="26" height="47" x="0" y="0" fill="#fff"><use xlink:href="#c"/></mask><mask id="r" width="175" height="118" x="0" y="0" fill="#fff"><use xlink:href="#d"/></mask><mask id="o" width="26" height="47" x="0" y="0" fill="#fff"><use xlink:href="#e"/></mask><mask id="k" width="159" height="56" x="0" y="0" fill="#fff"><use xlink:href="#f"/></mask><mask id="j" width="159" height="56" x="0" y="0" fill="#fff"><use xlink:href="#g"/></mask><mask id="l" width="159" height="56" x="0" y="0" fill="#fff"><use xlink:href="#h"/></mask></defs><g fill="none" fill-rule="evenodd"><g transform="translate(245 65)"><use xlink:href="#i"/><use fill="#fff" stroke="#eee" stroke-width="8" mask="url(#j)" xlink:href="#g"/><g fill-rule="nonzero"><path fill="#fb722e" d="M134 31a2 2 0 1 0 .001-3.999A2 2 0 0 0 134 31m0 4a6 6 0 1 1 0-12 6 6 0 0 1 0 12"/><path fill="#fee8dc" d="M117 31a2 2 0 1 0 .001-3.999A2 2 0 0 0 117 31m0 4a6 6 0 1 1 0-12 6 6 0 0 1 0 12m-17-4a2 2 0 1 0 .001-3.999A2 2 0 0 0 100 31m0 4a6 6 0 1 1 0-12 6 6 0 0 1 0 12"/></g><g fill="#d2caea"><rect width="50" height="4" x="19" y="20" rx="2"/><rect width="50" height="4" x="19" y="34" rx="2"/></g><g transform="translate(0 59)"><use xlink:href="#i"/><use fill="#fff" stroke="#eee" stroke-width="8" mask="url(#k)" xlink:href="#f"/><g fill-rule="nonzero"><path fill="#fee8dc" d="M134 30a2 2 0 1 0 .001-3.999A2 2 0 0 0 134 30m0 4a6 6 0 1 1 0-12 6 6 0 0 1 0 12"/><path fill="#fb722e" d="M117 30a2 2 0 1 0 .001-3.999A2 2 0 0 0 117 30m0 4a6 6 0 1 1 0-12 6 6 0 0 1 0 12"/><path fill="#fee8dc" d="M100 30a2 2 0 1 0 .001-3.999A2 2 0 0 0 100 30m0 4a6 6 0 1 1 0-12 6 6 0 0 1 0 12"/></g><rect width="50" height="4" x="19" y="19" fill="#d2caea" rx="2" id="m"/><rect width="50" height="4" x="19" y="33" fill="#d2caea" rx="2" id="n"/></g><g transform="translate(0 118)"><use xlink:href="#i"/><use fill="#fff" stroke="#eee" stroke-width="8" mask="url(#l)" xlink:href="#h"/><g fill-rule="nonzero"><path fill="#fb722e" d="M134 30a2 2 0 1 0 .001-3.999A2 2 0 0 0 134 30m0 4a6 6 0 1 1 0-12 6 6 0 0 1 0 12"/><path fill="#fee8dc" d="M117 30a2 2 0 1 0 .001-3.999A2 2 0 0 0 117 30m0 4a6 6 0 1 1 0-12 6 6 0 0 1 0 12m-17-4a2 2 0 1 0 .001-3.999A2 2 0 0 0 100 30m0 4a6 6 0 1 1 0-12 6 6 0 0 1 0 12"/></g><use xlink:href="#m"/><use xlink:href="#n"/></g></g><g fill="#eee" transform="translate(164 120)"><rect width="29" height="4" y="29" rx="2"/><rect width="28" height="4" x="55" y="29" rx="2"/></g><g transform="translate(180 120)"><circle cx="30" cy="30" r="24" fill="#fef0ea"/><g fill="#fb722e"><circle cx="30.5" cy="30.5" r="30.5" opacity=".1"/><circle cx="30.5" cy="30.5" r="19.5" opacity=".1"/></g><circle cx="30.5" cy="30.5" r="13.5" fill="#fff"/><path fill="#fb722e" d="M32.621 30.5l2.481-2.481a1.492 1.492 0 0 0-.006-2.115 1.491 1.491 0 0 0-2.115-.006L30.5 28.379l-2.481-2.481a1.492 1.492 0 0 0-2.115.006 1.491 1.491 0 0 0-.006 2.115l2.481 2.481-2.481 2.481a1.492 1.492 0 0 0 .006 2.115c.59.59 1.533.589 2.115.006l2.481-2.481 2.481 2.481c.586.586 1.529.58 2.115-.006.59-.59.589-1.533.006-2.115L32.621 30.5"/></g><g transform="translate(1 78)"><rect width="65" height="14" x="55" y="137" fill="#f9f9f9" rx="4"/><use fill="#fff" stroke="#eee" stroke-width="8" mask="url(#o)" xlink:href="#e"/><rect width="175" height="118" y="3" fill="#f9f9f9" rx="10"/><g fill="#fff" stroke="#eee" stroke-width="8"><use mask="url(#p)" xlink:href="#c"/><use mask="url(#q)" xlink:href="#b"/><use mask="url(#r)" xlink:href="#d"/></g><g fill-rule="nonzero"><path fill="#eee" d="M163 105V12H11v93h152M7 11.99A3.998 3.998 0 0 1 10.995 8h152.01A3.999 3.999 0 0 1 167 11.99v93.02a3.998 3.998 0 0 1-3.995 3.99H10.995A3.999 3.999 0 0 1 7 105.01V11.99"/><path fill="#d2caea" d="M86 92c-11.598 0-21-9.402-21-21s9.402-21 21-21 21 9.402 21 21-9.402 21-21 21m0-4c9.389 0 17-7.611 17-17s-7.611-17-17-17-17 7.611-17 17 7.611 17 17 17"/></g><path fill="#6b4fbb" d="M83 63a3.001 3.001 0 0 1 6 0v7.993a3.001 3.001 0 0 1-6 0V63m3 18.997a3 3 0 1 1 0-6 3 3 0 0 1 0 6"/><g fill="#eee"><rect width="134" height="4" x="20" y="30" rx="2"/><rect width="14" height="4" x="20" y="20" rx="2"/><circle cx="87" cy="21" r="5"/></g></g></g></svg>
|
|
||||||
|
Before Width: | Height: | Size: 4.6 KiB |
|
|
@ -1 +0,0 @@
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" width="80" height="80" viewBox="0 0 80 80"><g fill="none" fill-rule="evenodd"><path fill="#EEE" d="M44.242 59.348c-3.7 1.576-7.3 1.994-10.902.84a7.002 7.002 0 0 1-9.085-.699l-4.243-4.243a7 7 0 0 1-.238-9.649c-.701-3.024-.419-6.083.646-9.206l-6.287-2.426a5.6 5.6 0 0 1-2.274-8.824l8.233-9.811a5.6 5.6 0 0 1 6.306-1.625l8.045 3.105c.772-.797 1.564-1.6 2.374-2.41C44.841 6.376 55.265 2.135 68.09 1.677a10 10 0 0 1 1.119.023c5.507.42 9.63 5.226 9.209 10.733-.935 12.225-5.373 22.309-13.315 30.25a410.76 410.76 0 0 1-1.661 1.653l3.247 8.412a5.6 5.6 0 0 1-1.625 6.306l-9.81 8.233a5.6 5.6 0 0 1-8.825-2.274l-2.186-5.665zm-22.92-26.923l10.406-12.402-6.822-2.633a1.6 1.6 0 0 0-1.801.464l-8.233 9.811a1.6 1.6 0 0 0 .65 2.521l5.8 2.239zm26.646 25.4l2.239 5.8a1.6 1.6 0 0 0 2.521.649l9.81-8.232a1.6 1.6 0 0 0 .465-1.802l-2.633-6.822-12.402 10.406zm-19.69-5.627c8.751 8.752 16.065 5.587 33.995-12.343 7.25-7.25 11.292-16.433 12.155-27.727a6 6 0 0 0-6.196-6.454c-11.846.423-21.303 4.271-28.586 11.554-17.03 17.03-20.414 25.924-11.368 34.97z"/><path fill="#FDC4A8" fill-rule="nonzero" d="M52.54 28.376a4 4 0 1 0 5.656-5.657 4 4 0 0 0-5.657 5.657zm-2.83 2.829A8 8 0 1 1 61.025 19.89a8 8 0 0 1-11.313 11.314z"/><path fill="#FEE1D3" d="M15.063 54.54a2 2 0 0 1 0 2.828L3.749 68.68A2 2 0 1 1 .92 65.853l11.314-11.314a2 2 0 0 1 2.829 0zm9.899 9.899a2 2 0 0 1 0 2.828l-8.485 8.485a2 2 0 1 1-2.829-2.828l8.486-8.485a2 2 0 0 1 2.828 0z"/><path fill="#FDC4A8" d="M20.012 59.489a2 2 0 0 1 0 2.828L4.456 77.874a2 2 0 0 1-2.829-2.829L17.184 59.49a2 2 0 0 1 2.828 0z"/></g></svg>
|
|
||||||
|
Before Width: | Height: | Size: 1.6 KiB |
|
|
@ -1 +0,0 @@
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" width="80" height="80" viewBox="0 0 80 80"><g fill="none" fill-rule="evenodd" transform="translate(7 3)"><path fill="#EEE" fill-rule="nonzero" d="M54 18a2 2 0 1 1 0-4h4c.843 0 1.675.105 2.48.31a2 2 0 1 1-.99 3.876A6.015 6.015 0 0 0 58 18h-4zm9.735 4.228a2 2 0 0 1 3.822-1.18A10 10 0 0 1 68 24v3.513a2 2 0 1 1-4 0V24c0-.61-.09-1.204-.265-1.772zM64 35.513a2 2 0 1 1 4 0v6a2 2 0 1 1-4 0v-6zm0 14a2 2 0 1 1 4 0v6a2 2 0 1 1-4 0v-6zm0 14a2 2 0 1 1 4 0V66a9.97 9.97 0 0 1-.963 4.286 2 2 0 1 1-3.613-1.716A5.969 5.969 0 0 0 64 66v-2.487zm-5.255 8.441a2 2 0 1 1 .49 3.97c-.401.05-.806.075-1.218.076h-5.042a2 2 0 1 1 0-4h5.038c.246 0 .49-.016.732-.046zM44.975 72a2 2 0 1 1 0 4h-6a2 2 0 1 1 0-4h6zm-14 0a2 2 0 1 1 0 4H26c-.429 0-.855-.027-1.276-.08a2 2 0 0 1 .506-3.969c.254.033.51.049.77.049h4.975zm-10.438-3.514a2 2 0 1 1-3.64 1.66A9.97 9.97 0 0 1 16 66v-2.538a2 2 0 1 1 4 0V66c0 .871.185 1.713.537 2.486zM8 2a6 6 0 0 0-6 6v42a6 6 0 0 0 6 6h32a6 6 0 0 0 6-6V8a6 6 0 0 0-6-6H8zm0-4h32c5.523 0 10 4.477 10 10v42c0 5.523-4.477 10-10 10H8C2.477 60-2 55.523-2 50V8C-2 2.477 2.477-2 8-2z"/><rect width="10" height="4" x="8" y="16" fill="#EFEDF8" rx="2"/><rect width="10" height="4" x="21" y="16" fill="#6B4FBB" rx="2"/><rect width="10" height="4" x="8" y="32" fill="#E1DBF1" rx="2"/><rect width="6" height="4" x="34" y="16" fill="#EFEDF8" rx="2"/><rect width="6" height="4" x="8" y="24" fill="#6B4FBB" rx="2"/><rect width="6" height="4" x="17" y="24" fill="#EFEDF8" rx="2"/><rect width="6" height="4" x="21" y="32" fill="#6B4FBB" rx="2"/><rect width="6" height="4" x="8" y="40" fill="#6B4FBB" rx="2"/><rect width="6" height="4" x="17" y="40" fill="#EFEDF8" rx="2"/><rect width="6" height="4" x="26" y="40" fill="#C3B8E3" rx="2"/><rect width="10" height="4" x="26" y="24" fill="#C3B8E3" rx="2"/></g></svg>
|
|
||||||
|
Before Width: | Height: | Size: 1.8 KiB |
|
|
@ -1 +0,0 @@
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" width="80" height="80" viewBox="0 0 80 80"><g fill="none" fill-rule="evenodd" transform="translate(0 3)"><path fill="#EEE" fill-rule="nonzero" d="M40.843 5.864a2 2 0 1 1 .348-3.985l5.977.523a2 2 0 1 1-.348 3.985l-5.977-.523zm13.946 1.22a2 2 0 1 1 .349-3.985l5.977.523a2 2 0 1 1-.348 3.985l-5.978-.523zm13.947 1.22a2 2 0 1 1 .349-3.984 11.952 11.952 0 0 1 6.655 2.75 2 2 0 1 1-2.569 3.066 7.953 7.953 0 0 0-4.435-1.832zm7.28 7.357a2 2 0 1 1 3.99-.301c.048.639.045 1.283-.01 1.934l-.385 4.4a2 2 0 1 1-3.985-.349l.384-4.395c.037-.433.039-.863.007-1.29zm-1.088 13.654a2 2 0 0 1 3.985.348l-.523 5.978a2 2 0 1 1-3.984-.349l.522-5.977zm-1.22 13.947a2 2 0 1 1 3.985.348l-.523 5.977a2 2 0 1 1-3.985-.348l.523-5.977zM72.305 56.7a2 2 0 0 1 3.79 1.282 11.995 11.995 0 0 1-4.253 5.81 2 2 0 0 1-2.373-3.22 7.996 7.996 0 0 0 2.836-3.872zm-9.054 5.33a2 2 0 1 1-.349 3.985l-5.977-.522a2 2 0 1 1 .349-3.985l5.977.523zM32.793 10.675a2 2 0 1 1-3.675-1.579 12.02 12.02 0 0 1 4.696-5.456 2 2 0 0 1 2.112 3.397 8.02 8.02 0 0 0-3.133 3.638z"/><rect width="48" height="58" x="2" y="14" fill="#FAFAFA" rx="10"/><path fill="#EEE" fill-rule="nonzero" d="M12 16a8 8 0 0 0-8 8v38a8 8 0 0 0 8 8h28a8 8 0 0 0 8-8V24a8 8 0 0 0-8-8H12zm0-4h28c6.627 0 12 5.373 12 12v38c0 6.627-5.373 12-12 12H12C5.373 74 0 68.627 0 62V24c0-6.627 5.373-12 12-12z"/><rect width="24" height="4" x="11" y="30" fill="#E5E5E5" rx="2"/><rect width="30" height="4" x="11" y="41" fill="#E5E5E5" rx="2"/><rect width="20" height="4" x="11" y="52" fill="#E5E5E5" rx="2"/></g></svg>
|
|
||||||
|
Before Width: | Height: | Size: 1.5 KiB |
|
|
@ -1 +0,0 @@
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" width="430" height="300"><g fill="none" fill-rule="evenodd" transform="translate(35 29)"><path fill="#EEE" fill-rule="nonzero" d="M90 23a2 2 0 1 1 0-4h10a2 2 0 0 1 0 4H90zm20 0a2 2 0 0 1 0-4h10a2 2 0 0 1 0 4h-10zm20 0a2 2 0 0 1 0-4h10a2 2 0 0 1 0 4h-10zm20 0a2 2 0 0 1 0-4h10a2 2 0 0 1 0 4h-10zm20 0a2 2 0 0 1 0-4h10a2 2 0 0 1 0 4h-10zm20 0a2 2 0 0 1 0-4h10a2 2 0 0 1 0 4h-10zm20 0a2 2 0 0 1 0-4h10a2 2 0 0 1 0 4h-10zm20 0a2 2 0 0 1 0-4h10a2 2 0 0 1 0 4h-10zm20 0a2 2 0 0 1 0-4h10a2 2 0 0 1 0 4h-10zm20 0a2 2 0 0 1 0-4h10a2 2 0 0 1 0 4h-10zm20 0a2 2 0 0 1 0-4h10a2 2 0 0 1 0 4h-10zm20 0a2 2 0 0 1 0-4h10a2 2 0 0 1 0 4h-10zm20 0a2 2 0 0 1 0-4h1a11.98 11.98 0 0 1 9.457 4.612 2 2 0 0 1-3.151 2.464A7.981 7.981 0 0 0 331 23h-1zm9 11.39a2 2 0 0 1 4 0v10a2 2 0 0 1-4 0v-10zm0 180a2 2 0 1 1 4 0V223c0 .56-.038 1.114-.114 1.662a2 2 0 0 1-3.962-.55A8.21 8.21 0 0 0 339 223v-8.61zm-4.769 15.931a2 2 0 0 1 1.618 3.658A11.967 11.967 0 0 1 331 235h-5.782a2 2 0 0 1 0-4H331c1.13 0 2.224-.233 3.231-.679zm-19.013.679a2 2 0 1 1 0 4h-10a2 2 0 0 1 0-4h10zm-20 0a2 2 0 1 1 0 4h-10a2 2 0 0 1 0-4h10zm-20 0a2 2 0 1 1 0 4h-10a2 2 0 0 1 0-4h10zm-20 0a2 2 0 1 1 0 4h-10a2 2 0 0 1 0-4h10zm-20 0a2 2 0 1 1 0 4h-10a2 2 0 0 1 0-4h10zm-20 0a2 2 0 1 1 0 4h-10a2 2 0 0 1 0-4h10zm-20 0a2 2 0 1 1 0 4h-10a2 2 0 0 1 0-4h10zm-20 0a2 2 0 1 1 0 4h-10a2 2 0 0 1 0-4h10zm-20 0a2 2 0 1 1 0 4h-10a2 2 0 0 1 0-4h10zm-20 0a2 2 0 1 1 0 4h-10a2 2 0 0 1 0-4h10zM115 231a2 2 0 0 1 0 4h-10a2 2 0 0 1 0-4h10zm-26.2 4c.131-.646.2-1.315.2-2v-2h4a2 2 0 0 1 0 4h-4.2z"/><path fill="#EEE" fill-rule="nonzero" d="M103 211h258a6 6 0 0 0 6-6V63a6 6 0 0 0-6-6H166a5 5 0 0 1-5-5v-8.5a5.5 5.5 0 0 0-5.5-5.5H109a6 6 0 0 0-6 6v167zm62-167.5V52a1 1 0 0 0 1 1h195c5.523 0 10 4.477 10 10v142c0 5.523-4.477 10-10 10H99V44c0-5.523 4.477-10 10-10h46.5a9.5 9.5 0 0 1 9.5 9.5z"/><rect width="40" height="4" x="118" y="78" fill="#6B4FBB" rx="2"/><rect width="30" height="4" x="118" y="90" fill="#EFEDF8" rx="2"/><rect width="30" height="4" x="153" y="90" fill="#E1DBF1" rx="2"/><rect width="150" height="4" x="118" y="102" fill="#EFEDF8" rx="2"/><rect width="90" height="4" x="118" y="114" fill="#E1DBF1" rx="2"/><rect width="60" height="4" x="118" y="138" fill="#EFEDF8" rx="2"/><rect width="20" height="4" x="118" y="150" fill="#6B4FBB" rx="2"/><rect width="20" height="4" x="144" y="150" fill="#C3B8E3" rx="2"/><rect width="20" height="4" x="170" y="150" fill="#E1DBF1" rx="2"/><rect width="130" height="4" x="118" y="162" fill="#EFEDF8" rx="2"/><rect width="30" height="4" x="118" y="174" fill="#C3B8E3" rx="2"/><rect width="30" height="4" x="154" y="174" fill="#EFEDF8" rx="2"/><rect width="30" height="4" x="190" y="174" fill="#EFEDF8" rx="2"/><rect width="40" height="4" x="118" y="186" fill="#E1DBF1" rx="2"/><path fill="#F9F9F9" d="M89 24.292l11.434 19.326v170.326L89 226.336V24.292z"/><path fill="#EEE" fill-rule="nonzero" d="M89 229.286v-5.9l9.434-10.223V44.165L89 28.22v-7.856l13.434 22.707v171.655L89 229.286zM10 4a6 6 0 0 0-6 6v223a6 6 0 0 0 6 6h69a6 6 0 0 0 6-6V10a6 6 0 0 0-6-6H10zm0-4h69c5.523 0 10 4.477 10 10v223c0 5.523-4.477 10-10 10H10c-5.523 0-10-4.477-10-10V10C0 4.477 4.477 0 10 0z"/><circle cx="25" cy="23" r="11" fill="#FEF0E8"/><path fill="#FEE1D3" d="M46 17h16a2 2 0 1 1 0 4H46a2 2 0 1 1 0-4zm0 8h27a2 2 0 1 1 0 4H46a2 2 0 1 1 0-4z"/><path fill="#EEE" d="M16 50h4a2 2 0 0 1 2 2v4a2 2 0 0 1-2 2h-4a2 2 0 0 1-2-2v-4a2 2 0 0 1 2-2zm14 2h24a2 2 0 1 1 0 4H30a2 2 0 1 1 0-4zm-4 12h4a2 2 0 0 1 2 2v4a2 2 0 0 1-2 2h-4a2 2 0 0 1-2-2v-4a2 2 0 0 1 2-2zm14 2h24a2 2 0 1 1 0 4H40a2 2 0 1 1 0-4zM26 78h4a2 2 0 0 1 2 2v4a2 2 0 0 1-2 2h-4a2 2 0 0 1-2-2v-4a2 2 0 0 1 2-2zm14 2h24a2 2 0 1 1 0 4H40a2 2 0 1 1 0-4z"/><g transform="translate(14 110)"><rect width="8" height="8" fill="#FEE1D3" rx="2"/><rect width="28" height="4" x="14" y="2" fill="#FEF0E8" rx="2"/></g><path fill="#EEE" d="M16 140h4a2 2 0 0 1 2 2v4a2 2 0 0 1-2 2h-4a2 2 0 0 1-2-2v-4a2 2 0 0 1 2-2zm14 2h24a2 2 0 1 1 0 4H30a2 2 0 1 1 0-4zm-14 14h4a2 2 0 0 1 2 2v4a2 2 0 0 1-2 2h-4a2 2 0 0 1-2-2v-4a2 2 0 0 1 2-2zm14 2h24a2 2 0 1 1 0 4H30a2 2 0 1 1 0-4zm-14 14h4a2 2 0 0 1 2 2v4a2 2 0 0 1-2 2h-4a2 2 0 0 1-2-2v-4a2 2 0 0 1 2-2zm14 2h24a2 2 0 1 1 0 4H30a2 2 0 1 1 0-4zm-14 14h4a2 2 0 0 1 2 2v4a2 2 0 0 1-2 2h-4a2 2 0 0 1-2-2v-4a2 2 0 0 1 2-2zm14 2h24a2 2 0 1 1 0 4H30a2 2 0 1 1 0-4z"/><g transform="translate(24 124)"><rect width="8" height="8" fill="#FEE1D3" rx="2"/><rect width="28" height="4" x="14" y="2" fill="#FEF0E8" rx="2"/></g><g fill="#FC6D26" transform="translate(24 92)"><rect width="8" height="8" rx="2"/><rect width="28" height="4" x="14" y="2" rx="2"/></g><path fill="#FDC4A8" fill-rule="nonzero" d="M152 50.5a4.5 4.5 0 1 1 0-9 4.5 4.5 0 0 1 0 9zm0-3a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3z"/></g></svg>
|
|
||||||
|
Before Width: | Height: | Size: 4.6 KiB |
|
|
@ -1 +0,0 @@
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 168 107" xmlns:xlink="http://www.w3.org/1999/xlink"><g fill="#eee" fill-rule="evenodd"><path d="M4.01 2h1.102a1 1 0 0 0 0-2H4.01A4.001 4.001 0 0 0 0 4a1 1 0 0 0 2 0c0-1.108.892-2 2.01-2m12.702 0a1 1 0 0 0 0-2h-5.7a1 1 0 0 0 0 2h5.7m11.6 0a1 1 0 0 0 0-2h-5.7a1 1 0 0 0 0 2h5.7m11.6 0a1 1 0 0 0 0-2h-5.7a1 1 0 0 0 0 2h5.7m11.6 0a1 1 0 0 0 0-2h-5.7a1 1 0 0 0 0 2h5.7m11.6 0a1 1 0 0 0 0-2h-5.7a1 1 0 0 0 0 2h5.7m11.6 0a1 1 0 0 0 0-2h-5.7a1 1 0 0 0 0 2h5.7m11.6 0a1 1 0 0 0 0-2h-5.7a1 1 0 0 0 0 2h5.7m11.6 0a1 1 0 0 0 0-2h-5.7a1 1 0 0 0 0 2h5.7m11.6 0a1 1 0 0 0 0-2h-5.7a1 1 0 0 0 0 2h5.7m11.6 0a1 1 0 0 0 0-2h-5.7a1 1 0 0 0 0 2h5.7m11.6 0a1 1 0 0 0 0-2h-5.7a1 1 0 0 0 0 2h5.7m11.6 0a1 1 0 0 0 0-2h-5.7a1 1 0 0 0 0 2h5.7m11.6 0a1 1 0 0 0 0-2h-5.7a1 1 0 0 0 0 2h5.7M164 2c.822 0 1.554.503 1.86 1.254a1 1 0 1 0 1.853-.753 4.01 4.01 0 0 0-3.712-2.5h-2.188a1 1 0 0 0 0 2h2.188m2.01 12.518a1 1 0 0 0 2 0v-5.7a1 1 0 0 0-2 0v5.7m0 11.6a1 1 0 0 0 2 0v-5.7a1 1 0 0 0-2 0v5.7m0 11.6a1 1 0 0 0 2 0v-5.7a1 1 0 0 0-2 0v5.7m0 6.282c0 1.108-.892 2-2.01 2h-.72a1 1 0 0 0 0 2h.72a4.001 4.001 0 0 0 4.01-4v-.382a1 1 0 0 0-2 0v.382m-14.325 2a1 1 0 0 0 0 2h5.7a1 1 0 0 0 0-2h-5.7m-11.6 0a1 1 0 0 0 0 2h5.7a1 1 0 0 0 0-2h-5.7m-11.6 0a1 1 0 0 0 0 2h5.7a1 1 0 0 0 0-2h-5.7m-11.6 0a1 1 0 0 0 0 2h5.7a1 1 0 0 0 0-2h-5.7m-11.6 0a1 1 0 0 0 0 2h5.7a1 1 0 0 0 0-2h-5.7m-11.6 0a1 1 0 0 0 0 2h5.7a1 1 0 0 0 0-2h-5.7m-11.6 0a1 1 0 0 0 0 2h5.7a1 1 0 0 0 0-2h-5.7m-11.6 0a1 1 0 0 0 0 2h5.7a1 1 0 0 0 0-2h-5.7m-11.6 0a1 1 0 0 0 0 2h5.7a1 1 0 0 0 0-2h-5.7m-11.6 0a1 1 0 0 0 0 2h5.7a1 1 0 0 0 0-2h-5.7m-11.6 0a1 1 0 0 0 0 2h5.7a1 1 0 0 0 0-2h-5.7m-11.6 0a1 1 0 0 0 0 2h5.7a1 1 0 0 0 0-2h-5.7m-11.6 0a1 1 0 0 0 0 2h5.7a1 1 0 0 0 0-2h-5.7m-8.47 0a2.01 2.01 0 0 1-1.782-1.085 1 1 0 0 0-1.775.923 4.007 4.007 0 0 0 3.556 2.162h2.57a1 1 0 0 0 0-2h-2.57m-2.01-12.136a1 1 0 0 0-2 0v5.7a1 1 0 0 0 2 0v-5.7m0-11.6a1 1 0 0 0-2 0v5.7a1 1 0 0 0 2 0v-5.7m0-11.6a1 1 0 0 0-2 0v5.7a1 1 0 0 0 2 0v-5.7m0-6.664a1 1 0 0 0-2 0v.764a1 1 0 0 0 2 0v-.764" id="a"/><circle cx="21" cy="24" r="10"/><rect width="33" height="3" x="37" y="18" rx="1.5" id="b"/><rect width="53" height="3" x="37" y="27" rx="1.5" id="c"/><path d="M131 29c0 .552.447.999.996.999h22.01c.545 0 .996-.451.996-.999v-9a.998.998 0 0 0-.996-.999h-22.01c-.545 0-.996.451-.996.999v9m.996-12h22.01a2.998 2.998 0 0 1 2.996 2.999v9a3.003 3.003 0 0 1-2.996 2.999h-22.01A2.998 2.998 0 0 1 129 28.999v-9A3.003 3.003 0 0 1 131.996 17" id="d"/><g transform="translate(0 59)"><use xlink:href="#a"/><circle cx="21" cy="24" r="10"/><use xlink:href="#b"/><use xlink:href="#c"/><use xlink:href="#d"/></g></g></svg>
|
|
||||||
|
Before Width: | Height: | Size: 2.6 KiB |
|
|
@ -1 +0,0 @@
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" width="430" height="200" viewBox="0 0 430 200"><g fill="none" fill-rule="evenodd"><g transform="translate(138 65)"><path fill="#E5E5E5" fill-rule="nonzero" d="M35 70a2 2 0 1 1 0-4c2.542 0 5.042-.305 7.463-.904a2 2 0 1 1 .96 3.884A35.075 35.075 0 0 1 35 70zm18.21-5.105a2 2 0 1 1-2.083-3.414 31.143 31.143 0 0 0 5.896-4.664 2 2 0 1 1 2.842 2.815 35.143 35.143 0 0 1-6.654 5.263zM66.106 51.06a2 2 0 0 1-3.552-1.838 30.77 30.77 0 0 0 2.612-7.042 2 2 0 1 1 3.892.922 34.77 34.77 0 0 1-2.952 7.958zm3.816-18.433a2 2 0 1 1-3.991.268 30.873 30.873 0 0 0-1.407-7.38 2 2 0 0 1 3.808-1.223 34.873 34.873 0 0 1 1.59 8.335zm-6.346-17.842a2 2 0 0 1-3.264 2.312 31.188 31.188 0 0 0-5.054-5.564 2 2 0 0 1 2.615-3.027 35.188 35.188 0 0 1 5.703 6.279zM48.895 2.867a2 2 0 0 1-1.59 3.67 30.758 30.758 0 0 0-7.206-2.12 2 2 0 1 1 .653-3.946 34.758 34.758 0 0 1 8.143 2.396zM30.263.318a2 2 0 0 1 .537 3.964c-2.505.339-4.94.98-7.266 1.907a2 2 0 1 1-1.48-3.716A34.774 34.774 0 0 1 30.263.318zM12.907 7.853a2 2 0 0 1 2.527 3.1 31.196 31.196 0 0 0-5.213 5.416 2 2 0 0 1-3.196-2.406 35.196 35.196 0 0 1 5.882-6.11zM1.99 23.343a2 2 0 0 1 3.772 1.331 30.82 30.82 0 0 0-1.619 7.337 2 2 0 1 1-3.982-.38 34.82 34.82 0 0 1 1.829-8.289zM.719 42.086a2 2 0 1 1 3.917-.806 30.757 30.757 0 0 0 2.4 7.118 2 2 0 1 1-3.605 1.73 34.757 34.757 0 0 1-2.713-8.042zM9.393 58.86a2 2 0 0 1 2.926-2.728 31.167 31.167 0 0 0 5.751 4.841 2 2 0 1 1-2.187 3.349 35.167 35.167 0 0 1-6.49-5.462zm16.245 9.873a2 2 0 1 1 1.067-3.855 30.979 30.979 0 0 0 7.434 1.11 2 2 0 1 1-.11 3.998 34.979 34.979 0 0 1-8.391-1.253z"/><circle cx="35" cy="35" r="16" stroke="#E1DBF1" stroke-width="4"/><path fill="#6B4FBB" d="M37 33h5a2 2 0 1 1 0 4h-7a2 2 0 0 1-2-2v-8a2 2 0 1 1 4 0v6z"/></g><g transform="translate(247 30)"><rect width="116" height="135" y="5" fill="#F9F9F9" rx="10"/><rect width="116" height="134" x="5" fill="#FFF" stroke="#EEE" stroke-width="4" stroke-linecap="round" rx="10"/><g transform="translate(23 23)"><rect width="16" height="4" fill="#E1DBF1" rx="2"/><rect width="16" height="4" x="32" y="12" fill="#E1DBF1" rx="2"/><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"/><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"/><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"/><rect width="4" height="4" x="56" y="36" fill="#E1DBF1" rx="2"/><rect width="4" height="4" x="64" y="60" fill="#E1DBF1" rx="2"/><rect width="4" height="4" x="72" y="60" fill="#FC6D26" rx="2"/><rect width="8" height="4" x="32" fill="#FC6D26" rx="2"/><rect width="28" height="4" y="36" fill="#EEE" rx="2"/><rect width="28" height="4" x="44" y="48" fill="#EEE" rx="2"/><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"/><rect width="12" height="4" y="60" fill="#FEF0E8" rx="2"/><rect width="12" height="4" x="16" y="60" fill="#FEF0E8" rx="2"/></g><g transform="translate(23 95)"><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"/><rect width="8" height="4" x="20" fill="#FEE1D3" rx="2"/><rect width="8" height="4" x="38" y="12" fill="#FEF0E8" rx="2"/><rect width="8" height="4" x="64" fill="#FEF0E8" rx="2"/><rect width="8" height="4" x="32" fill="#FC6D26" rx="2"/><rect width="14" height="4" y="12" fill="#EEE" rx="2"/></g></g><path fill="#FC6D26" fill-rule="nonzero" d="M81 119c-10.493 0-19-8.507-19-19s8.507-19 19-19 19 8.507 19 19-8.507 19-19 19zm0-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 15zm-5-20a2 2 0 0 1 2 2v6a2 2 0 1 1-4 0v-6a2 2 0 0 1 2-2zm10 0a2 2 0 0 1 2 2v6a2 2 0 1 1-4 0v-6a2 2 0 0 1 2-2z"/><path fill="#E5E5E5" fill-rule="nonzero" d="M108 102c0-1.105.887-2 1.998-2h4.004c1.103 0 1.998.888 1.998 2 0 1.105-.887 2-1.998 2h-4.004a1.994 1.994 0 0 1-1.998-2zm14 0c0-1.105.887-2 1.998-2h4.004c1.103 0 1.998.888 1.998 2 0 1.105-.887 2-1.998 2h-4.004a1.994 1.994 0 0 1-1.998-2zm93 0c0-1.105.887-2 1.998-2h4.004c1.103 0 1.998.888 1.998 2 0 1.105-.887 2-1.998 2h-4.004a1.994 1.994 0 0 1-1.998-2zm14 0c0-1.105.887-2 1.998-2h4.004c1.103 0 1.998.888 1.998 2 0 1.105-.887 2-1.998 2h-4.004a1.994 1.994 0 0 1-1.998-2z"/></g></svg>
|
|
||||||
|
Before Width: | Height: | Size: 4.8 KiB |
|
|
@ -1 +0,0 @@
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 250 150"><g fill="none" fill-rule="evenodd"><g fill="#e5e5e5" transform="translate(0 102)"><rect width="74" height="4" x="34" y="21" opacity=".5" rx="2"/><path d="M152 23c0-1.105.887-2 1.998-2h4c1.104 0 1.998.888 1.998 2 0 1.105-.887 2-1.998 2h-4A1.994 1.994 0 0 1 152 23m14 0c0-1.105.887-2 1.998-2h4c1.104 0 1.998.888 1.998 2 0 1.105-.887 2-1.998 2h-4A1.994 1.994 0 0 1 166 23m14 0c0-1.105.887-2 1.998-2h4c1.104 0 1.998.888 1.998 2 0 1.105-.887 2-1.998 2h-4A1.994 1.994 0 0 1 180 23m14 0c0-1.105.887-2 1.998-2h4c1.104 0 1.998.888 1.998 2 0 1.105-.887 2-1.998 2h-4A1.994 1.994 0 0 1 194 23m14 0c0-1.105.887-2 1.998-2h4c1.104 0 1.998.888 1.998 2 0 1.105-.887 2-1.998 2h-4A1.994 1.994 0 0 1 208 23"/></g><g fill="#31af64"><path fill-rule="nonzero" d="M19 144c-10.493 0-19-8.507-19-19s8.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 127.02l-2.829-2.829a1.995 1.995 0 0 0-2.828 0 1.995 1.995 0 0 0 0 2.828l4.243 4.243a1.995 1.995 0 0 0 2.822.006l7.79-7.79a1.997 1.997 0 0 0-.006-2.823 1.992 1.992 0 0 0-2.823-.006l-6.37 6.37"/></g><g fill="#e52c5a"><path fill-rule="nonzero" d="M126 149.5c-12.979 0-23.5-10.521-23.5-23.5s10.521-23.5 23.5-23.5 23.5 10.521 23.5 23.5-10.521 23.5-23.5 23.5m0-5c10.217 0 18.5-8.283 18.5-18.5s-8.283-18.5-18.5-18.5-18.5 8.283-18.5 18.5 8.283 18.5 18.5 18.5"/><path d="M130.24 126l2.833-2.833a3 3 0 0 0-4.243-4.243l-2.833 2.833-2.833-2.833a3 3 0 0 0-4.243 4.243l2.833 2.833-2.833 2.833a3 3 0 0 0 4.243 4.243l2.833-2.833 2.833 2.833a3 3 0 0 0 4.243-4.243L130.24 126"/></g><path fill="#e5e5e5" fill-rule="nonzero" d="M236 139c-7.732 0-14-6.268-14-14s6.268-14 14-14 14 6.268 14 14-6.268 14-14 14m0-4c5.523 0 10-4.477 10-10s-4.477-10-10-10-10 4.477-10 10 4.477 10 10 10"/><g transform="translate(73 4)"><path stroke="#e5e5e5" stroke-width="4" d="M64.82 76H98c4.419 0 8-3.579 8-7.99V7.99C106 3.577 102.417 0 98 0H8.009c-4.419 0-8 3.579-8 7.99v60.02c0 4.413 3.583 7.99 8 7.99h31.935l9.263 9.855a4.357 4.357 0 0 0 6.354 0L64.824 76"/><rect width="18" height="6" x="11" y="19" fill="#fc8a51" rx="3"/><rect width="18" height="6" x="35" y="35" fill="#e52c5a" rx="3"/><rect width="18" height="6" x="29" y="51" fill="#e5e5e5" rx="3"/><rect width="12" height="6" x="35" y="19" fill="#fde5d8" rx="3"/><rect width="12" height="6" x="53" y="51" fill="#e52c5a" rx="3"/><rect width="12" height="6" x="11" y="51" fill="#b5a7dd" rx="3"/><rect width="18" height="6" x="77" y="19" fill="#fc8a51" rx="3"/><rect width="18" height="6" x="11" y="35" fill="#fde5d8" rx="3"/><rect width="6" height="6" x="53" y="19" fill="#e52c5a" rx="3"/><g fill="#fde5d8"><rect width="6" height="6" x="65" y="19" rx="3"/><rect width="6" height="6" x="71" y="35" rx="3"/></g><rect width="6" height="6" x="59" y="35" fill="#e52c5a" rx="3"/></g><path fill="#6b4fbb" fill-rule="nonzero" d="M151.869 77.403c-13.26 9.264-31.649 7.977-43.484-3.858-13.279-13.279-13.279-34.806 0-48.084 13.278-13.278 34.805-13.278 48.083 0 11.836 11.836 13.118 30.23 3.858 43.485.133.111.262.229.387.354l15.556 15.555a6.004 6.004 0 0 1 0 8.486 5.997 5.997 0 0 1-8.486 0l-15.555-15.556a6.051 6.051 0 0 1-.355-.387m-1.06-9.512c10.154-10.154 10.154-26.617 0-36.77-10.153-10.154-26.616-10.154-36.77 0-10.153 10.153-10.153 26.616 0 36.77 10.154 10.153 26.617 10.153 36.77 0"/></g></svg>
|
|
||||||
|
Before Width: | Height: | Size: 3.3 KiB |
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 6.5 KiB |
|
|
@ -1 +0,0 @@
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" width="430" height="220" viewBox="0 0 430 220"><g fill="none" fill-rule="evenodd"><path fill="#EEE" fill-rule="nonzero" d="M189.8 182l2.4-12H114c-5.523 0-10-4.477-10-10V34c0-5.523 4.477-10 10-10h200c5.523 0 10 4.477 10 10v126c0 5.523-4.477 10-10 10h-78.2l2.4 12h22.52a9.651 9.651 0 0 1 9.28 7 5.491 5.491 0 0 1-5.28 7H164.159a5.787 5.787 0 0 1-5.659-7 8.855 8.855 0 0 1 8.659-7H189.8zM114 28a6 6 0 0 0-6 6v126a6 6 0 0 0 6 6h200a6 6 0 0 0 6-6V34a6 6 0 0 0-6-6H114zm5 6h190a5 5 0 0 1 5 5v116a5 5 0 0 1-5 5H119a5 5 0 0 1-5-5V39a5 5 0 0 1 5-5zm0 4a1 1 0 0 0-1 1v116a1 1 0 0 0 1 1h190a1 1 0 0 0 1-1V39a1 1 0 0 0-1-1H119zm112.72 132h-35.44l-2.4 12h40.24l-2.4-12zm-64.561 16c-2.29 0-4.268 1.6-4.748 3.838A1.787 1.787 0 0 0 164.16 192h100.56a1.491 1.491 0 0 0 1.435-1.901A5.651 5.651 0 0 0 260.72 186h-93.561z"/><path fill="#FEF0E8" d="M177.965 99H194a2 2 0 1 1 0 4h-16.322c-1.374 6.29-6.976 11-13.678 11-6.702 0-12.304-4.71-13.678-11h-3.365l-7.395 9.249a2 2 0 0 1-3.049.089L128.11 103h-5.844a2 2 0 1 1 0-4H129a2 2 0 0 1 1.487.662l7.423 8.248 6.523-8.159a2 2 0 0 1 1.562-.751h4.04c.513-7.265 6.57-13 13.965-13 7.396 0 13.452 5.735 13.965 13zM164 110c5.523 0 10-4.477 10-10s-4.477-10-10-10-10 4.477-10 10 4.477 10 10 10z"/><path fill="#EFEDF8" d="M273.847 103c-.962 6.23-6.347 11-12.847 11-6.5 0-11.885-4.77-12.847-11H232a2 2 0 0 1 0-4h16.153c.962-6.23 6.347-11 12.847-11 6.5 0 11.885 4.77 12.847 11h3.998l8.404-9.338a2 2 0 0 1 3.048.09L296.692 99H305a2 2 0 0 1 0 4h-9.27a2 2 0 0 1-1.562-.751l-6.523-8.16-7.423 8.249a2 2 0 0 1-1.487.662h-4.888zM261 110a9 9 0 1 0 0-18 9 9 0 0 0 0 18z"/><path fill="#FEE1D3" fill-rule="nonzero" d="M213 119c-10.493 0-19-8.507-19-19s8.507-19 19-19 19 8.507 19 19-8.507 19-19 19zm0-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 15z"/><path fill="#FC6D26" d="M211.586 101.828L208.757 99a2 2 0 1 0-2.828 2.828l4.243 4.243c.39.39.902.586 1.414.586.512 0 1.023-.195 1.414-.586L220.071 99a2 2 0 1 0-2.828-2.828l-5.657 5.656z"/><path fill="#FDC4A8" d="M162.95 101.07l-1.768-1.767a1.5 1.5 0 0 0-2.121 2.121l2.828 2.829c.293.293.677.439 1.06.439.385 0 .769-.146 1.062-.44l4.242-4.242a1.5 1.5 0 1 0-2.121-2.121l-3.182 3.182z"/><path fill="#6B4FBB" d="M256.39 104.841A6 6 0 1 0 261 95v6l-4.61 3.841z"/><path fill="#FEF0E8" fill-rule="nonzero" d="M99 99h-5a2 2 0 1 0 0 4h5a2 2 0 1 0 0-4zm-16 0h-5a2 2 0 1 0 0 4h5a2 2 0 1 0 0-4zm-14.384-.078l-3.643-3.425a2 2 0 1 0-2.74 2.914l3.643 3.425a2 2 0 1 0 2.74-2.914zm-11.657-10.96l-3.642-3.425a2 2 0 1 0-2.74 2.914l3.642 3.425a2 2 0 0 0 2.74-2.914zm-11.656-10.96l-3.643-3.425a2 2 0 0 0-2.74 2.914l3.643 3.425a2 2 0 1 0 2.74-2.914zm-14.367-3.885l-3.593 3.477a2 2 0 0 0 2.782 2.875l3.593-3.477a2 2 0 0 0-2.782-2.875zM19.44 84.244l-3.593 3.477a2 2 0 1 0 2.781 2.874l3.593-3.477a2 2 0 0 0-2.781-2.874zM7.94 95.371l-3.593 3.477a2 2 0 1 0 2.782 2.874l3.593-3.477a2 2 0 1 0-2.782-2.874z"/><path fill="#E1DBF1" fill-rule="nonzero" d="M423.611 99.56l-3.598 3.472a2 2 0 0 0 2.777 2.879l3.599-3.472a2 2 0 0 0-2.778-2.878zm-11.514 11.11l-3.598 3.472a2 2 0 0 0 2.777 2.878l3.598-3.471a2 2 0 0 0-2.777-2.879zm-11.514 11.11l-3.599 3.471a2 2 0 1 0 2.778 2.879l3.598-3.472a2 2 0 1 0-2.777-2.879zm-8.799 4.48l-3.642-3.426a2 2 0 0 0-2.74 2.915l3.642 3.425a2 2 0 0 0 2.74-2.915zm-11.656-10.96l-3.643-3.426a2 2 0 1 0-2.74 2.914l3.643 3.426a2 2 0 1 0 2.74-2.915zm-11.657-10.96l-3.643-3.426a2 2 0 1 0-2.74 2.914l3.643 3.425a2 2 0 1 0 2.74-2.914zM353.001 99h-5a2 2 0 1 0 0 4h5a2 2 0 0 0 0-4zm-16 0h-5a2 2 0 1 0 0 4h5a2 2 0 0 0 0-4z"/></g></svg>
|
|
||||||
|
Before Width: | Height: | Size: 3.5 KiB |
|
|
@ -1 +0,0 @@
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" width="116" height="68" viewBox="181 0 116 68"><g fill="none" fill-rule="evenodd" transform="translate(182)"><rect width="78" height="34" x="37" y="34" fill="#FAFAFA" rx="3"/><rect width="78" height="34" x="31" y="28" fill="#FFF" stroke="#EEE" stroke-width="4" stroke-linecap="round" rx="3"/><path fill="#FFF" stroke="#FC6D26" stroke-width="3" d="M34 35.8c-.6 0-1.4 0-1.8.4L29 38.8c-1 .7-1.7.4-2-.7l-.6-4c0-.5-.5-1.2-1-1.5L22 30.2c-1-.6-1-1.5 0-2l3.7-2c.5-.2 1-.8 1.2-1.3l1-4.2c.3-1 1-1.3 2-.5l3 3c.3.3 1 .6 1.6.6l4.2-.3c1 0 1.5.7 1 1.7L38 29c-.3.6-.3 1.4 0 2l1.3 3.8c.4 1 0 1.8-1.2 1.6l-4-.6z" stroke-linecap="round"/><path fill="#FDE5D8" d="M51.6 14.3c-.2-.2-.8-.4-1-.3l-2.8.5c-.7 0-1-.4-.8-1l1-2.8V9.5L46.6 7c-.3-.7 0-1.2.8-1h2.7c.3 0 .8-.2 1-.5l2-2c.6-.5 1-.4 1.3.3l.7 2.8c0 .3.4.8.7 1l2.3 1.2c.7.3.7 1 0 1.3l-2.2 1.7-.6 1-.4 3c-.2.6-.7.8-1.3.4l-2-1.7zM5.4 43.2c-.2-.2-.5-.2-.7-.2l-1.8.3c-.6 0-1-.2-.7-.7l.7-1.8V40l-1-1.7c0-.4 0-.7.6-.7h1.8c.3 0 .6 0 .8-.2L6.5 36c.3-.3.7-.2.8.2l.5 2 .5.5 1.6.8c.3.2.3.7 0 1l-1.6 1c-.2 0-.4.4-.4.7l-.4 2c0 .3-.4.5-.8.2l-1.4-1.2zm5-34C10.2 9 10 9 9.7 9L8 9.3c-.6 0-1-.2-.7-.7L8 6.8V6L7 4.3c0-.4 0-.7.6-.7h1.8c.3 0 .6 0 .8-.2L11.5 2c.3-.3.7-.2.8.2l.5 2 .5.5 1.6.8c.3.2.3.7 0 1l-1.6 1c-.2 0-.4.4-.4.7l-.4 2c0 .3-.4.5-.8.2l-1.4-1.2z"/><rect width="52" height="4" x="43" y="38" fill="#EEE" rx="2"/><rect width="36" height="4" x="43" y="48" fill="#EEE" rx="2"/></g></svg>
|
|
||||||
|
Before Width: | Height: | Size: 1.4 KiB |
|
|
@ -1 +0,0 @@
|
||||||
<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>
|
|
||||||
|
Before Width: | Height: | Size: 1.8 KiB |
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 5.1 KiB |
|
|
@ -1 +0,0 @@
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" viewBox="0 0 121.94154 121.84154" width="121.942" height="121.842"><style id="style200">.st0{fill:#ecb32d}.st1{fill:#63c1a0}.st2{fill:#e01a59}.st3{fill:#331433}.st4{fill:#d62027}.st5{fill:#89d3df}.st6{fill:#258b74}.st7{fill:#819c3c}</style><path class="st0" d="M79.03 7.511c-1.9-5.7-8-8.8-13.7-7-5.7 1.9-8.8 8-7 13.7l28.1 86.4c1.9 5.3 7.7 8.3 13.2 6.7 5.8-1.7 9.3-7.8 7.4-13.4 0-.2-28-86.4-28-86.4z" id="path202" fill="#ecb32d"/><path class="st1" d="M35.53 21.611c-1.9-5.7-8-8.8-13.7-7-5.7 1.9-8.8 8-7 13.7l28.1 86.4c1.9 5.3 7.7 8.3 13.2 6.7 5.8-1.7 9.3-7.8 7.4-13.4 0-.2-28-86.4-28-86.4z" id="path204" fill="#63c1a0"/><path class="st2" d="M114.43 79.011c5.7-1.9 8.8-8 7-13.7-1.9-5.7-8-8.8-13.7-7l-86.5 28.2c-5.3 1.9-8.3 7.7-6.7 13.2 1.7 5.8 7.8 9.3 13.4 7.4.2 0 86.5-28.1 86.5-28.1z" id="path206" fill="#e01a59"/><path class="st3" d="M39.23 103.511c5.6-1.8 12.9-4.2 20.7-6.7-1.8-5.6-4.2-12.9-6.7-20.7l-20.7 6.7z" id="path208" fill="#331433"/><path class="st4" d="M82.83 89.311c7.8-2.5 15.1-4.9 20.7-6.7-1.8-5.6-4.2-12.9-6.7-20.7l-20.7 6.7z" id="path210" fill="#d62027"/><path class="st5" d="M100.23 35.511c5.7-1.9 8.8-8 7-13.7-1.9-5.7-8-8.8-13.7-7l-86.4 28.1c-5.3 1.9-8.3 7.7-6.7 13.2 1.7 5.8 7.8 9.3 13.4 7.4.2 0 86.4-28 86.4-28z" id="path212" fill="#89d3df"/><path class="st6" d="M25.13 59.911c5.6-1.8 12.9-4.2 20.7-6.7-2.5-7.8-4.9-15.1-6.7-20.7l-20.7 6.7z" id="path214" fill="#258b74"/><path class="st7" d="M68.63 45.811c7.8-2.5 15.1-4.9 20.7-6.7-2.5-7.8-4.9-15.1-6.7-20.7l-20.7 6.7z" id="path216" fill="#819c3c"/></svg>
|
|
||||||
|
Before Width: | Height: | Size: 1.5 KiB |
|
|
@ -1 +0,0 @@
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 293 216"><g fill="none" fill-rule="evenodd"><g transform="rotate(-5 211.388 -693.89)"><rect width="163.6" height="200" x=".2" fill="#FFF" stroke="#EEE" stroke-width="3" stroke-linecap="round" stroke-dasharray="6 9" rx="6"/><g transform="translate(24 38)"><path fill="#FC6D26" d="M18.2 14l-4-3.8c-.4-.6-1.4-.6-2 0-.6.6-.6 1.5 0 2l5 5c.3.4.6.5 1 .5s.8 0 1-.4L28 8.8c.6-.6.6-1.5 0-2-.6-.7-1.6-.7-2 0L18 14z"/><path stroke="#6B4FBB" stroke-width="3" d="M27 23.3V27c0 2.3-1.7 4-4 4H4c-2.3 0-4-1.7-4-4V8c0-2.3 1.7-4 4-4h3.8" stroke-linecap="round"/><rect width="76" height="3" x="40" y="11" fill="#6B4FBB" opacity=".5" rx="1.5"/><rect width="43" height="3" x="40" y="21" fill="#6B4FBB" opacity=".5" rx="1.5"/></g><g transform="translate(24 83)"><path fill="#FC6D26" d="M18.2 14l-4-3.8c-.4-.6-1.4-.6-2 0-.6.6-.6 1.5 0 2l5 5c.3.4.6.5 1 .5s.8 0 1-.4L28 8.8c.6-.6.6-1.5 0-2-.6-.7-1.6-.7-2 0L18 14z"/><path stroke="#6B4FBB" stroke-width="3" d="M27 23.3V27c0 2.3-1.7 4-4 4H4c-2.3 0-4-1.7-4-4V8c0-2.3 1.7-4 4-4h3.8" stroke-linecap="round"/><rect width="76" height="3" x="40" y="11" fill="#B5A7DD" rx="1.5"/><rect width="43" height="3" x="40" y="21" fill="#B5A7DD" rx="1.5"/></g><g transform="translate(24 130)"><path fill="#FC6D26" d="M18.2 14l-4-3.8c-.4-.6-1.4-.6-2 0-.6.6-.6 1.5 0 2l5 5c.3.4.6.5 1 .5s.8 0 1-.4L28 8.8c.6-.6.6-1.5 0-2-.6-.7-1.6-.7-2 0L18 14z"/><path stroke="#6B4FBB" stroke-width="3" d="M27 23.3V27c0 2.3-1.7 4-4 4H4c-2.3 0-4-1.7-4-4V8c0-2.3 1.7-4 4-4h3.8" stroke-linecap="round"/><rect width="76" height="3" x="40" y="11" fill="#B5A7DD" rx="1.5"/><rect width="43" height="3" x="40" y="21" fill="#B5A7DD" rx="1.5"/></g></g><path fill="#FFCE29" d="M30 11l-1.8 4-2-4-4-1.8 4-2 2-4 2 4 4 2M286 60l-2.7 6.3-3-6-6-3 6-3 3-6 2.8 6.2 6.6 2.8M263 97l-2 4-2-4-4-2 4-2 2-4 2 4 4 2M12 85l-2.7 6.3-3-6-6-3 6-3 3-6 2.8 6.2 6.6 2.8"/></g></svg>
|
|
||||||
|
Before Width: | Height: | Size: 1.8 KiB |
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 5.7 KiB |
|
|
@ -1 +0,0 @@
|
||||||
<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="#000" fill-opacity=".03" d="M2.12 42C2.04 43 2 44 2 45c0 20.43 16.57 37 37 37s37-16.57 37-37c0-1-.04-2-.12-3C74.35 61.03 58.42 76 39 76S3.65 61.03 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"/><path fill="#E1DBF2" fill-rule="nonzero" d="M59.65 32.65H60l-2-2.42-2 2.4-2-2.4-2 2.4-2-2.4-2 2.4-2-2.4-2 2.42h.77C45.57 34.6 46 36.75 46 39c0 2.84-.7 5.5-1.92 7.86 1.97 2.28 4.83 3.64 7.92 3.64 5.8 0 10.5-4.74 10.5-10.6 0-2.8-1.08-5.36-2.85-7.25zM43.18 29.6c2.4-2.1 5.52-3.3 8.82-3.3 7.46 0 13.5 6.1 13.5 13.6S59.46 53.5 52 53.5c-3.68 0-7.1-1.5-9.6-4.04C39.3 53.44 34.44 56 29 56c-9.4 0-17-7.6-17-17s7.6-17 17-17c3.22 0 6.23.9 8.8 2.45 2.13 1.3 3.97 3.05 5.38 5.16zM17 34c-.65 1.54-1 3.23-1 5 0 7.18 5.82 13 13 13s13-5.82 13-13c0-1.77-.35-3.46-1-5h-9c-.53 0-1.04-.2-1.4-.6L29 31.84l-1.6 1.58c-.36.4-.87.6-1.4.6h-9zm21.38-4a12.996 12.996 0 0 0-18.76 0h5.55l2.42-2.4c.74-.8 2-.8 2.8 0l2.4 2.4h5.54z"/><path fill="#6B4FBB" d="M47.6 42.32c-.66 0-1.2-.54-1.2-1.2 0-.68.54-1.22 1.2-1.22.66 0 1.2.54 1.2 1.2 0 .68-.54 1.22-1.2 1.22zm8.8 0c-.66 0-1.2-.54-1.2-1.2 0-.68.54-1.22 1.2-1.22.66 0 1.2.54 1.2 1.2 0 .68-.54 1.22-1.2 1.22zM25 44h8c0 2.2-1.8 4-4 4s-4-1.8-4-4zm-1.5-1c-.83 0-1.5-.67-1.5-1.5s.67-1.5 1.5-1.5 1.5.67 1.5 1.5-.67 1.5-1.5 1.5zm11 0c-.83 0-1.5-.67-1.5-1.5s.67-1.5 1.5-1.5 1.5.67 1.5 1.5-.67 1.5-1.5 1.5z"/></g></svg>
|
|
||||||
|
Before Width: | Height: | Size: 1.6 KiB |
|
|
@ -1 +0,0 @@
|
||||||
<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 76S3.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"/><path fill="#E1DBF2" fill-rule="nonzero" d="M30 24c-2.21 0-4 1.79-4 4v22c0 2.21 1.79 4 4 4h18c2.21 0 4-1.79 4-4V28c0-2.21-1.79-4-4-4H30zm0-4h18a8 8 0 0 1 8 8v22a8 8 0 0 1-8 8H30a8 8 0 0 1-8-8V28a8 8 0 0 1 8-8z"/><path fill="#6B4FBB" d="M33 30h8a2 2 0 1 1 0 4h-8a2 2 0 1 1 0-4zm0 7h12a2 2 0 1 1 0 4H33a2 2 0 1 1 0-4zm0 7h12a2 2 0 1 1 0 4H33a2 2 0 1 1 0-4z"/></g></svg>
|
|
||||||
|
Before Width: | Height: | Size: 843 B |
|
|
@ -1 +0,0 @@
|
||||||
<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="#000" fill-opacity=".03" d="M2.12 42C2.04 43 2 44 2 45c0 20.43 16.57 37 37 37s37-16.57 37-37c0-1-.04-2-.12-3C74.35 61.03 58.42 76 39 76S3.65 61.03 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"/><path fill="#E1DBF2" d="M44 31l-2.5-3-2.5 3-2.5-3-2.5 3-2.5-3-2.5 3h-2.72c2.65-4.2 7.36-7 12.72-7s10.07 2.8 12.72 7H49l-2.5-3-2.5 3z"/><path fill="#E1DBF2" fill-rule="nonzero" d="M39 57c-9.4 0-17-7.6-17-17s7.6-17 17-17 17 7.6 17 17-7.6 17-17 17zm0-4c7.18 0 13-5.82 13-13s-5.82-13-13-13-13 5.82-13 13 5.82 13 13 13z"/><path fill="#6B4FBB" d="M35 45h8c0 2.2-1.8 4-4 4s-4-1.8-4-4zm-1.5-2c-.83 0-1.5-.67-1.5-1.5s.67-1.5 1.5-1.5 1.5.67 1.5 1.5-.67 1.5-1.5 1.5zm11 0c-.83 0-1.5-.67-1.5-1.5s.67-1.5 1.5-1.5 1.5.67 1.5 1.5-.67 1.5-1.5 1.5z"/></g></svg>
|
|
||||||
|
Before Width: | Height: | Size: 1,017 B |
|
|
@ -1 +0,0 @@
|
||||||
<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="#000" fill-opacity=".03" d="M2.12 42C2.04 43 2 44 2 45c0 20.43 16.57 37 37 37s37-16.57 37-37c0-1-.04-2-.12-3C74.35 61.03 58.42 76 39 76S3.65 61.03 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"/><path fill="#FEE1D3" fill-rule="nonzero" d="M24.92 35.15a4.012 4.012 0 0 1-.6-5.63l1.26-1.55c1.4-1.72 3.9-2 5.63-.6l.7.56c.7-.4 1.4-.73 2.1-1V26c0-2.2 1.8-4 4-4h2c2.2 0 4 1.8 4 4v.92c.8.28 1.5.62 2.1 1l.7-.55c1.7-1.4 4.3-1.12 5.7.6l1.3 1.55c1.4 1.72 1.2 4.23-.6 5.63l-.7.6c.3.74.4 1.5.5 2.3l.9.2c2.2.5 3.5 2.64 3 4.8L56.4 45c-.5 2.15-2.64 3.5-4.8 3l-.88-.2c-.44.63-.92 1.24-1.46 1.8l.4.82c.9 1.98.1 4.38-1.9 5.35l-1.8.87c-2 .97-4.37.15-5.34-1.84l-.46-.85c-.34.03-.74.05-1.13.05-.4 0-.8-.02-1.2-.05l-.4.85c-.95 2-3.34 2.8-5.33 1.84l-1.8-.87a4.011 4.011 0 0 1-1.83-5.35l.4-.8c-.54-.58-1.02-1.2-1.46-1.83l-.8.2c-2.2.5-4.3-.9-4.8-3l-.4-2c-.5-2.2.85-4.3 3-4.8l.9-.2c.1-.8.3-1.6.5-2.3l-.7-.6zm4.95.77c-.53 1.2-.83 2.47-.87 3.8-.02.9-.66 1.68-1.55 1.9l-2.32.53.45 1.94 2.3-.6c.9-.2 1.8.2 2.23 1 .7 1.1 1.5 2.2 2.5 3 .7.6.9 1.6.5 2.4l-1 2.1 1.8.9 1.1-2.1c.4-.8 1.3-1.3 2.2-1.1.7.1 1.3.2 2 .2s1.3-.1 2-.2c.9-.2 1.8.3 2.2 1.1l1 2.1 1.8-.9-1.2-2c-.4-.8-.2-1.8.5-2.4 1-.85 1.84-1.88 2.45-3.05.4-.82 1.33-1.24 2.2-1.04l2.33.54.45-1.95-2.32-.54c-.9-.2-1.52-.97-1.54-1.88-.03-1.4-.33-2.6-.86-3.8-.4-.9-.2-1.8.5-2.4l1.9-1.5-1.3-1.6-1.8 1.5c-.8.5-1.8.6-2.5 0-1.1-.8-2.3-1.4-3.5-1.7-.9-.2-1.5-1-1.5-1.9V26h-2v2.38c0 .9-.6 1.7-1.5 1.93-1.3.4-2.5 1-3.5 1.7-.8.6-1.8.6-2.5 0l-1.9-1.5-1.26 1.6 1.8 1.5c.7.6.94 1.6.6 2.4z"/><path fill="#FC6D26" fill-rule="nonzero" d="M39 46c-3.3 0-6-2.7-6-6s2.7-6 6-6 6 2.7 6 6-2.7 6-6 6zm0-4c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2z"/></g></svg>
|
|
||||||
|
Before Width: | Height: | Size: 1.9 KiB |
|
|
@ -1 +0,0 @@
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" width="330" height="132" viewBox="0 0 330 132"><g fill="none" fill-rule="evenodd"><path fill="#000" fill-opacity=".03" d="M174.12 42c-.08 1-.12 2-.12 3 0 20.43 16.57 37 37 37s37-16.57 37-37c0-1-.04-2-.12-3-1.53 19.03-17.46 34-36.88 34s-35.35-14.97-36.88-34z"/><path fill="#EEE" fill-rule="nonzero" d="M211 78c-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-35S230.33 4 211 4s-35 15.67-35 35 15.67 35 35 35z"/><g fill-rule="nonzero"><path fill="#FEE1D3" d="M211.5 51c-6.42 0-12.26-2.84-17.43-8.4a4.008 4.008 0 0 1-.27-5.13C199 30.57 204.92 27 211.5 27s12.5 3.56 17.7 10.47a3.994 3.994 0 0 1-.27 5.12c-5.17 5.53-11 8.4-17.43 8.4zm0-4c5.25 0 10.05-2.34 14.5-7.13-4.5-5.98-9.3-8.87-14.5-8.87-5.2 0-10 2.9-14.5 8.87 4.45 4.8 9.25 7.13 14.5 7.13z"/><path fill="#FC6D26" d="M211 47c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8zm0-4c2.2 0 4-1.8 4-4s-1.8-4-4-4-4 1.8-4 4 1.8 4 4 4zm0-1c-1.66 0-3-1.34-3-3s1.34-3 3-3 3 1.34 3 3-1.34 3-3 3z"/></g><path fill="#000" fill-opacity=".03" d="M88.12 83c-.08 1-.12 2-.12 3 0 20.43 16.57 37 37 37s37-16.57 37-37c0-1-.04-2-.12-3-1.53 19.03-17.46 34-36.88 34s-35.35-14.97-36.88-34z"/><path fill="#EEE" fill-rule="nonzero" d="M125 119c-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="#FEE1D3" fill-rule="nonzero" d="M116 86.34c2.33.83 4 3.05 4 5.66 0 3.3-2.7 6-6 6s-6-2.7-6-6c0-2.6 1.67-4.83 4-5.66V72h4v14.34zM128 66c5.52 0 10 4.48 10 10v12h-4V76c0-3.3-2.7-6-6-6v1.83c0 .55-.45 1-1 1-.24 0-.47-.1-.65-.24l-4.46-3.87c-.46-.36-.5-1-.15-1.4.03-.05.07-.1.1-.12l4.47-3.82c.42-.35 1.05-.3 1.4.1.16.2.25.43.25.66V66zm-14 28c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2z"/><path fill="#FC6D26" fill-rule="nonzero" d="M114 74c-3.3 0-6-2.7-6-6s2.7-6 6-6 6 2.7 6 6-2.7 6-6 6zm0-4c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm22 28c-3.3 0-6-2.7-6-6s2.7-6 6-6 6 2.7 6 6-2.7 6-6 6zm0-4c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2z"/><path fill="#000" fill-opacity=".03" d="M2.12 52C2.04 53 2 54 2 55c0 20.43 16.57 37 37 37s37-16.57 37-37c0-1-.04-2-.12-3C74.35 71.03 58.42 86 39 86S3.65 71.03 2.12 52z"/><path fill="#EEE" fill-rule="nonzero" d="M39 88C17.46 88 0 70.54 0 49s17.46-39 39-39 39 17.46 39 39-17.46 39-39 39zm0-4c19.33 0 35-15.67 35-35S58.33 14 39 14 4 29.67 4 49s15.67 35 35 35z"/><path fill="#6B4FBB" fill-rule="nonzero" d="M48 41h-4c0-2.76-2.24-5-5-5s-5 2.24-5 5h-4a9 9 0 0 1 18 0zm-18 0h4v3h-4v-3zm14 0h4v3h-4v-3z"/><path fill="#E1DBF2" fill-rule="nonzero" d="M30 47c-.55 0-1 .45-1 1v12c0 .55.45 1 1 1h18c.55 0 1-.45 1-1V48c0-.55-.45-1-1-1H30zm0-4h18c2.76 0 5 2.24 5 5v12c0 2.76-2.24 5-5 5H30c-2.76 0-5-2.24-5-5V48c0-2.76 2.24-5 5-5z"/><path fill="#6B4FBB" d="M38 53.73c-.6-.34-1-1-1-1.73 0-1.1.9-2 2-2s2 .9 2 2c0 .74-.4 1.4-1 1.73V55c0 .55-.45 1-1 1s-1-.45-1-1v-1.27z"/><path fill="#000" fill-opacity=".03" d="M254.12 92c-.08 1-.12 2-.12 3 0 20.43 16.57 37 37 37s37-16.57 37-37c0-1-.04-2-.12-3-1.53 19.03-17.46 34-36.88 34s-35.35-14.97-36.88-34z"/><path fill="#EEE" fill-rule="nonzero" d="M291 128c-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="#6B4BBE" fill-rule="nonzero" d="M292 78c5.52 0 10 4.48 10 10 0 2.28-.76 4.43-2.14 6.18-1.03 1.3-.8 3.2.5 4.22 1.3 1.02 3.2.8 4.2-.5 2.22-2.8 3.44-6.26 3.44-9.9 0-8.84-7.16-16-16-16v-3.13c0-.2-.06-.4-.17-.56-.3-.42-.93-.54-1.38-.23l-9.2 6.13c-.1.06-.2.16-.28.27-.3.45-.18 1.08.28 1.38l9.2 6.13c.16.1.35.17.55.17.55 0 1-.45 1-1V78z"/><path fill="#E1DBF2" fill-rule="nonzero" d="M290 100c-5.52 0-10-4.48-10-10 0-2.25.74-4.38 2.1-6.12 1-1.3.77-3.2-.54-4.2-1.3-1.02-3.2-.78-4.2.53A15.796 15.796 0 0 0 274 90c0 8.84 7.16 16 16 16v3.13c0 .55.45 1 1 1 .2 0 .4-.06.55-.17l9.2-6.13c.46-.3.6-.93.28-1.38-.07-.1-.17-.2-.28-.28l-9.2-6.13c-.45-.3-1.08-.2-1.38.27-.1.2-.17.4-.17.6v3.1z"/></g></svg>
|
|
||||||
|
Before Width: | Height: | Size: 3.9 KiB |
|
|
@ -1 +0,0 @@
|
||||||
<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"/><path fill="#E1DBF2" d="M30.24 27.823A14.98 14.98 0 0 0 24 40c0 2.549.636 4.949 1.757 7.051-.297-2.684.644-4.026 2.823-4.026 3.707 0 2.462 5.365 4.473 5.761 2.01.396 4.175.396 4.267 3.29.04 1.257-.265 2.157-.917 2.7a15.095 15.095 0 0 0 8.555-1.006c.035-1.91.303-4.941 2.21-5.61 2.373-.833-.55-1.431.734-3.368 1.17-1.762-3.297-5.2 0-4.832 3.477.388 5.044-.816 6.024-1.456a14.903 14.903 0 0 0-1.373-4.94c-.873.4-2.19.465-3.702-.538-.757-.502-1.084-3.944-2.107-3.944-3.823 0-4.065 3.17-5.994 3.944-1.076.431-4.193 3.773-5.614 3.596-1.126-.14-1.071-4.417-2.45-5.166-1.359-.738-2.174-1.948-2.447-3.633zM39 59c-10.493 0-19-8.507-19-19s8.507-19 19-19 19 8.507 19 19-8.507 19-19 19z"/></g></svg>
|
|
||||||
|
Before Width: | Height: | Size: 1.1 KiB |
|
|
@ -1 +0,0 @@
|
||||||
<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 76S3.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"/><path fill="#6B4FBB" d="M33 52h12a2 2 0 1 1 0 4H33a2 2 0 1 1 0-4zm1 5h10a2 2 0 1 1 0 4H34a2 2 0 1 1 0-4z"/><path fill="#E1DBF2" fill-rule="nonzero" d="M45.542 46.932l.346-2.36a8.004 8.004 0 0 1 1.566-3.705c3.025-3.946 4.485-7.29 4.547-9.96C52.153 24.41 46.843 20 39 20c-7.777 0-13 4.374-13 11 0 2.4 1.462 5.73 4.573 9.846a8.009 8.009 0 0 1 1.536 3.683l.353 2.456 13.08-.054zm-17.038.624L28.15 45.1a3.997 3.997 0 0 0-.768-1.842C23.794 38.51 22 34.424 22 31c0-9.39 7.61-15 17-15s17.218 5.614 17 15c-.085 3.64-1.875 7.74-5.37 12.3a3.99 3.99 0 0 0-.784 1.853l-.346 2.36a4.003 4.003 0 0 1-3.942 3.42l-13.08.053a4 4 0 0 1-3.974-3.43z"/><path fill="#6B4FBB" d="M41 38.732a2 2 0 1 1 2 0V42a1 1 0 0 1-2 0v-3.268zm-6 0a2 2 0 1 1 2 0V42a1 1 0 0 1-2 0v-3.268z"/></g></svg>
|
|
||||||
|
Before Width: | Height: | Size: 1.2 KiB |
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 6 KiB |
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 5.9 KiB |
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 6 KiB |
|
|
@ -1,5 +1,6 @@
|
||||||
/* eslint-disable no-param-reassign, class-methods-use-this */
|
/* eslint-disable no-param-reassign, class-methods-use-this */
|
||||||
|
|
||||||
|
import $ from 'jquery';
|
||||||
import Cookies from 'js-cookie';
|
import Cookies from 'js-cookie';
|
||||||
import Pager from './pager';
|
import Pager from './pager';
|
||||||
import { localTimeAgo } from './lib/utils/datetime_utility';
|
import { localTimeAgo } from './lib/utils/datetime_utility';
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,5 @@
|
||||||
|
import $ from 'jquery';
|
||||||
|
|
||||||
export default class AjaxLoadingSpinner {
|
export default class AjaxLoadingSpinner {
|
||||||
static init() {
|
static init() {
|
||||||
const $elements = $('.js-ajax-loading-spinner');
|
const $elements = $('.js-ajax-loading-spinner');
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,4 @@
|
||||||
|
import $ from 'jquery';
|
||||||
import _ from 'underscore';
|
import _ from 'underscore';
|
||||||
import axios from './lib/utils/axios_utils';
|
import axios from './lib/utils/axios_utils';
|
||||||
|
|
||||||
|
|
@ -9,6 +10,9 @@ const Api = {
|
||||||
projectsPath: '/api/:version/projects.json',
|
projectsPath: '/api/:version/projects.json',
|
||||||
projectPath: '/api/:version/projects/:id',
|
projectPath: '/api/:version/projects/:id',
|
||||||
projectLabelsPath: '/:namespace_path/:project_path/labels',
|
projectLabelsPath: '/:namespace_path/:project_path/labels',
|
||||||
|
mergeRequestPath: '/api/:version/projects/:id/merge_requests/:mrid',
|
||||||
|
mergeRequestChangesPath: '/api/:version/projects/:id/merge_requests/:mrid/changes',
|
||||||
|
mergeRequestVersionsPath: '/api/:version/projects/:id/merge_requests/:mrid/versions',
|
||||||
groupLabelsPath: '/groups/:namespace_path/-/labels',
|
groupLabelsPath: '/groups/:namespace_path/-/labels',
|
||||||
licensePath: '/api/:version/templates/licenses/:key',
|
licensePath: '/api/:version/templates/licenses/:key',
|
||||||
gitignorePath: '/api/:version/templates/gitignores/:key',
|
gitignorePath: '/api/:version/templates/gitignores/:key',
|
||||||
|
|
@ -21,25 +25,27 @@ const Api = {
|
||||||
createBranchPath: '/api/:version/projects/:id/repository/branches',
|
createBranchPath: '/api/:version/projects/:id/repository/branches',
|
||||||
|
|
||||||
group(groupId, callback) {
|
group(groupId, callback) {
|
||||||
const url = Api.buildUrl(Api.groupPath)
|
const url = Api.buildUrl(Api.groupPath).replace(':id', groupId);
|
||||||
.replace(':id', groupId);
|
return axios.get(url).then(({ data }) => {
|
||||||
return axios.get(url)
|
callback(data);
|
||||||
.then(({ data }) => {
|
|
||||||
callback(data);
|
|
||||||
|
|
||||||
return data;
|
return data;
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
// Return groups list. Filtered by query
|
// Return groups list. Filtered by query
|
||||||
groups(query, options, callback = $.noop) {
|
groups(query, options, callback = $.noop) {
|
||||||
const url = Api.buildUrl(Api.groupsPath);
|
const url = Api.buildUrl(Api.groupsPath);
|
||||||
return axios.get(url, {
|
return axios
|
||||||
params: Object.assign({
|
.get(url, {
|
||||||
search: query,
|
params: Object.assign(
|
||||||
per_page: 20,
|
{
|
||||||
}, options),
|
search: query,
|
||||||
})
|
per_page: 20,
|
||||||
|
},
|
||||||
|
options,
|
||||||
|
),
|
||||||
|
})
|
||||||
.then(({ data }) => {
|
.then(({ data }) => {
|
||||||
callback(data);
|
callback(data);
|
||||||
|
|
||||||
|
|
@ -50,12 +56,13 @@ const Api = {
|
||||||
// Return namespaces list. Filtered by query
|
// Return namespaces list. Filtered by query
|
||||||
namespaces(query, callback) {
|
namespaces(query, callback) {
|
||||||
const url = Api.buildUrl(Api.namespacesPath);
|
const url = Api.buildUrl(Api.namespacesPath);
|
||||||
return axios.get(url, {
|
return axios
|
||||||
params: {
|
.get(url, {
|
||||||
search: query,
|
params: {
|
||||||
per_page: 20,
|
search: query,
|
||||||
},
|
per_page: 20,
|
||||||
})
|
},
|
||||||
|
})
|
||||||
.then(({ data }) => callback(data));
|
.then(({ data }) => callback(data));
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
@ -72,9 +79,10 @@ const Api = {
|
||||||
defaults.membership = true;
|
defaults.membership = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
return axios.get(url, {
|
return axios
|
||||||
params: Object.assign(defaults, options),
|
.get(url, {
|
||||||
})
|
params: Object.assign(defaults, options),
|
||||||
|
})
|
||||||
.then(({ data }) => {
|
.then(({ data }) => {
|
||||||
callback(data);
|
callback(data);
|
||||||
|
|
||||||
|
|
@ -84,8 +92,32 @@ const Api = {
|
||||||
|
|
||||||
// Return single project
|
// Return single project
|
||||||
project(projectPath) {
|
project(projectPath) {
|
||||||
const url = Api.buildUrl(Api.projectPath)
|
const url = Api.buildUrl(Api.projectPath).replace(':id', encodeURIComponent(projectPath));
|
||||||
.replace(':id', encodeURIComponent(projectPath));
|
|
||||||
|
return axios.get(url);
|
||||||
|
},
|
||||||
|
|
||||||
|
// Return Merge Request for project
|
||||||
|
mergeRequest(projectPath, mergeRequestId) {
|
||||||
|
const url = Api.buildUrl(Api.mergeRequestPath)
|
||||||
|
.replace(':id', encodeURIComponent(projectPath))
|
||||||
|
.replace(':mrid', mergeRequestId);
|
||||||
|
|
||||||
|
return axios.get(url);
|
||||||
|
},
|
||||||
|
|
||||||
|
mergeRequestChanges(projectPath, mergeRequestId) {
|
||||||
|
const url = Api.buildUrl(Api.mergeRequestChangesPath)
|
||||||
|
.replace(':id', encodeURIComponent(projectPath))
|
||||||
|
.replace(':mrid', mergeRequestId);
|
||||||
|
|
||||||
|
return axios.get(url);
|
||||||
|
},
|
||||||
|
|
||||||
|
mergeRequestVersions(projectPath, mergeRequestId) {
|
||||||
|
const url = Api.buildUrl(Api.mergeRequestVersionsPath)
|
||||||
|
.replace(':id', encodeURIComponent(projectPath))
|
||||||
|
.replace(':mrid', mergeRequestId);
|
||||||
|
|
||||||
return axios.get(url);
|
return axios.get(url);
|
||||||
},
|
},
|
||||||
|
|
@ -101,30 +133,30 @@ const Api = {
|
||||||
url = Api.buildUrl(Api.groupLabelsPath).replace(':namespace_path', namespacePath);
|
url = Api.buildUrl(Api.groupLabelsPath).replace(':namespace_path', namespacePath);
|
||||||
}
|
}
|
||||||
|
|
||||||
return axios.post(url, {
|
return axios
|
||||||
label: data,
|
.post(url, {
|
||||||
})
|
label: data,
|
||||||
|
})
|
||||||
.then(res => callback(res.data))
|
.then(res => callback(res.data))
|
||||||
.catch(e => callback(e.response.data));
|
.catch(e => callback(e.response.data));
|
||||||
},
|
},
|
||||||
|
|
||||||
// Return group projects list. Filtered by query
|
// Return group projects list. Filtered by query
|
||||||
groupProjects(groupId, query, callback) {
|
groupProjects(groupId, query, callback) {
|
||||||
const url = Api.buildUrl(Api.groupProjectsPath)
|
const url = Api.buildUrl(Api.groupProjectsPath).replace(':id', groupId);
|
||||||
.replace(':id', groupId);
|
return axios
|
||||||
return axios.get(url, {
|
.get(url, {
|
||||||
params: {
|
params: {
|
||||||
search: query,
|
search: query,
|
||||||
per_page: 20,
|
per_page: 20,
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
.then(({ data }) => callback(data));
|
.then(({ data }) => callback(data));
|
||||||
},
|
},
|
||||||
|
|
||||||
commitMultiple(id, data) {
|
commitMultiple(id, data) {
|
||||||
// see https://docs.gitlab.com/ce/api/commits.html#create-a-commit-with-multiple-files-and-actions
|
// see https://docs.gitlab.com/ce/api/commits.html#create-a-commit-with-multiple-files-and-actions
|
||||||
const url = Api.buildUrl(Api.commitPath)
|
const url = Api.buildUrl(Api.commitPath).replace(':id', encodeURIComponent(id));
|
||||||
.replace(':id', encodeURIComponent(id));
|
|
||||||
return axios.post(url, JSON.stringify(data), {
|
return axios.post(url, JSON.stringify(data), {
|
||||||
headers: {
|
headers: {
|
||||||
'Content-Type': 'application/json; charset=utf-8',
|
'Content-Type': 'application/json; charset=utf-8',
|
||||||
|
|
@ -135,39 +167,34 @@ const Api = {
|
||||||
branchSingle(id, branch) {
|
branchSingle(id, branch) {
|
||||||
const url = Api.buildUrl(Api.branchSinglePath)
|
const url = Api.buildUrl(Api.branchSinglePath)
|
||||||
.replace(':id', encodeURIComponent(id))
|
.replace(':id', encodeURIComponent(id))
|
||||||
.replace(':branch', branch);
|
.replace(':branch', encodeURIComponent(branch));
|
||||||
|
|
||||||
return axios.get(url);
|
return axios.get(url);
|
||||||
},
|
},
|
||||||
|
|
||||||
// Return text for a specific license
|
// Return text for a specific license
|
||||||
licenseText(key, data, callback) {
|
licenseText(key, data, callback) {
|
||||||
const url = Api.buildUrl(Api.licensePath)
|
const url = Api.buildUrl(Api.licensePath).replace(':key', key);
|
||||||
.replace(':key', key);
|
return axios
|
||||||
return axios.get(url, {
|
.get(url, {
|
||||||
params: data,
|
params: data,
|
||||||
})
|
})
|
||||||
.then(res => callback(res.data));
|
.then(res => callback(res.data));
|
||||||
},
|
},
|
||||||
|
|
||||||
gitignoreText(key, callback) {
|
gitignoreText(key, callback) {
|
||||||
const url = Api.buildUrl(Api.gitignorePath)
|
const url = Api.buildUrl(Api.gitignorePath).replace(':key', key);
|
||||||
.replace(':key', key);
|
return axios.get(url).then(({ data }) => callback(data));
|
||||||
return axios.get(url)
|
|
||||||
.then(({ data }) => callback(data));
|
|
||||||
},
|
},
|
||||||
|
|
||||||
gitlabCiYml(key, callback) {
|
gitlabCiYml(key, callback) {
|
||||||
const url = Api.buildUrl(Api.gitlabCiYmlPath)
|
const url = Api.buildUrl(Api.gitlabCiYmlPath).replace(':key', key);
|
||||||
.replace(':key', key);
|
return axios.get(url).then(({ data }) => callback(data));
|
||||||
return axios.get(url)
|
|
||||||
.then(({ data }) => callback(data));
|
|
||||||
},
|
},
|
||||||
|
|
||||||
dockerfileYml(key, callback) {
|
dockerfileYml(key, callback) {
|
||||||
const url = Api.buildUrl(Api.dockerfilePath).replace(':key', key);
|
const url = Api.buildUrl(Api.dockerfilePath).replace(':key', key);
|
||||||
return axios.get(url)
|
return axios.get(url).then(({ data }) => callback(data));
|
||||||
.then(({ data }) => callback(data));
|
|
||||||
},
|
},
|
||||||
|
|
||||||
issueTemplate(namespacePath, projectPath, key, type, callback) {
|
issueTemplate(namespacePath, projectPath, key, type, callback) {
|
||||||
|
|
@ -176,7 +203,8 @@ const Api = {
|
||||||
.replace(':type', type)
|
.replace(':type', type)
|
||||||
.replace(':project_path', projectPath)
|
.replace(':project_path', projectPath)
|
||||||
.replace(':namespace_path', namespacePath);
|
.replace(':namespace_path', namespacePath);
|
||||||
return axios.get(url)
|
return axios
|
||||||
|
.get(url)
|
||||||
.then(({ data }) => callback(null, data))
|
.then(({ data }) => callback(null, data))
|
||||||
.catch(callback);
|
.catch(callback);
|
||||||
},
|
},
|
||||||
|
|
@ -184,10 +212,13 @@ const Api = {
|
||||||
users(query, options) {
|
users(query, options) {
|
||||||
const url = Api.buildUrl(this.usersPath);
|
const url = Api.buildUrl(this.usersPath);
|
||||||
return axios.get(url, {
|
return axios.get(url, {
|
||||||
params: Object.assign({
|
params: Object.assign(
|
||||||
search: query,
|
{
|
||||||
per_page: 20,
|
search: query,
|
||||||
}, options),
|
per_page: 20,
|
||||||
|
},
|
||||||
|
options,
|
||||||
|
),
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,11 @@
|
||||||
/* eslint-disable class-methods-use-this */
|
/* eslint-disable class-methods-use-this */
|
||||||
|
|
||||||
|
import $ from 'jquery';
|
||||||
import _ from 'underscore';
|
import _ from 'underscore';
|
||||||
import Cookies from 'js-cookie';
|
import Cookies from 'js-cookie';
|
||||||
import { __ } from './locale';
|
import { __ } from './locale';
|
||||||
import { isInIssuePage, isInMRPage, hasVueMRDiscussionsCookie, updateTooltipTitle } from './lib/utils/common_utils';
|
import { updateTooltipTitle } from './lib/utils/common_utils';
|
||||||
|
import { isInVueNoteablePage } from './lib/utils/dom_utils';
|
||||||
import flash from './flash';
|
import flash from './flash';
|
||||||
import axios from './lib/utils/axios_utils';
|
import axios from './lib/utils/axios_utils';
|
||||||
|
|
||||||
|
|
@ -241,7 +244,7 @@ class AwardsHandler {
|
||||||
addAward(votesBlock, awardUrl, emoji, checkMutuality, callback) {
|
addAward(votesBlock, awardUrl, emoji, checkMutuality, callback) {
|
||||||
const isMainAwardsBlock = votesBlock.closest('.js-noteable-awards').length;
|
const isMainAwardsBlock = votesBlock.closest('.js-noteable-awards').length;
|
||||||
|
|
||||||
if (this.isInVueNoteablePage() && !isMainAwardsBlock) {
|
if (isInVueNoteablePage() && !isMainAwardsBlock) {
|
||||||
const id = votesBlock.attr('id').replace('note_', '');
|
const id = votesBlock.attr('id').replace('note_', '');
|
||||||
|
|
||||||
this.hideMenuElement($('.emoji-menu'));
|
this.hideMenuElement($('.emoji-menu'));
|
||||||
|
|
@ -293,16 +296,8 @@ class AwardsHandler {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
isVueMRDiscussions() {
|
|
||||||
return isInMRPage() && hasVueMRDiscussionsCookie() && !$('#diffs').is(':visible');
|
|
||||||
}
|
|
||||||
|
|
||||||
isInVueNoteablePage() {
|
|
||||||
return isInIssuePage() || this.isVueMRDiscussions();
|
|
||||||
}
|
|
||||||
|
|
||||||
getVotesBlock() {
|
getVotesBlock() {
|
||||||
if (this.isInVueNoteablePage()) {
|
if (isInVueNoteablePage()) {
|
||||||
const $el = $('.js-add-award.is-active').closest('.note.timeline-entry');
|
const $el = $('.js-add-award.is-active').closest('.note.timeline-entry');
|
||||||
|
|
||||||
if ($el.length) {
|
if ($el.length) {
|
||||||
|
|
|
||||||
121
app/assets/javascripts/badges/components/badge.vue
Normal file
121
app/assets/javascripts/badges/components/badge.vue
Normal file
|
|
@ -0,0 +1,121 @@
|
||||||
|
<script>
|
||||||
|
import Icon from '~/vue_shared/components/icon.vue';
|
||||||
|
import LoadingIcon from '~/vue_shared/components/loading_icon.vue';
|
||||||
|
import Tooltip from '~/vue_shared/directives/tooltip';
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: 'Badge',
|
||||||
|
components: {
|
||||||
|
Icon,
|
||||||
|
LoadingIcon,
|
||||||
|
Tooltip,
|
||||||
|
},
|
||||||
|
directives: {
|
||||||
|
Tooltip,
|
||||||
|
},
|
||||||
|
props: {
|
||||||
|
imageUrl: {
|
||||||
|
type: String,
|
||||||
|
required: true,
|
||||||
|
},
|
||||||
|
linkUrl: {
|
||||||
|
type: String,
|
||||||
|
required: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
hasError: false,
|
||||||
|
isLoading: true,
|
||||||
|
numRetries: 0,
|
||||||
|
};
|
||||||
|
},
|
||||||
|
computed: {
|
||||||
|
imageUrlWithRetries() {
|
||||||
|
if (this.numRetries === 0) {
|
||||||
|
return this.imageUrl;
|
||||||
|
}
|
||||||
|
|
||||||
|
return `${this.imageUrl}#retries=${this.numRetries}`;
|
||||||
|
},
|
||||||
|
},
|
||||||
|
watch: {
|
||||||
|
imageUrl() {
|
||||||
|
this.hasError = false;
|
||||||
|
this.isLoading = true;
|
||||||
|
this.numRetries = 0;
|
||||||
|
},
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
onError() {
|
||||||
|
this.isLoading = false;
|
||||||
|
this.hasError = true;
|
||||||
|
},
|
||||||
|
onLoad() {
|
||||||
|
this.isLoading = false;
|
||||||
|
},
|
||||||
|
reloadImage() {
|
||||||
|
this.hasError = false;
|
||||||
|
this.isLoading = true;
|
||||||
|
this.numRetries += 1;
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div>
|
||||||
|
<a
|
||||||
|
v-show="!isLoading && !hasError"
|
||||||
|
:href="linkUrl"
|
||||||
|
target="_blank"
|
||||||
|
rel="noopener noreferrer"
|
||||||
|
>
|
||||||
|
<img
|
||||||
|
class="project-badge"
|
||||||
|
:src="imageUrlWithRetries"
|
||||||
|
@load="onLoad"
|
||||||
|
@error="onError"
|
||||||
|
aria-hidden="true"
|
||||||
|
/>
|
||||||
|
</a>
|
||||||
|
|
||||||
|
<loading-icon
|
||||||
|
v-show="isLoading"
|
||||||
|
:inline="true"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<div
|
||||||
|
v-show="hasError"
|
||||||
|
class="btn-group"
|
||||||
|
>
|
||||||
|
<div class="btn btn-default btn-xs disabled">
|
||||||
|
<icon
|
||||||
|
class="prepend-left-8 append-right-8"
|
||||||
|
name="doc_image"
|
||||||
|
:size="16"
|
||||||
|
aria-hidden="true"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
class="btn btn-default btn-xs disabled"
|
||||||
|
>
|
||||||
|
<span class="prepend-left-8 append-right-8">{{ s__('Badges|No badge image') }}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<button
|
||||||
|
v-show="hasError"
|
||||||
|
class="btn btn-transparent btn-xs text-primary"
|
||||||
|
type="button"
|
||||||
|
v-tooltip
|
||||||
|
:title="s__('Badges|Reload badge image')"
|
||||||
|
@click="reloadImage"
|
||||||
|
>
|
||||||
|
<icon
|
||||||
|
name="retry"
|
||||||
|
:size="16"
|
||||||
|
/>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
219
app/assets/javascripts/badges/components/badge_form.vue
Normal file
219
app/assets/javascripts/badges/components/badge_form.vue
Normal file
|
|
@ -0,0 +1,219 @@
|
||||||
|
<script>
|
||||||
|
import _ from 'underscore';
|
||||||
|
import { mapActions, mapState } from 'vuex';
|
||||||
|
import createFlash from '~/flash';
|
||||||
|
import { s__, sprintf } from '~/locale';
|
||||||
|
import LoadingButton from '~/vue_shared/components/loading_button.vue';
|
||||||
|
import LoadingIcon from '~/vue_shared/components/loading_icon.vue';
|
||||||
|
import createEmptyBadge from '../empty_badge';
|
||||||
|
import Badge from './badge.vue';
|
||||||
|
|
||||||
|
const badgePreviewDelayInMilliseconds = 1500;
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: 'BadgeForm',
|
||||||
|
components: {
|
||||||
|
Badge,
|
||||||
|
LoadingButton,
|
||||||
|
LoadingIcon,
|
||||||
|
},
|
||||||
|
props: {
|
||||||
|
isEditing: {
|
||||||
|
type: Boolean,
|
||||||
|
required: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
computed: {
|
||||||
|
...mapState([
|
||||||
|
'badgeInAddForm',
|
||||||
|
'badgeInEditForm',
|
||||||
|
'docsUrl',
|
||||||
|
'isRendering',
|
||||||
|
'isSaving',
|
||||||
|
'renderedBadge',
|
||||||
|
]),
|
||||||
|
badge() {
|
||||||
|
if (this.isEditing) {
|
||||||
|
return this.badgeInEditForm;
|
||||||
|
}
|
||||||
|
|
||||||
|
return this.badgeInAddForm;
|
||||||
|
},
|
||||||
|
canSubmit() {
|
||||||
|
return (
|
||||||
|
this.badge !== null &&
|
||||||
|
this.badge.imageUrl &&
|
||||||
|
this.badge.imageUrl.trim() !== '' &&
|
||||||
|
this.badge.linkUrl &&
|
||||||
|
this.badge.linkUrl.trim() !== '' &&
|
||||||
|
!this.isSaving
|
||||||
|
);
|
||||||
|
},
|
||||||
|
helpText() {
|
||||||
|
const placeholders = ['project_path', 'project_id', 'default_branch', 'commit_sha']
|
||||||
|
.map(placeholder => `<code>%{${placeholder}}</code>`)
|
||||||
|
.join(', ');
|
||||||
|
return sprintf(
|
||||||
|
s__('Badges|The %{docsLinkStart}variables%{docsLinkEnd} GitLab supports: %{placeholders}'),
|
||||||
|
{
|
||||||
|
docsLinkEnd: '</a>',
|
||||||
|
docsLinkStart: `<a href="${_.escape(this.docsUrl)}">`,
|
||||||
|
placeholders,
|
||||||
|
},
|
||||||
|
false,
|
||||||
|
);
|
||||||
|
},
|
||||||
|
renderedImageUrl() {
|
||||||
|
return this.renderedBadge ? this.renderedBadge.renderedImageUrl : '';
|
||||||
|
},
|
||||||
|
renderedLinkUrl() {
|
||||||
|
return this.renderedBadge ? this.renderedBadge.renderedLinkUrl : '';
|
||||||
|
},
|
||||||
|
imageUrl: {
|
||||||
|
get() {
|
||||||
|
return this.badge ? this.badge.imageUrl : '';
|
||||||
|
},
|
||||||
|
set(imageUrl) {
|
||||||
|
const badge = this.badge || createEmptyBadge();
|
||||||
|
this.updateBadgeInForm({
|
||||||
|
...badge,
|
||||||
|
imageUrl,
|
||||||
|
});
|
||||||
|
},
|
||||||
|
},
|
||||||
|
linkUrl: {
|
||||||
|
get() {
|
||||||
|
return this.badge ? this.badge.linkUrl : '';
|
||||||
|
},
|
||||||
|
set(linkUrl) {
|
||||||
|
const badge = this.badge || createEmptyBadge();
|
||||||
|
this.updateBadgeInForm({
|
||||||
|
...badge,
|
||||||
|
linkUrl,
|
||||||
|
});
|
||||||
|
},
|
||||||
|
},
|
||||||
|
submitButtonLabel() {
|
||||||
|
if (this.isEditing) {
|
||||||
|
return s__('Badges|Save changes');
|
||||||
|
}
|
||||||
|
return s__('Badges|Add badge');
|
||||||
|
},
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
...mapActions(['addBadge', 'renderBadge', 'saveBadge', 'stopEditing', 'updateBadgeInForm']),
|
||||||
|
debouncedPreview: _.debounce(function preview() {
|
||||||
|
this.renderBadge();
|
||||||
|
}, badgePreviewDelayInMilliseconds),
|
||||||
|
onCancel() {
|
||||||
|
this.stopEditing();
|
||||||
|
},
|
||||||
|
onSubmit() {
|
||||||
|
if (!this.canSubmit) {
|
||||||
|
return Promise.resolve();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.isEditing) {
|
||||||
|
return this.saveBadge()
|
||||||
|
.then(() => {
|
||||||
|
createFlash(s__('Badges|The badge was saved.'), 'notice');
|
||||||
|
})
|
||||||
|
.catch(error => {
|
||||||
|
createFlash(
|
||||||
|
s__('Badges|Saving the badge failed, please check the entered URLs and try again.'),
|
||||||
|
);
|
||||||
|
throw error;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return this.addBadge()
|
||||||
|
.then(() => {
|
||||||
|
createFlash(s__('Badges|A new badge was added.'), 'notice');
|
||||||
|
})
|
||||||
|
.catch(error => {
|
||||||
|
createFlash(
|
||||||
|
s__('Badges|Adding the badge failed, please check the entered URLs and try again.'),
|
||||||
|
);
|
||||||
|
throw error;
|
||||||
|
});
|
||||||
|
},
|
||||||
|
},
|
||||||
|
badgeImageUrlPlaceholder:
|
||||||
|
'https://example.gitlab.com/%{project_path}/badges/%{default_branch}/<badge>.svg',
|
||||||
|
badgeLinkUrlPlaceholder: 'https://example.gitlab.com/%{project_path}',
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<form
|
||||||
|
class="prepend-top-default append-bottom-default"
|
||||||
|
@submit.prevent.stop="onSubmit"
|
||||||
|
>
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="badge-link-url">{{ s__('Badges|Link') }}</label>
|
||||||
|
<input
|
||||||
|
id="badge-link-url"
|
||||||
|
type="text"
|
||||||
|
class="form-control"
|
||||||
|
v-model="linkUrl"
|
||||||
|
:placeholder="$options.badgeLinkUrlPlaceholder"
|
||||||
|
@input="debouncedPreview"
|
||||||
|
/>
|
||||||
|
<span
|
||||||
|
class="help-block"
|
||||||
|
v-html="helpText"
|
||||||
|
></span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="badge-image-url">{{ s__('Badges|Badge image URL') }}</label>
|
||||||
|
<input
|
||||||
|
id="badge-image-url"
|
||||||
|
type="text"
|
||||||
|
class="form-control"
|
||||||
|
v-model="imageUrl"
|
||||||
|
:placeholder="$options.badgeImageUrlPlaceholder"
|
||||||
|
@input="debouncedPreview"
|
||||||
|
/>
|
||||||
|
<span
|
||||||
|
class="help-block"
|
||||||
|
v-html="helpText"
|
||||||
|
></span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="badge-preview">{{ s__('Badges|Badge image preview') }}</label>
|
||||||
|
<badge
|
||||||
|
id="badge-preview"
|
||||||
|
v-show="renderedBadge && !isRendering"
|
||||||
|
:image-url="renderedImageUrl"
|
||||||
|
:link-url="renderedLinkUrl"
|
||||||
|
/>
|
||||||
|
<p v-show="isRendering">
|
||||||
|
<loading-icon
|
||||||
|
:inline="true"
|
||||||
|
/>
|
||||||
|
</p>
|
||||||
|
<p
|
||||||
|
v-show="!renderedBadge && !isRendering"
|
||||||
|
class="disabled-content"
|
||||||
|
>{{ s__('Badges|No image to preview') }}</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="row-content-block">
|
||||||
|
<loading-button
|
||||||
|
type="submit"
|
||||||
|
container-class="btn btn-success"
|
||||||
|
:disabled="!canSubmit"
|
||||||
|
:loading="isSaving"
|
||||||
|
:label="submitButtonLabel"
|
||||||
|
/>
|
||||||
|
<button
|
||||||
|
class="btn btn-cancel"
|
||||||
|
type="button"
|
||||||
|
v-if="isEditing"
|
||||||
|
@click="onCancel"
|
||||||
|
>{{ __('Cancel') }}</button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</template>
|
||||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue