Skip to content

G
gitlab-ce
Commit dbe9e0df authored by Grzegorz Bizon's avatar Grzegorz Bizon
Browse files
Options

Merge branch 'master' into feature/gb/variables-expressions-in-only-except 

* master: (199 commits)

Conflicts:
	lib/gitlab/ci/pipeline/seed/stage.rb
parents 1c2530de ab8f13c3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 17570 additions and 3256 deletions
.babelrc
View file @ dbe9e0df
{ {
"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"
}
]
] ]
} }
} }
......
.eslintignore
View file @ dbe9e0df
/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
.gitlab-ci.yml
View file @ dbe9e0df
...@@ -544,7 +544,7 @@ migration:path-mysql: ...@@ -544,7 +544,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:
......
.prettierignore 0 → 100644
View file @ dbe9e0df
/app/assets/javascripts/locale/**/app.js
/node_modules/
/public/
/vendor/
/tmp/
.prettierrc
View file @ dbe9e0df
{ {
"printWidth": 100,
"singleQuote": true, "singleQuote": true,
"trailingComma": "all" "trailingComma": "es5",
"overrides": [
{
"files": ["**/app/**/*", "**/spec/**/*"],
"options": {
"trailingComma": "all"
}
}
]
} }
.rubocop.yml
View file @ dbe9e0df
...@@ -118,6 +118,9 @@ Gitlab/ModuleWithInstanceVariables: ...@@ -118,6 +118,9 @@ Gitlab/ModuleWithInstanceVariables:
- spec/support/**/*.rb - spec/support/**/*.rb
- features/steps/**/*.rb - features/steps/**/*.rb
Gitlab/HTTParty:
Enabled: true
GitlabSecurity/PublicSend: GitlabSecurity/PublicSend:
Enabled: true Enabled: true
Exclude: Exclude:
......
CHANGELOG.md
View file @ dbe9e0df
This diff is collapsed.
Gemfile
View file @ dbe9e0df
# --- 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['html-pipeline'] = rails5? ? '~> 2.6.0' : '~> 1.11.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,7 +22,7 @@ gem 'responders', '~> 2.0' ...@@ -9,7 +22,7 @@ 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
...@@ -22,10 +35,10 @@ gem 'faraday', '~> 0.12' ...@@ -22,10 +35,10 @@ 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', '~> 1.4.1' 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'
...@@ -34,9 +47,9 @@ gem 'omniauth-gitlab', '~> 1.0.2' ...@@ -34,9 +47,9 @@ gem 'omniauth-gitlab', '~> 1.0.2'
gem 'omniauth-google-oauth2', '~> 0.5.2' gem 'omniauth-google-oauth2', '~> 0.5.2'
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.10.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'
...@@ -113,7 +126,7 @@ gem 'fog-rackspace', '~> 0.1.1' ...@@ -113,7 +126,7 @@ 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 +135,7 @@ gem 'unf', '~> 0.1.4' ...@@ -122,7 +135,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', gem_versions['html-pipeline']
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'
...@@ -149,7 +162,7 @@ group :unicorn do ...@@ -149,7 +162,7 @@ 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', '~> 5.0' gem 'acts-as-taggable-on', '~> 5.0'
...@@ -218,10 +231,10 @@ gem 'sanitize', '~> 2.0' ...@@ -218,10 +231,10 @@ gem 'sanitize', '~> 2.0'
gem 'babosa', '~> 1.0.2' gem 'babosa', '~> 1.0.2'
# Sanitizes SVG input # Sanitizes SVG input
gem 'loofah', '~> 2.0.3' 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 +248,6 @@ gem 'mousetrap-rails', '~> 1.4.6' ...@@ -235,9 +248,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'
...@@ -269,9 +279,9 @@ gem 'premailer-rails', '~> 1.9.7' ...@@ -269,9 +279,9 @@ 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'
...@@ -279,7 +289,6 @@ gem 'batch-loader', '~> 1.2.1' ...@@ -279,7 +289,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
...@@ -361,7 +370,7 @@ group :development, :test do ...@@ -361,7 +370,7 @@ group :development, :test do
gem 'license_finder', '~> 3.1', require: false gem 'license_finder', '~> 3.1', require: false
gem 'knapsack', '~> 1.16' 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
......
Gemfile.lock
View file @ dbe9e0df
...@@ -47,6 +47,7 @@ GEM ...@@ -47,6 +47,7 @@ GEM
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)
...@@ -86,7 +87,7 @@ GEM ...@@ -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)
...@@ -142,6 +143,7 @@ GEM ...@@ -142,6 +143,7 @@ GEM
connection_pool (2.2.1) connection_pool (2.2.1)
crack (0.4.3) crack (0.4.3)
safe_yaml (~> 1.0.0) safe_yaml (~> 1.0.0)
crass (1.0.3)
creole (0.5.0) creole (0.5.0)
css_parser (1.5.0) css_parser (1.5.0)
addressable addressable
...@@ -176,10 +178,10 @@ GEM ...@@ -176,10 +178,10 @@ GEM
docile (1.1.5) docile (1.1.5)
domain_name (0.5.20170404) domain_name (0.5.20170404)
unf (>= 0.0.5, < 1.0.0) unf (>= 0.0.5, < 1.0.0)
doorkeeper (4.2.6) doorkeeper (4.3.1)
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)
...@@ -210,7 +212,7 @@ GEM ...@@ -210,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)
...@@ -276,12 +278,12 @@ GEM ...@@ -276,12 +278,12 @@ 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)
...@@ -335,9 +337,9 @@ GEM ...@@ -335,9 +337,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)
...@@ -355,7 +357,7 @@ GEM ...@@ -355,7 +357,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)
...@@ -414,7 +416,7 @@ GEM ...@@ -414,7 +416,7 @@ GEM
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.5) i18n (0.9.5)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
ice_nine (0.11.2) ice_nine (0.11.2)
...@@ -428,10 +430,10 @@ GEM ...@@ -428,10 +430,10 @@ GEM
oauth (~> 0.5, >= 0.5.0) oauth (~> 0.5, >= 0.5.0)
jquery-atwho-rails (1.3.2) jquery-atwho-rails (1.3.2)
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)
...@@ -473,7 +475,7 @@ GEM ...@@ -473,7 +475,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)
...@@ -484,7 +486,8 @@ GEM ...@@ -484,7 +486,8 @@ GEM
actionpack (>= 4, < 5.2) actionpack (>= 4, < 5.2)
activesupport (>= 4, < 5.2) activesupport (>= 4, < 5.2)
railties (>= 4, < 5.2) railties (>= 4, < 5.2)
loofah (2.0.3) loofah (2.2.2)
crass (~> 1.0.2)
nokogiri (>= 1.5.9) nokogiri (>= 1.5.9)
mail (2.7.0) mail (2.7.0)
mini_mime (>= 0.1.1) mini_mime (>= 0.1.1)
...@@ -497,14 +500,14 @@ GEM ...@@ -497,14 +500,14 @@ 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)
...@@ -514,7 +517,7 @@ GEM ...@@ -514,7 +517,7 @@ GEM
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)
...@@ -523,12 +526,11 @@ GEM ...@@ -523,12 +526,11 @@ GEM
rack (>= 1.2, < 3) rack (>= 1.2, < 3)
octokit (4.8.0) 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.3) hashie (>= 3.4.6, < 3.6.0)
hashie (>= 1.2, < 4)
rack (>= 1.6.2, < 3) rack (>= 1.6.2, < 3)
omniauth-auth0 (1.4.1) omniauth-auth0 (2.0.0)
omniauth-oauth2 (~> 1.1) omniauth-oauth2 (~> 1.4)
omniauth-authentiq (0.3.1) omniauth-authentiq (0.3.1)
omniauth-oauth2 (~> 1.3, >= 1.3.1) omniauth-oauth2 (~> 1.3, >= 1.3.1)
omniauth-azure-oauth2 (0.0.9) omniauth-azure-oauth2 (0.0.9)
...@@ -570,9 +572,9 @@ GEM ...@@ -570,9 +572,9 @@ GEM
ruby-saml (~> 1.7) 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)
...@@ -593,8 +595,6 @@ GEM ...@@ -593,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
...@@ -658,7 +658,7 @@ GEM ...@@ -658,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
...@@ -677,12 +677,12 @@ GEM ...@@ -677,12 +677,12 @@ 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.3) rails-html-sanitizer (1.0.4)
loofah (~> 2.0) loofah (~> 2.2, >= 2.2.2)
rails-i18n (4.0.9) rails-i18n (4.0.9)
i18n (~> 0.7) i18n (~> 0.7)
railties (~> 4.0) railties (~> 4.0)
...@@ -897,13 +897,13 @@ GEM ...@@ -897,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
...@@ -1030,8 +1030,8 @@ DEPENDENCIES ...@@ -1030,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)
...@@ -1057,7 +1057,7 @@ DEPENDENCIES ...@@ -1057,7 +1057,7 @@ DEPENDENCIES
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.88.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)
...@@ -1067,7 +1067,7 @@ DEPENDENCIES ...@@ -1067,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)
...@@ -1093,9 +1093,9 @@ DEPENDENCIES ...@@ -1093,9 +1093,9 @@ DEPENDENCIES
kubeclient (~> 3.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.0.3) loofah (~> 2.2)
mail_room (~> 0.9.1) mail_room (~> 0.9.1)
method_source (~> 0.8) method_source (~> 0.8)
minitest (~> 5.7.0) minitest (~> 5.7.0)
...@@ -1106,9 +1106,8 @@ DEPENDENCIES ...@@ -1106,9 +1106,8 @@ DEPENDENCIES
nokogiri (~> 1.8.2) nokogiri (~> 1.8.2)
oauth2 (~> 1.4) oauth2 (~> 1.4)
octokit (~> 4.8) octokit (~> 4.8)
oj (~> 2.17.4) omniauth (~> 1.8)
omniauth (~> 1.4.2) omniauth-auth0 (~> 2.0.0)
omniauth-auth0 (~> 1.4.1)
omniauth-authentiq (~> 0.3.1) omniauth-authentiq (~> 0.3.1)
omniauth-azure-oauth2 (~> 0.0.9) omniauth-azure-oauth2 (~> 0.0.9)
omniauth-cas3 (~> 1.1.4) omniauth-cas3 (~> 1.1.4)
...@@ -1118,14 +1117,13 @@ DEPENDENCIES ...@@ -1118,14 +1117,13 @@ DEPENDENCIES
omniauth-google-oauth2 (~> 0.5.2) omniauth-google-oauth2 (~> 0.5.2)
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.10.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)
...@@ -1196,7 +1194,7 @@ DEPENDENCIES ...@@ -1196,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)
......
Gemfile.rails5 0 → 100644
View file @ dbe9e0df
# BUNDLE_GEMFILE=Gemfile.rails5 bundle install
ENV["RAILS5"] = "true"
gemfile = File.expand_path("../Gemfile", __FILE__)
eval(File.read(gemfile), nil, gemfile)
Gemfile.rails5.lock 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
Procfile
View file @ dbe9e0df
...@@ -4,4 +4,3 @@ ...@@ -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
VERSION
View file @ dbe9e0df
10.6.0-pre 10.7.0-pre
app/assets/javascripts/behaviors/index.js
View file @ dbe9e0df
import './autosize'; import './autosize';
import './bind_in_out'; import './bind_in_out';
import initCopyAsGFM from './copy_as_gfm'; import './markdown/render_gfm';
import initCopyAsGFM from './markdown/copy_as_gfm';
import initCopyToClipboard from './copy_to_clipboard'; import initCopyToClipboard from './copy_to_clipboard';
import './details_behavior'; import './details_behavior';
import installGlEmojiElement from './gl_emoji'; import installGlEmojiElement from './gl_emoji';
......
app/assets/javascripts/behaviors/copy_as_gfm.js → app/assets/javascripts/behaviors/markdown/copy_as_gfm.js
View file @ dbe9e0df
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
import $ from 'jquery'; import $ from 'jquery';
import _ from 'underscore'; import _ from 'underscore';
import { insertText, getSelectedFragment, nodeMatchesSelector } from '../lib/utils/common_utils'; import { insertText, getSelectedFragment, nodeMatchesSelector } from '~/lib/utils/common_utils';
import { placeholderImage } from '../lazy_loader'; import { placeholderImage } from '~/lazy_loader';
const gfmRules = { const gfmRules = {
// The filters referenced in lib/banzai/pipeline/gfm_pipeline.rb convert // The filters referenced in lib/banzai/pipeline/gfm_pipeline.rb convert
......
app/assets/javascripts/render_gfm.js → app/assets/javascripts/behaviors/markdown/render_gfm.js
View file @ dbe9e0df
import $ from 'jquery'; import $ from 'jquery';
import syntaxHighlight from '~/syntax_highlight';
import renderMath from './render_math'; import renderMath from './render_math';
import renderMermaid from './render_mermaid'; import renderMermaid from './render_mermaid';
import syntaxHighlight from './syntax_highlight';
// Render Gitlab flavoured Markdown // Render Gitlab flavoured Markdown
// //
......
app/assets/javascripts/render_math.js → app/assets/javascripts/behaviors/markdown/render_math.js
View file @ dbe9e0df
import $ from 'jquery'; import $ from 'jquery';
import { __ } from './locale'; import { __ } from '~/locale';
import flash from './flash'; import flash from '~/flash';
// Renders math using KaTeX in any element with the // Renders math using KaTeX in any element with the
// `js-render-math` class // `js-render-math` class
......
app/assets/javascripts/render_mermaid.js → app/assets/javascripts/behaviors/markdown/render_mermaid.js
View file @ dbe9e0df
import flash from '~/flash';
// Renders diagrams and flowcharts from text using Mermaid in any element with the // Renders diagrams and flowcharts from text using Mermaid in any element with the
// `js-render-mermaid` class. // `js-render-mermaid` class.
// //
...@@ -12,8 +14,6 @@ ...@@ -12,8 +14,6 @@
// </pre> // </pre>
// //
import Flash from './flash';
export default function renderMermaid($els) { export default function renderMermaid($els) {
if (!$els.length) return; if (!$els.length) return;
...@@ -52,6 +52,6 @@ export default function renderMermaid($els) { ...@@ -52,6 +52,6 @@ export default function renderMermaid($els) {
}); });
}); });
}).catch((err) => { }).catch((err) => {
Flash(`Can't load mermaid module: ${err}`); flash(`Can't load mermaid module: ${err}`);
}); });
} }
app/assets/javascripts/boards/components/issue_card_inner.js
View file @ dbe9e0df
import $ from 'jquery'; import $ from 'jquery';
import Vue from 'vue'; import Vue from 'vue';
import userAvatarLink from '../../vue_shared/components/user_avatar/user_avatar_link.vue'; import UserAvatarLink from '../../vue_shared/components/user_avatar/user_avatar_link.vue';
import eventHub from '../eventhub'; import eventHub from '../eventhub';
const Store = gl.issueBoards.BoardsStore; const Store = gl.issueBoards.BoardsStore;
...@@ -45,7 +45,7 @@ gl.issueBoards.IssueCardInner = Vue.extend({ ...@@ -45,7 +45,7 @@ gl.issueBoards.IssueCardInner = Vue.extend({
}; };
}, },
components: { components: {
userAvatarLink, UserAvatarLink,
}, },
computed: { computed: {
numberOverLimit() { numberOverLimit() {
......
app/assets/javascripts/ci_variable_list/ci_variable_list.js
View file @ dbe9e0df
...@@ -33,7 +33,7 @@ export default class VariableList { ...@@ -33,7 +33,7 @@ export default class VariableList {
selector: '.js-ci-variable-input-key', selector: '.js-ci-variable-input-key',
default: '', default: '',
}, },
value: { secret_value: {
selector: '.js-ci-variable-input-value', selector: '.js-ci-variable-input-value',
default: '', default: '',
}, },
...@@ -105,7 +105,7 @@ export default class VariableList { ...@@ -105,7 +105,7 @@ export default class VariableList {
setupToggleButtons($row[0]); setupToggleButtons($row[0]);
// Reset the resizable textarea // Reset the resizable textarea
$row.find(this.inputMap.value.selector).css('height', ''); $row.find(this.inputMap.secret_value.selector).css('height', '');
const $environmentSelect = $row.find('.js-variable-environment-toggle'); const $environmentSelect = $row.find('.js-variable-environment-toggle');
if ($environmentSelect.length) { if ($environmentSelect.length) {
......
app/assets/javascripts/commons/polyfills.js
View file @ dbe9e0df
// ECMAScript polyfills // ECMAScript polyfills
import 'core-js/fn/array/fill';
import 'core-js/fn/array/find'; import 'core-js/fn/array/find';
import 'core-js/fn/array/find-index'; import 'core-js/fn/array/find-index';
import 'core-js/fn/array/from'; import 'core-js/fn/array/from';
......
app/assets/javascripts/confirm_danger_modal.js
View file @ dbe9e0df
/* eslint-disable func-names, space-before-function-paren, wrap-iife, one-var, no-var, camelcase, one-var-declaration-per-line, no-else-return, max-len */
import $ from 'jquery'; import $ from 'jquery';
import { rstrip } from './lib/utils/common_utils'; import { rstrip } from './lib/utils/common_utils';
window.ConfirmDangerModal = (function() { function openConfirmDangerModal($form, text) {
function ConfirmDangerModal(form, text) { $('.js-confirm-text').text(text || '');
var project_path, submit; $('.js-confirm-danger-input').val('');
this.form = form; $('#modal-confirm-danger').modal('show');
$('.js-confirm-text').text(text || '');
$('.js-confirm-danger-input').val(''); const confirmTextMatch = $('.js-confirm-danger-match').text();
$('#modal-confirm-danger').modal('show'); const $submit = $('.js-confirm-danger-submit');
project_path = $('.js-confirm-danger-match').text(); $submit.disable();
submit = $('.js-confirm-danger-submit');
submit.disable(); $('.js-confirm-danger-input').off('input').on('input', function handleInput() {
$('.js-confirm-danger-input').off('input'); const confirmText = rstrip($(this).val());
$('.js-confirm-danger-input').on('input', function() { if (confirmText === confirmTextMatch) {
if (rstrip($(this).val()) === project_path) { $submit.enable();
return submit.enable(); } else {
} else { $submit.disable();
return submit.disable(); }
} });
}); $('.js-confirm-danger-submit').off('click').on('click', () => $form.submit());
$('.js-confirm-danger-submit').off('click'); }
$('.js-confirm-danger-submit').on('click', (function(_this) {
return function() {
return _this.form.submit();
};
})(this));
}
return ConfirmDangerModal; export default function initConfirmDangerModal() {
})(); $(document).on('click', '.js-confirm-danger', (e) => {
e.preventDefault();
const $btn = $(e.target);
const $form = $btn.closest('form');
const text = $btn.data('confirmDangerMessage');
openConfirmDangerModal($form, text);
});
}
app/assets/javascripts/dispatcher.js
View file @ dbe9e0df
...@@ -53,8 +53,12 @@ function initPageShortcuts(page) { ...@@ -53,8 +53,12 @@ function initPageShortcuts(page) {
function initGFMInput() { function initGFMInput() {
$('.js-gfm-input:not(.js-vue-textarea)').each((i, el) => { $('.js-gfm-input:not(.js-vue-textarea)').each((i, el) => {
const gfm = new GfmAutoComplete(gl.GfmAutoComplete && gl.GfmAutoComplete.dataSources); const gfm = new GfmAutoComplete(
const enableGFM = convertPermissionToBoolean(el.dataset.supportsAutocomplete); gl.GfmAutoComplete && gl.GfmAutoComplete.dataSources,
);
const enableGFM = convertPermissionToBoolean(
el.dataset.supportsAutocomplete,
);
gfm.setup($(el), { gfm.setup($(el), {
emojis: true, emojis: true,
members: enableGFM, members: enableGFM,
...@@ -67,9 +71,9 @@ function initGFMInput() { ...@@ -67,9 +71,9 @@ function initGFMInput() {
} }
function initPerformanceBar() { function initPerformanceBar() {
if (document.querySelector('#peek')) { if (document.querySelector('#js-peek')) {
import('./performance_bar') import('./performance_bar')
.then(m => new m.default({ container: '#peek' })) // eslint-disable-line new-cap .then(m => new m.default({ container: '#js-peek' })) // eslint-disable-line new-cap
.catch(() => Flash('Error loading performance bar module')); .catch(() => Flash('Error loading performance bar module'));
} }
} }
......
app/assets/javascripts/gl_form.js
View file @ dbe9e0df
...@@ -2,7 +2,7 @@ import $ from 'jquery'; ...@@ -2,7 +2,7 @@ import $ from 'jquery';
import autosize from 'autosize'; import autosize from 'autosize';
import GfmAutoComplete from './gfm_auto_complete'; import GfmAutoComplete from './gfm_auto_complete';
import dropzoneInput from './dropzone_input'; import dropzoneInput from './dropzone_input';
import textUtils from './lib/utils/text_markdown'; import { addMarkdownListeners, removeMarkdownListeners } from './lib/utils/text_markdown';
export default class GLForm { export default class GLForm {
constructor(form, enableGFM = false) { constructor(form, enableGFM = false) {
...@@ -47,7 +47,7 @@ export default class GLForm { ...@@ -47,7 +47,7 @@ export default class GLForm {
} }
// form and textarea event listeners // form and textarea event listeners
this.addEventListeners(); this.addEventListeners();
textUtils.init(this.form); addMarkdownListeners(this.form);
// hide discard button // hide discard button
this.form.find('.js-note-discard').hide(); this.form.find('.js-note-discard').hide();
this.form.show(); this.form.show();
...@@ -86,7 +86,7 @@ export default class GLForm { ...@@ -86,7 +86,7 @@ export default class GLForm {
clearEventListeners() { clearEventListeners() {
this.textarea.off('focus'); this.textarea.off('focus');
this.textarea.off('blur'); this.textarea.off('blur');
textUtils.removeListeners(this.form); removeMarkdownListeners(this.form);
} }
addEventListeners() { addEventListeners() {
......
app/assets/javascripts/groups/components/app.vue
View file @ dbe9e0df
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
import $ from 'jquery'; import $ from 'jquery';
import { s__ } from '~/locale'; import { s__ } from '~/locale';
import loadingIcon from '~/vue_shared/components/loading_icon.vue'; import loadingIcon from '~/vue_shared/components/loading_icon.vue';
import modal from '~/vue_shared/components/modal.vue'; import DeprecatedModal from '~/vue_shared/components/deprecated_modal.vue';
import { getParameterByName } from '~/lib/utils/common_utils'; import { getParameterByName } from '~/lib/utils/common_utils';
import { mergeUrlParams } from '~/lib/utils/url_utility'; import { mergeUrlParams } from '~/lib/utils/url_utility';
...@@ -15,7 +15,7 @@ import groupsComponent from './groups.vue'; ...@@ -15,7 +15,7 @@ import groupsComponent from './groups.vue';
export default { export default {
components: { components: {
loadingIcon, loadingIcon,
modal, DeprecatedModal,
groupsComponent, groupsComponent,
}, },
props: { props: {
...@@ -52,8 +52,9 @@ export default { ...@@ -52,8 +52,9 @@ export default {
}, },
}, },
created() { created() {
this.searchEmptyMessage = this.hideProjects ? this.searchEmptyMessage = this.hideProjects
COMMON_STR.GROUP_SEARCH_EMPTY : COMMON_STR.GROUP_PROJECT_SEARCH_EMPTY; ? COMMON_STR.GROUP_SEARCH_EMPTY
: COMMON_STR.GROUP_PROJECT_SEARCH_EMPTY;
eventHub.$on('fetchPage', this.fetchPage); eventHub.$on('fetchPage', this.fetchPage);
eventHub.$on('toggleChildren', this.toggleChildren); eventHub.$on('toggleChildren', this.toggleChildren);
...@@ -72,22 +73,30 @@ export default { ...@@ -72,22 +73,30 @@ export default {
eventHub.$off('updateGroups', this.updateGroups); eventHub.$off('updateGroups', this.updateGroups);
}, },
methods: { methods: {
fetchGroups({ parentId, page, filterGroupsBy, sortBy, archived, updatePagination }) { fetchGroups({
return this.service.getGroups(parentId, page, filterGroupsBy, sortBy, archived) parentId,
.then((res) => { page,
if (updatePagination) { filterGroupsBy,
this.updatePagination(res.headers); sortBy,
} archived,
updatePagination,
}) {
return this.service
.getGroups(parentId, page, filterGroupsBy, sortBy, archived)
.then(res => {
if (updatePagination) {
this.updatePagination(res.headers);
}
return res; return res;
}) })
.then(res => res.json()) .then(res => res.json())
.catch(() => { .catch(() => {
this.isLoading = false; this.isLoading = false;
$.scrollTo(0); $.scrollTo(0);
Flash(COMMON_STR.FAILURE); Flash(COMMON_STR.FAILURE);
}); });
}, },
fetchAllGroups() { fetchAllGroups() {
const page = getParameterByName('page') || null; const page = getParameterByName('page') || null;
...@@ -103,7 +112,7 @@ export default { ...@@ -103,7 +112,7 @@ export default {
sortBy, sortBy,
archived, archived,
updatePagination: true, updatePagination: true,
}).then((res) => { }).then(res => {
this.isLoading = false; this.isLoading = false;
this.updateGroups(res, Boolean(filterGroupsBy)); this.updateGroups(res, Boolean(filterGroupsBy));
}); });
...@@ -118,14 +127,18 @@ export default { ...@@ -118,14 +127,18 @@ export default {
sortBy, sortBy,
archived, archived,
updatePagination: true, updatePagination: true,
}).then((res) => { }).then(res => {
this.isLoading = false; this.isLoading = false;
$.scrollTo(0); $.scrollTo(0);
const currentPath = mergeUrlParams({ page }, window.location.href); const currentPath = mergeUrlParams({ page }, window.location.href);
window.history.replaceState({ window.history.replaceState(
page: currentPath, {
}, document.title, currentPath); page: currentPath,
},
document.title,
currentPath,
);
this.updateGroups(res); this.updateGroups(res);
}); });
...@@ -138,11 +151,13 @@ export default { ...@@ -138,11 +151,13 @@ export default {
// eslint-disable-next-line promise/catch-or-return // eslint-disable-next-line promise/catch-or-return
this.fetchGroups({ this.fetchGroups({
parentId: parentGroup.id, parentId: parentGroup.id,
}).then((res) => { })
this.store.setGroupChildren(parentGroup, res); .then(res => {
}).catch(() => { this.store.setGroupChildren(parentGroup, res);
parentGroup.isChildrenLoading = false; })
}); .catch(() => {
parentGroup.isChildrenLoading = false;
});
} else { } else {
parentGroup.isOpen = true; parentGroup.isOpen = true;
} }
...@@ -154,7 +169,11 @@ export default { ...@@ -154,7 +169,11 @@ export default {
this.targetGroup = group; this.targetGroup = group;
this.targetParentGroup = parentGroup; this.targetParentGroup = parentGroup;
this.showModal = true; this.showModal = true;
this.groupLeaveConfirmationMessage = s__(`GroupsTree|Are you sure you want to leave the "${group.fullName}" group?`); this.groupLeaveConfirmationMessage = s__(
`GroupsTree|Are you sure you want to leave the "${
group.fullName
}" group?`,
);
}, },
hideLeaveGroupModal() { hideLeaveGroupModal() {
this.showModal = false; this.showModal = false;
...@@ -162,14 +181,15 @@ export default { ...@@ -162,14 +181,15 @@ export default {
leaveGroup() { leaveGroup() {
this.showModal = false; this.showModal = false;
this.targetGroup.isBeingRemoved = true; this.targetGroup.isBeingRemoved = true;
this.service.leaveGroup(this.targetGroup.leavePath) this.service
.leaveGroup(this.targetGroup.leavePath)
.then(res => res.json()) .then(res => res.json())
.then((res) => { .then(res => {
$.scrollTo(0); $.scrollTo(0);
this.store.removeGroup(this.targetGroup, this.targetParentGroup); this.store.removeGroup(this.targetGroup, this.targetParentGroup);
Flash(res.notice, 'notice'); Flash(res.notice, 'notice');
}) })
.catch((err) => { .catch(err => {
let message = COMMON_STR.FAILURE; let message = COMMON_STR.FAILURE;
if (err.status === 403) { if (err.status === 403) {
message = COMMON_STR.LEAVE_FORBIDDEN; message = COMMON_STR.LEAVE_FORBIDDEN;
...@@ -208,8 +228,8 @@ export default { ...@@ -208,8 +228,8 @@ export default {
:search-empty-message="searchEmptyMessage" :search-empty-message="searchEmptyMessage"
:page-info="pageInfo" :page-info="pageInfo"
/> />
<modal <deprecated-modal
v-if="showModal" v-show="showModal"
kind="warning" kind="warning"
:primary-button-label="__('Leave')" :primary-button-label="__('Leave')"
:title="__('Are you sure?')" :title="__('Are you sure?')"
......
app/assets/javascripts/ide/components/changed_file_icon.vue 0 → 100644
View file @ dbe9e0df
<script>
import icon from '~/vue_shared/components/icon.vue';
export default {
components: {
icon,
},
props: {
file: {
type: Object,
required: true,
},
},
computed: {
changedIcon() {
return this.file.tempFile ? 'file-addition' : 'file-modified';
},
changedIconClass() {
return `multi-${this.changedIcon}`;
},
},
};
</script>
<template>
<icon
:name="changedIcon"
:size="12"
:css-classes="`ide-file-changed-icon ${changedIconClass}`"
/>
</template>
app/assets/javascripts/ide/components/commit_sidebar/actions.vue 0 → 100644
View file @ dbe9e0df
<script>
import { mapState } from 'vuex';
import { sprintf, __ } from '~/locale';
import * as consts from '../../stores/modules/commit/constants';
import RadioGroup from './radio_group.vue';
export default {
components: {
RadioGroup,
},
computed: {
...mapState([
'currentBranchId',
]),
newMergeRequestHelpText() {
return sprintf(
__('Creates a new branch from %{branchName} and re-directs to create a new merge request'),
{ branchName: this.currentBranchId },
);
},
commitToCurrentBranchText() {
return sprintf(
__('Commit to %{branchName} branch'),
{ branchName: `<strong>${this.currentBranchId}</strong>` },
false,
);
},
commitToNewBranchText() {
return sprintf(
__('Creates a new branch from %{branchName}'),
{ branchName: this.currentBranchId },
);
},
},
commitToCurrentBranch: consts.COMMIT_TO_CURRENT_BRANCH,
commitToNewBranch: consts.COMMIT_TO_NEW_BRANCH,
commitToNewBranchMR: consts.COMMIT_TO_NEW_BRANCH_MR,
};
</script>
<template>
<div class="append-bottom-15 ide-commit-radios">
<radio-group
:value="$options.commitToCurrentBranch"
:checked="true"
>
<span
v-html="commitToCurrentBranchText"
>
</span>
</radio-group>
<radio-group
:value="$options.commitToNewBranch"
:label="__('Create a new branch')"
:show-input="true"
:help-text="commitToNewBranchText"
/>
<radio-group
:value="$options.commitToNewBranchMR"
:label="__('Create a new branch and merge request')"
:show-input="true"
:help-text="newMergeRequestHelpText"
/>
</div>
</template>
app/assets/javascripts/ide/components/commit_sidebar/list.vue 0 → 100644
View file @ dbe9e0df
<script>
import { mapState } from 'vuex';
import icon from '~/vue_shared/components/icon.vue';
import listItem from './list_item.vue';
import listCollapsed from './list_collapsed.vue';
export default {
components: {
icon,
listItem,
listCollapsed,
},
props: {
title: {
type: String,
required: true,
},
fileList: {
type: Array,
required: true,
},
},
computed: {
...mapState([
'currentProjectId',
'currentBranchId',
'rightPanelCollapsed',
]),
isCommitInfoShown() {
return this.rightPanelCollapsed || this.fileList.length;
},
},
methods: {
toggleCollapsed() {
this.$emit('toggleCollapsed');
},
},
};
</script>
<template>
<div
:class="{
'multi-file-commit-list': isCommitInfoShown
}"
>
<list-collapsed
v-if="rightPanelCollapsed"
/>
<template v-else>
<ul
v-if="fileList.length"
class="list-unstyled append-bottom-0"
>
<li
v-for="file in fileList"
:key="file.key"
>
<list-item
:file="file"
/>
</li>
</ul>
</template>
</div>
</template>
app/assets/javascripts/ide/components/commit_sidebar/list_collapsed.vue 0 → 100644
View file @ dbe9e0df
<script>
import { mapGetters } from 'vuex';
import icon from '~/vue_shared/components/icon.vue';
export default {
components: {
icon,
},
computed: {
...mapGetters([
'addedFiles',
'modifiedFiles',
]),
},
};
</script>
<template>
<div
class="multi-file-commit-list-collapsed text-center"
>
<icon
name="file-addition"
:size="18"
css-classes="multi-file-addition append-bottom-10"
/>
{{ addedFiles.length }}
<icon
name="file-modified"
:size="18"
css-classes="multi-file-modified prepend-top-10 append-bottom-10"
/>
{{ modifiedFiles.length }}
</div>
</template>
app/assets/javascripts/ide/components/commit_sidebar/list_item.vue 0 → 100644
View file @ dbe9e0df
<script>
import { mapActions } from 'vuex';
import icon from '~/vue_shared/components/icon.vue';
import router from '../../ide_router';
export default {
components: {
icon,
},
props: {
file: {
type: Object,
required: true,
},
},
computed: {
iconName() {
return this.file.tempFile ? 'file-addition' : 'file-modified';
},
iconClass() {
return `multi-file-${this.file.tempFile ? 'addition' : 'modified'} append-right-8`;
},
},
methods: {
...mapActions([
'discardFileChanges',
'updateViewer',
]),
openFileInEditor(file) {
this.updateViewer('diff');
router.push(`/project${file.url}`);
},
},
};
</script>
<template>
<div class="multi-file-commit-list-item">
<button
type="button"
class="multi-file-commit-list-path"
@click="openFileInEditor(file)">
<span class="multi-file-commit-list-file-path">
<icon
:name="iconName"
:size="16"
:css-classes="iconClass"
/>{{ file.path }}
</span>
</button>
<button
type="button"
class="btn btn-blank multi-file-discard-btn"
@click="discardFileChanges(file.path)"
>
Discard
</button>
</div>
</template>
app/assets/javascripts/ide/components/commit_sidebar/radio_group.vue 0 → 100644
View file @ dbe9e0df
<script>
import { mapActions, mapState, mapGetters } from 'vuex';
import tooltip from '~/vue_shared/directives/tooltip';
export default {
directives: {
tooltip,
},
props: {
value: {
type: String,
required: true,
},
label: {
type: String,
required: false,
default: null,
},
checked: {
type: Boolean,
required: false,
default: false,
},
showInput: {
type: Boolean,
required: false,
default: false,
},
helpText: {
type: String,
required: false,
default: null,
},
},
computed: {
...mapState('commit', [
'commitAction',
]),
...mapGetters('commit', [
'newBranchName',
]),
},
methods: {
...mapActions('commit', [
'updateCommitAction',
'updateBranchName',
]),
},
};
</script>
<template>
<fieldset>
<label>
<input
type="radio"
name="commit-action"
:value="value"
@change="updateCommitAction($event.target.value)"
:checked="checked"
v-once
/>
<span class="prepend-left-10">
<template v-if="label">
{{ label }}
</template>
<slot v-else></slot>
<span
v-if="helpText"
v-tooltip
class="help-block inline"
:title="helpText"
>
<i
class="fa fa-question-circle"
aria-hidden="true"
>
</i>
</span>
</span>
</label>
<div
v-if="commitAction === value && showInput"
class="ide-commit-new-branch"
>
<input
type="text"
class="form-control"
:placeholder="newBranchName"
@input="updateBranchName($event.target.value)"
/>
</div>
</fieldset>
</template>
app/assets/javascripts/ide/components/editor_mode_dropdown.vue 0 → 100644
View file @ dbe9e0df
<script>
import Icon from '~/vue_shared/components/icon.vue';
export default {
components: {
Icon,
},
props: {
hasChanges: {
type: Boolean,
required: false,
default: false,
},
viewer: {
type: String,
required: true,
},
showShadow: {
type: Boolean,
required: true,
},
},
methods: {
changeMode(mode) {
this.$emit('click', mode);
},
},
};
</script>
<template>
<div
class="dropdown"
:class="{
shadow: showShadow,
}"
>
<button
type="button"
class="btn btn-primary btn-sm"
:class="{
'btn-inverted': hasChanges,
}"
data-toggle="dropdown"
>
<template v-if="viewer === 'editor'">
{{ __('Editing') }}
</template>
<template v-else>
{{ __('Reviewing') }}
</template>
<icon
name="angle-down"
:size="12"
css-classes="caret-down"
/>
</button>
<div class="dropdown-menu dropdown-menu-selectable dropdown-open-left">
<ul>
<li>
<a
href="#"
@click.prevent="changeMode('editor')"
:class="{
'is-active': viewer === 'editor',
}"
>
<strong class="dropdown-menu-inner-title">{{ __('Editing') }}</strong>
<span class="dropdown-menu-inner-content">
{{ __('View and edit lines') }}
</span>
</a>
</li>
<li>
<a
href="#"
@click.prevent="changeMode('diff')"
:class="{
'is-active': viewer === 'diff',
}"
>
<strong class="dropdown-menu-inner-title">{{ __('Reviewing') }}</strong>
<span class="dropdown-menu-inner-content">
{{ __('Compare changes with the last commit') }}
</span>
</a>
</li>
</ul>
</div>
</div>
</template>
app/assets/javascripts/ide/components/ide.vue 0 → 100644
View file @ dbe9e0df
<script>
import { mapState, mapGetters } from 'vuex';
import ideSidebar from './ide_side_bar.vue';
import ideContextbar from './ide_context_bar.vue';
import repoTabs from './repo_tabs.vue';
import repoFileButtons from './repo_file_buttons.vue';
import ideStatusBar from './ide_status_bar.vue';
import repoEditor from './repo_editor.vue';
export default {
components: {
ideSidebar,
ideContextbar,
repoTabs,
repoFileButtons,
ideStatusBar,
repoEditor,
},
props: {
emptyStateSvgPath: {
type: String,
required: true,
},
noChangesStateSvgPath: {
type: String,
required: true,
},
committedStateSvgPath: {
type: String,
required: true,
},
},
computed: {
...mapState(['changedFiles', 'openFiles', 'viewer']),
...mapGetters(['activeFile', 'hasChanges']),
},
mounted() {
const returnValue = 'Are you sure you want to lose unsaved changes?';
window.onbeforeunload = e => {
if (!this.changedFiles.length) return undefined;
Object.assign(e, {
returnValue,
});
return returnValue;
};
},
};
</script>
<template>
<div
class="ide-view"
>
<ide-sidebar />
<div
class="multi-file-edit-pane"
>
<template
v-if="activeFile"
>
<repo-tabs
:files="openFiles"
:viewer="viewer"
:has-changes="hasChanges"
/>
<repo-editor
class="multi-file-edit-pane-content"
:file="activeFile"
/>
<repo-file-buttons
:file="activeFile"
/>
<ide-status-bar
:file="activeFile"
/>
</template>
<template
v-else
>
<div
v-once
class="ide-empty-state"
>
<div class="row js-empty-state">
<div class="col-xs-12">
<div class="svg-content svg-250">
<img :src="emptyStateSvgPath" />
</div>
</div>
<div class="col-xs-12">
<div class="text-content text-center">
<h4>
Welcome to the GitLab IDE
</h4>
<p>
You can select a file in the left sidebar to begin
editing and use the right sidebar to commit your changes.
</p>
</div>
</div>
</div>
</div>
</template>
</div>
<ide-contextbar
:no-changes-state-svg-path="noChangesStateSvgPath"
:committed-state-svg-path="committedStateSvgPath"
/>
</div>
</template>
app/assets/javascripts/ide/components/ide_context_bar.vue 0 → 100644
View file @ dbe9e0df
<script>
import { mapActions, mapGetters, mapState } from 'vuex';
import icon from '~/vue_shared/components/icon.vue';
import panelResizer from '~/vue_shared/components/panel_resizer.vue';
import repoCommitSection from './repo_commit_section.vue';
import ResizablePanel from './resizable_panel.vue';
export default {
components: {
repoCommitSection,
icon,
panelResizer,
ResizablePanel,
},
props: {
noChangesStateSvgPath: {
type: String,
required: true,
},
committedStateSvgPath: {
type: String,
required: true,
},
},
computed: {
...mapState(['changedFiles', 'rightPanelCollapsed']),
...mapGetters(['currentIcon']),
},
methods: {
...mapActions(['setPanelCollapsedStatus']),
},
};
</script>
<template>
<resizable-panel
:collapsible="true"
:initial-width="340"
side="right"
>
<div
class="multi-file-commit-panel-section"
>
<header
class="multi-file-commit-panel-header"
:class="{
'is-collapsed': rightPanelCollapsed,
}"
>
<div
class="multi-file-commit-panel-header-title"
v-if="!rightPanelCollapsed"
>
<div
v-if="changedFiles.length"
>
<icon
name="list-bulleted"
:size="18"
/>
Staged
</div>
</div>
<button
type="button"
class="btn btn-transparent multi-file-commit-panel-collapse-btn"
@click.stop="setPanelCollapsedStatus({
side: 'right',
collapsed: !rightPanelCollapsed,
})"
>
<icon
:name="currentIcon"
:size="18"
/>
</button>
</header>
<repo-commit-section
:no-changes-state-svg-path="noChangesStateSvgPath"
:committed-state-svg-path="committedStateSvgPath"
/>
</div>
</resizable-panel>
</template>
app/assets/javascripts/ide/components/ide_external_links.vue 0 → 100644
View file @ dbe9e0df
<script>
import icon from '~/vue_shared/components/icon.vue';
export default {
components: {
icon,
},
props: {
projectUrl: {
type: String,
required: true,
},
},
computed: {
goBackUrl() {
return document.referrer || this.projectUrl;
},
},
};
</script>
<template>
<nav
class="ide-external-links"
v-once
>
<p>
<a
:href="goBackUrl"
class="ide-sidebar-link"
>
<icon
:size="16"
class="append-right-8"
name="go-back"
/>
<span class="ide-external-links-text">
{{ s__('Go back') }}
</span>
</a>
</p>
</nav>
</template>
app/assets/javascripts/ide/components/ide_project_branches_tree.vue 0 → 100644
View file @ dbe9e0df
<script>
import icon from '~/vue_shared/components/icon.vue';
import repoTree from './ide_repo_tree.vue';
import newDropdown from './new_dropdown/index.vue';
export default {
components: {
repoTree,
icon,
newDropdown,
},
props: {
projectId: {
type: String,
required: true,
},
branch: {
type: Object,
required: true,
},
},
};
</script>
<template>
<div class="branch-container">
<div class="branch-header">
<div class="branch-header-title str-truncated ref-name">
<icon
name="branch"
:size="12"
/>
{{ branch.name }}
</div>
<div class="branch-header-btns">
<new-dropdown
:project-id="projectId"
:branch="branch.name"
path=""
/>
</div>
</div>
<repo-tree
:tree="branch.tree"
/>
</div>
</template>
app/assets/javascripts/ide/components/ide_project_tree.vue 0 → 100644
View file @ dbe9e0df
<script>
import ProjectAvatarImage from '~/vue_shared/components/project_avatar/image.vue';
import Identicon from '../../vue_shared/components/identicon.vue';
import BranchesTree from './ide_project_branches_tree.vue';
import ExternalLinks from './ide_external_links.vue';
export default {
components: {
BranchesTree,
ExternalLinks,
ProjectAvatarImage,
Identicon,
},
props: {
project: {
type: Object,
required: true,
},
},
};
</script>
<template>
<div class="projects-sidebar">
<div class="context-header">
<a
:title="project.name"
:href="project.web_url"
>
<div
v-if="project.avatar_url"
class="avatar-container s40 project-avatar"
>
<project-avatar-image
class="avatar-container project-avatar"
:link-href="project.path"
:img-src="project.avatar_url"
:img-alt="project.name"
:img-size="40"
/>
</div>
<identicon
v-else
size-class="s40"
:entity-id="project.id"
:entity-name="project.name"
/>
<div class="sidebar-context-title">
{{ project.name }}
</div>
</a>
</div>
<external-links
:project-url="project.web_url"
/>
<div class="multi-file-commit-panel-inner-scroll">
<branches-tree
v-for="branch in project.branches"
:key="branch.name"
:project-id="project.path_with_namespace"
:branch="branch"
/>
</div>
</div>
</template>
app/assets/javascripts/ide/components/ide_repo_tree.vue 0 → 100644
View file @ dbe9e0df
<script>
import SkeletonLoadingContainer from '~/vue_shared/components/skeleton_loading_container.vue';
import RepoFile from './repo_file.vue';
export default {
components: {
RepoFile,
SkeletonLoadingContainer,
},
props: {
tree: {
type: Object,
required: true,
},
},
};
</script>
<template>
<div
class="ide-file-list"
>
<template v-if="tree.loading">
<div
class="multi-file-loading-container"
v-for="n in 3"
:key="n"
>
<skeleton-loading-container />
</div>
</template>
<template v-else>
<repo-file
v-for="file in tree.tree"
:key="file.key"
:file="file"
:level="0"
/>
</template>
</div>
</template>
app/assets/javascripts/ide/components/ide_side_bar.vue 0 → 100644
View file @ dbe9e0df
<script>
import { mapState, mapGetters } from 'vuex';
import icon from '~/vue_shared/components/icon.vue';
import panelResizer from '~/vue_shared/components/panel_resizer.vue';
import skeletonLoadingContainer from '~/vue_shared/components/skeleton_loading_container.vue';
import projectTree from './ide_project_tree.vue';
import ResizablePanel from './resizable_panel.vue';
export default {
components: {
projectTree,
icon,
panelResizer,
skeletonLoadingContainer,
ResizablePanel,
},
computed: {
...mapState([
'loading',
]),
...mapGetters([
'projectsWithTrees',
]),
},
};
</script>
<template>
<resizable-panel
:collapsible="false"
:initial-width="290"
side="left"
>
<div class="multi-file-commit-panel-inner">
<template v-if="loading">
<div
class="multi-file-loading-container"
v-for="n in 3"
:key="n"
>
<skeleton-loading-container />
</div>
</template>
<project-tree
v-for="project in projectsWithTrees"
:key="project.id"
:project="project"
/>
</div>
</resizable-panel>
</template>
app/assets/javascripts/ide/components/ide_status_bar.vue 0 → 100644
View file @ dbe9e0df
<script>
import icon from '~/vue_shared/components/icon.vue';
import tooltip from '~/vue_shared/directives/tooltip';
import timeAgoMixin from '~/vue_shared/mixins/timeago';
export default {
components: {
icon,
},
directives: {
tooltip,
},
mixins: [
timeAgoMixin,
],
props: {
file: {
type: Object,
required: true,
},
},
};
</script>
<template>
<div class="ide-status-bar">
<div class="ref-name">
<icon
name="branch"
:size="12"
/>
{{ file.branchId }}
</div>
<div>
<div v-if="file.lastCommit && file.lastCommit.id">
Last commit:
<a
v-tooltip
:title="file.lastCommit.message"
:href="file.lastCommit.url"
>
{{ timeFormated(file.lastCommit.updatedAt) }} by
{{ file.lastCommit.author }}
</a>
</div>
</div>
<div class="text-right">
{{ file.name }}
</div>
<div class="text-right">
{{ file.eol }}
</div>
<div class="text-right">
{{ file.editorRow }}:{{ file.editorColumn }}
</div>
<div class="text-right">
{{ file.fileLanguage }}
</div>
</div>
</template>
app/assets/javascripts/ide/components/new_dropdown/index.vue 0 → 100644
View file @ dbe9e0df
<script>
import { mapActions } from 'vuex';
import icon from '~/vue_shared/components/icon.vue';
import newModal from './modal.vue';
import upload from './upload.vue';
export default {
components: {
icon,
newModal,
upload,
},
props: {
branch: {
type: String,
required: true,
},
path: {
type: String,
required: true,
},
},
data() {
return {
openModal: false,
modalType: '',
dropdownOpen: false,
};
},
methods: {
...mapActions([
'createTempEntry',
]),
createNewItem(type) {
this.modalType = type;
this.openModal = true;
this.dropdownOpen = false;
},
hideModal() {
this.openModal = false;
},
openDropdown() {
this.dropdownOpen = !this.dropdownOpen;
},
},
};
</script>
<template>
<div class="ide-new-btn">
<div
class="dropdown"
:class="{
open: dropdownOpen,
}"
>
<button
type="button"
class="btn btn-sm btn-default dropdown-toggle add-to-tree"
aria-label="Create new file or directory"
@click.stop="openDropdown()"
>
<icon
name="plus"
:size="12"
css-classes="pull-left"
/>
<icon
name="arrow-down"
:size="12"
css-classes="pull-left"
/>
</button>
<ul class="dropdown-menu dropdown-menu-right">
<li>
<a
href="#"
role="button"
@click.stop.prevent="createNewItem('blob')"
>
{{ __('New file') }}
</a>
</li>
<li>
<upload
:branch-id="branch"
:path="path"
@create="createTempEntry"
/>
</li>
<li>
<a
href="#"
role="button"
@click.stop.prevent="createNewItem('tree')"
>
{{ __('New directory') }}
</a>
</li>
</ul>
</div>
<new-modal
v-if="openModal"
:type="modalType"
:branch-id="branch"
:path="path"
@hide="hideModal"
@create="createTempEntry"
/>
</div>
</template>
app/assets/javascripts/ide/components/new_dropdown/modal.vue 0 → 100644
View file @ dbe9e0df
<script>
import { __ } from '~/locale';
import DeprecatedModal from '~/vue_shared/components/deprecated_modal.vue';
export default {
components: {
DeprecatedModal,
},
props: {
branchId: {
type: String,
required: true,
},
type: {
type: String,
required: true,
},
path: {
type: String,
required: true,
},
},
data() {
return {
entryName: this.path !== '' ? `${this.path}/` : '',
};
},
computed: {
modalTitle() {
if (this.type === 'tree') {
return __('Create new directory');
}
return __('Create new file');
},
buttonLabel() {
if (this.type === 'tree') {
return __('Create directory');
}
return __('Create file');
},
formLabelName() {
if (this.type === 'tree') {
return __('Directory name');
}
return __('File name');
},
},
mounted() {
this.$refs.fieldName.focus();
},
methods: {
createEntryInStore() {
this.$emit('create', {
branchId: this.branchId,
name: this.entryName,
type: this.type,
});
this.hideModal();
},
hideModal() {
this.$emit('hide');
},
},
};
</script>
<template>
<deprecated-modal
:title="modalTitle"
:primary-button-label="buttonLabel"
kind="success"
@cancel="hideModal"
@submit="createEntryInStore"
>
<form
class="form-horizontal"
slot="body"
@submit.prevent="createEntryInStore"
>
<fieldset class="form-group append-bottom-0">
<label class="label-light col-sm-3">
{{ formLabelName }}
</label>
<div class="col-sm-9">
<input
type="text"
class="form-control"
v-model="entryName"
ref="fieldName"
/>
</div>
</fieldset>
</form>
</deprecated-modal>
</template>
app/assets/javascripts/ide/components/new_dropdown/upload.vue 0 → 100644
View file @ dbe9e0df
<script>
export default {
props: {
branchId: {
type: String,
required: true,
},
path: {
type: String,
required: false,
default: '',
},
},
mounted() {
this.$refs.fileUpload.addEventListener('change', this.openFile);
},
beforeDestroy() {
this.$refs.fileUpload.removeEventListener('change', this.openFile);
},
methods: {
createFile(target, file, isText) {
const { name } = file;
let { result } = target;
if (!isText) {
result = result.split('base64,')[1];
}
this.$emit('create', {
name: `${(this.path ? `${this.path}/` : '')}${name}`,
branchId: this.branchId,
type: 'blob',
content: result,
base64: !isText,
});
},
readFile(file) {
const reader = new FileReader();
const isText = file.type.match(/text.*/) !== null;
reader.addEventListener('load', e => this.createFile(e.target, file, isText), { once: true });
if (isText) {
reader.readAsText(file);
} else {
reader.readAsDataURL(file);
}
},
openFile() {
Array.from(this.$refs.fileUpload.files).forEach(file => this.readFile(file));
},
startFileUpload() {
this.$refs.fileUpload.click();
},
},
};
</script>
<template>
<div>
<a
href="#"
role="button"
@click.stop.prevent="startFileUpload"
>
{{ __('Upload file') }}
</a>
<input
id="file-upload"
type="file"
class="hidden"
ref="fileUpload"
/>
</div>
</template>
app/assets/javascripts/ide/components/repo_commit_section.vue 0 → 100644
View file @ dbe9e0df
<script>
import { mapState, mapActions, mapGetters } from 'vuex';
import tooltip from '~/vue_shared/directives/tooltip';
import icon from '~/vue_shared/components/icon.vue';
import DeprecatedModal from '~/vue_shared/components/deprecated_modal.vue';
import LoadingButton from '~/vue_shared/components/loading_button.vue';
import commitFilesList from './commit_sidebar/list.vue';
import * as consts from '../stores/modules/commit/constants';
import Actions from './commit_sidebar/actions.vue';
export default {
components: {
DeprecatedModal,
icon,
commitFilesList,
Actions,
LoadingButton,
},
directives: {
tooltip,
},
props: {
noChangesStateSvgPath: {
type: String,
required: true,
},
committedStateSvgPath: {
type: String,
required: true,
},
},
computed: {
...mapState([
'currentProjectId',
'currentBranchId',
'rightPanelCollapsed',
'lastCommitMsg',
'changedFiles',
]),
...mapState('commit', ['commitMessage', 'submitCommitLoading']),
...mapGetters('commit', [
'commitButtonDisabled',
'discardDraftButtonDisabled',
'branchName',
]),
statusSvg() {
return this.lastCommitMsg
? this.committedStateSvgPath
: this.noChangesStateSvgPath;
},
},
methods: {
...mapActions(['setPanelCollapsedStatus']),
...mapActions('commit', [
'updateCommitMessage',
'discardDraft',
'commitChanges',
'updateCommitAction',
]),
toggleCollapsed() {
this.setPanelCollapsedStatus({
side: 'right',
collapsed: !this.rightPanelCollapsed,
});
},
forceCreateNewBranch() {
return this.updateCommitAction(consts.COMMIT_TO_NEW_BRANCH).then(() =>
this.commitChanges(),
);
},
},
};
</script>
<template>
<div
class="multi-file-commit-panel-section"
:class="{
'multi-file-commit-empty-state-container': !changedFiles.length
}"
>
<deprecated-modal
id="ide-create-branch-modal"
:primary-button-label="__('Create new branch')"
kind="success"
:title="__('Branch has changed')"
@submit="forceCreateNewBranch"
>
<template slot="body">
{{ __(`This branch has changed since you started editing.
Would you like to create a new branch?`) }}
</template>
</deprecated-modal>
<commit-files-list
title="Staged"
:file-list="changedFiles"
:collapsed="rightPanelCollapsed"
@toggleCollapsed="toggleCollapsed"
/>
<template
v-if="changedFiles.length"
>
<form
class="form-horizontal multi-file-commit-form"
@submit.prevent.stop="commitChanges"
v-if="!rightPanelCollapsed"
>
<div class="multi-file-commit-fieldset">
<textarea
class="form-control multi-file-commit-message"
name="commit-message"
:value="commitMessage"
:placeholder="__('Write a commit message...')"
@input="updateCommitMessage($event.target.value)"
>
</textarea>
</div>
<div class="clearfix prepend-top-15">
<actions />
<loading-button
:loading="submitCommitLoading"
:disabled="commitButtonDisabled"
container-class="btn btn-success btn-sm pull-left"
:label="__('Commit')"
@click="commitChanges"
/>
<button
v-if="!discardDraftButtonDisabled"
type="button"
class="btn btn-default btn-sm pull-right"
@click="discardDraft"
>
{{ __('Discard draft') }}
</button>
</div>
</form>
</template>
<div
v-else-if="!rightPanelCollapsed"
class="row js-empty-state"
>
<div class="col-xs-10 col-xs-offset-1">
<div class="svg-content svg-80">
<img :src="statusSvg" />
</div>
</div>
<div class="col-xs-10 col-xs-offset-1">
<div
class="text-content text-center"
v-if="!lastCommitMsg"
>
<h4>
{{ __('No changes') }}
</h4>
<p>
{{ __('Edit files in the editor and commit changes here') }}
</p>
</div>
<div
class="text-content text-center"
v-else
>
<h4>
{{ __('All changes are committed') }}
</h4>
<p v-html="lastCommitMsg">
</p>
</div>
</div>
</div>
</div>
</template>
app/assets/javascripts/ide/components/repo_editor.vue 0 → 100644
View file @ dbe9e0df
<script>
/* global monaco */
import { mapState, mapActions } from 'vuex';
import flash from '~/flash';
import monacoLoader from '../monaco_loader';
import Editor from '../lib/editor';
export default {
props: {
file: {
type: Object,
required: true,
},
},
computed: {
...mapState([
'leftPanelCollapsed',
'rightPanelCollapsed',
'viewer',
'delayViewerUpdated',
]),
shouldHideEditor() {
return this.file && this.file.binary && !this.file.raw;
},
},
watch: {
file(oldVal, newVal) {
if (newVal.path !== this.file.path) {
this.initMonaco();
}
},
leftPanelCollapsed() {
this.editor.updateDimensions();
},
rightPanelCollapsed() {
this.editor.updateDimensions();
},
viewer() {
this.createEditorInstance();
},
},
beforeDestroy() {
this.editor.dispose();
},
mounted() {
if (this.editor && monaco) {
this.initMonaco();
} else {
monacoLoader(['vs/editor/editor.main'], () => {
this.editor = Editor.create(monaco);
this.initMonaco();
});
}
},
methods: {
...mapActions([
'getRawFileData',
'changeFileContent',
'setFileLanguage',
'setEditorPosition',
'setFileEOL',
'updateViewer',
'updateDelayViewerUpdated',
]),
initMonaco() {
if (this.shouldHideEditor) return;
this.editor.clearEditor();
this.getRawFileData(this.file)
.then(() => {
const viewerPromise = this.delayViewerUpdated ? this.updateViewer('editor') : Promise.resolve();
return viewerPromise;
})
.then(() => {
this.updateDelayViewerUpdated(false);
this.createEditorInstance();
})
.catch((err) => {
flash('Error setting up monaco. Please try again.', 'alert', document, null, false, true);
throw err;
});
},
createEditorInstance() {
this.editor.dispose();
this.$nextTick(() => {
if (this.viewer === 'editor') {
this.editor.createInstance(this.$refs.editor);
} else {
this.editor.createDiffInstance(this.$refs.editor);
}
this.setupEditor();
});
},
setupEditor() {
if (!this.file || !this.editor.instance) return;
this.model = this.editor.createModel(this.file);
this.editor.attachModel(this.model);
this.model.onChange((model) => {
const { file } = model;
if (file.active) {
this.changeFileContent({
path: file.path,
content: model.getModel().getValue(),
});
}
});
// Handle Cursor Position
this.editor.onPositionChange((instance, e) => {
this.setEditorPosition({
editorRow: e.position.lineNumber,
editorColumn: e.position.column,
});
});
this.editor.setPosition({
lineNumber: this.file.editorRow,
column: this.file.editorColumn,
});
// Handle File Language
this.setFileLanguage({
fileLanguage: this.model.language,
});
// Get File eol
this.setFileEOL({
eol: this.model.eol,
});
},
},
};
</script>
<template>
<div
id="ide"
class="blob-viewer-container blob-editor-container"
>
<div
v-if="shouldHideEditor"
v-html="file.html"
>
</div>
<div
v-show="!shouldHideEditor"
ref="editor"
class="multi-file-editor-holder"
>
</div>
</div>
</template>
app/assets/javascripts/ide/components/repo_file.vue 0 → 100644
View file @ dbe9e0df
<script>
import { mapActions } from 'vuex';
import skeletonLoadingContainer from '~/vue_shared/components/skeleton_loading_container.vue';
import fileIcon from '~/vue_shared/components/file_icon.vue';
import router from '../ide_router';
import newDropdown from './new_dropdown/index.vue';
import fileStatusIcon from './repo_file_status_icon.vue';
import changedFileIcon from './changed_file_icon.vue';
export default {
name: 'RepoFile',
components: {
skeletonLoadingContainer,
newDropdown,
fileStatusIcon,
fileIcon,
changedFileIcon,
},
props: {
file: {
type: Object,
required: true,
},
level: {
type: Number,
required: true,
},
},
computed: {
isTree() {
return this.file.type === 'tree';
},
isBlob() {
return this.file.type === 'blob';
},
levelIndentation() {
return {
marginLeft: `${this.level * 16}px`,
};
},
fileClass() {
return {
'file-open': this.isBlob && this.file.opened,
'file-active': this.isBlob && this.file.active,
folder: this.isTree,
'is-open': this.file.opened,
};
},
},
updated() {
if (this.file.type === 'blob' && this.file.active) {
this.$el.scrollIntoView();
}
},
methods: {
...mapActions(['toggleTreeOpen', 'updateDelayViewerUpdated']),
clickFile() {
// Manual Action if a tree is selected/opened
if (
this.isTree &&
this.$router.currentRoute.path === `/project${this.file.url}`
) {
this.toggleTreeOpen(this.file.path);
}
const delayPromise = this.file.changed
? Promise.resolve()
: this.updateDelayViewerUpdated(true);
return delayPromise.then(() => {
router.push(`/project${this.file.url}`);
});
},
},
};
</script>
<template>
<div>
<div
class="file"
:class="fileClass"
>
<div
class="file-name"
@click="clickFile"
role="button"
>
<span
class="ide-file-name str-truncated"
:style="levelIndentation"
>
<file-icon
:file-name="file.name"
:loading="file.loading"
:folder="isTree"
:opened="file.opened"
:size="16"
/>
{{ file.name }}
<file-status-icon
:file="file"
/>
</span>
<changed-file-icon
:file="file"
v-if="file.changed || file.tempFile"
class="prepend-top-5 pull-right"
/>
<new-dropdown
v-if="isTree"
:project-id="file.projectId"
:branch="file.branchId"
:path="file.path"
class="pull-right prepend-left-8"
/>
</div>
</div>
<template v-if="file.opened">
<repo-file
v-for="childFile in file.tree"
:key="childFile.key"
:file="childFile"
:level="level + 1"
/>
</template>
</div>
</template>
app/assets/javascripts/ide/components/repo_file_buttons.vue 0 → 100644
View file @ dbe9e0df
<script>
export default {
props: {
file: {
type: Object,
required: true,
},
},
computed: {
showButtons() {
return this.file.rawPath ||
this.file.blamePath ||
this.file.commitsPath ||
this.file.permalink;
},
rawDownloadButtonLabel() {
return this.file.binary ? 'Download' : 'Raw';
},
},
};
</script>
<template>
<div
v-if="showButtons"
class="multi-file-editor-btn-group"
>
<a
:href="file.rawPath"
target="_blank"
class="btn btn-default btn-sm raw"
rel="noopener noreferrer">
{{ rawDownloadButtonLabel }}
</a>
<div
class="btn-group"
role="group"
aria-label="File actions"
>
<a
:href="file.blamePath"
class="btn btn-default btn-sm blame"
>
Blame
</a>
<a
:href="file.commitsPath"
class="btn btn-default btn-sm history"
>
History
</a>
<a
:href="file.permalink"
class="btn btn-default btn-sm permalink"
>
Permalink
</a>
</div>
</div>
</template>
app/assets/javascripts/ide/components/repo_file_status_icon.vue 0 → 100644
View file @ dbe9e0df
<script>
import icon from '~/vue_shared/components/icon.vue';
import tooltip from '~/vue_shared/directives/tooltip';
import '~/lib/utils/datetime_utility';
export default {
components: {
icon,
},
directives: {
tooltip,
},
props: {
file: {
type: Object,
required: true,
},
},
computed: {
lockTooltip() {
return `Locked by ${this.file.file_lock.user.name}`;
},
},
};
</script>
<template>
<span
v-if="file.file_lock"
v-tooltip
:title="lockTooltip"
data-container="body"
>
<icon
name="lock"
css-classes="file-status-icon"
/>
</span>
</template>
app/assets/javascripts/ide/components/repo_loading_file.vue 0 → 100644
View file @ dbe9e0df
<script>
import { mapState } from 'vuex';
import skeletonLoadingContainer from '~/vue_shared/components/skeleton_loading_container.vue';
export default {
components: {
skeletonLoadingContainer,
},
computed: {
...mapState([
'leftPanelCollapsed',
]),
},
};
</script>
<template>
<tr
class="loading-file"
aria-label="Loading files"
>
<td class="multi-file-table-col-name">
<skeleton-loading-container
:small="true"
/>
</td>
<template v-if="!leftPanelCollapsed">
<td class="hidden-sm hidden-xs">
<skeleton-loading-container
:small="true"
/>
</td>
<td class="hidden-xs">
<skeleton-loading-container
class="animation-container-right"
:small="true"
/>
</td>
</template>
</tr>
</template>
app/assets/javascripts/ide/components/repo_tab.vue 0 → 100644
View file @ dbe9e0df
<script>
import { mapActions } from 'vuex';
import fileIcon from '~/vue_shared/components/file_icon.vue';
import icon from '~/vue_shared/components/icon.vue';
import fileStatusIcon from './repo_file_status_icon.vue';
import changedFileIcon from './changed_file_icon.vue';
export default {
components: {
fileStatusIcon,
fileIcon,
icon,
changedFileIcon,
},
props: {
tab: {
type: Object,
required: true,
},
},
data() {
return {
tabMouseOver: false,
};
},
computed: {
closeLabel() {
if (this.tab.changed || this.tab.tempFile) {
return `${this.tab.name} changed`;
}
return `Close ${this.tab.name}`;
},
showChangedIcon() {
return this.tab.changed ? !this.tabMouseOver : false;
},
},
methods: {
...mapActions([
'closeFile',
]),
clickFile(tab) {
this.$router.push(`/project${tab.url}`);
},
mouseOverTab() {
if (this.tab.changed) {
this.tabMouseOver = true;
}
},
mouseOutTab() {
if (this.tab.changed) {
this.tabMouseOver = false;
}
},
},
};
</script>
<template>
<li
@click="clickFile(tab)"
@mouseover="mouseOverTab"
@mouseout="mouseOutTab"
>
<button
type="button"
class="multi-file-tab-close"
@click.stop.prevent="closeFile(tab.path)"
:aria-label="closeLabel"
>
<icon
v-if="!showChangedIcon"
name="close"
:size="12"
/>
<changed-file-icon
v-else
:file="tab"
/>
</button>
<div
class="multi-file-tab"
:class="{active : tab.active }"
:title="tab.url"
>
<file-icon
:file-name="tab.name"
:size="16"
/>
{{ tab.name }}
<file-status-icon
:file="tab"
/>
</div>
</li>
</template>
app/assets/javascripts/ide/components/repo_tabs.vue 0 → 100644
View file @ dbe9e0df
<script>
import { mapActions } from 'vuex';
import RepoTab from './repo_tab.vue';
import EditorMode from './editor_mode_dropdown.vue';
export default {
components: {
RepoTab,
EditorMode,
},
props: {
files: {
type: Array,
required: true,
},
viewer: {
type: String,
required: true,
},
hasChanges: {
type: Boolean,
required: true,
},
},
data() {
return {
showShadow: false,
};
},
updated() {
if (!this.$refs.tabsScroller) return;
this.showShadow =
this.$refs.tabsScroller.scrollWidth > this.$refs.tabsScroller.offsetWidth;
},
methods: {
...mapActions(['updateViewer']),
},
};
</script>
<template>
<div class="multi-file-tabs">
<ul
class="list-unstyled append-bottom-0"
ref="tabsScroller"
>
<repo-tab
v-for="tab in files"
:key="tab.key"
:tab="tab"
/>
</ul>
<editor-mode
:viewer="viewer"
:show-shadow="showShadow"
:has-changes="hasChanges"
@click="updateViewer"
/>
</div>
</template>
app/assets/javascripts/ide/components/resizable_panel.vue 0 → 100644
View file @ dbe9e0df
<script>
import { mapActions, mapState } from 'vuex';
import PanelResizer from '~/vue_shared/components/panel_resizer.vue';
export default {
components: {
PanelResizer,
},
props: {
collapsible: {
type: Boolean,
required: true,
},
initialWidth: {
type: Number,
required: true,
},
minSize: {
type: Number,
required: false,
default: 200,
},
side: {
type: String,
required: true,
},
},
data() {
return {
width: this.initialWidth,
};
},
computed: {
...mapState({
collapsed(state) {
return state[`${this.side}PanelCollapsed`];
},
}),
panelStyle() {
if (!this.collapsed) {
return {
width: `${this.width}px`,
};
}
return {};
},
},
methods: {
...mapActions([
'setPanelCollapsedStatus',
'setResizingStatus',
]),
toggleFullbarCollapsed() {
if (this.collapsed && this.collapsible) {
this.setPanelCollapsedStatus({
side: this.side,
collapsed: !this.collapsed,
});
}
},
},
maxSize: (window.innerWidth / 2),
};
</script>
<template>
<div
class="multi-file-commit-panel"
:class="{
'is-collapsed': collapsed && collapsible,
}"
:style="panelStyle"
@click="toggleFullbarCollapsed"
>
<slot></slot>
<panel-resizer
:size.sync="width"
:enabled="!collapsed"
:start-size="initialWidth"
:min-size="minSize"
:max-size="$options.maxSize"
@resize-start="setResizingStatus(true)"
@resize-end="setResizingStatus(false)"
:side="side === 'right' ? 'left' : 'right'"
/>
</div>
</template>
app/assets/javascripts/ide/eventhub.js 0 → 100644
View file @ dbe9e0df
import Vue from 'vue';
export default new Vue();
app/assets/javascripts/ide/ide_router.js 0 → 100644
View file @ dbe9e0df
import Vue from 'vue';
import VueRouter from 'vue-router';
import flash from '~/flash';
import store from './stores';
Vue.use(VueRouter);
/**
* Routes below /-/ide/:
/project/h5bp/html5-boilerplate/blob/master
/project/h5bp/html5-boilerplate/blob/master/app/js/test.js
/project/h5bp/html5-boilerplate/mr/123
/project/h5bp/html5-boilerplate/mr/123/app/js/test.js
/workspace/123
/workspace/project/h5bp/html5-boilerplate/blob/my-special-branch
/workspace/project/h5bp/html5-boilerplate/mr/123
/ = /workspace
/settings
*/
// Unfortunately Vue Router doesn't work without at least a fake component
// If you do only data handling
const EmptyRouterComponent = {
render(createElement) {
return createElement('div');
},
};
const router = new VueRouter({
mode: 'history',
base: `${gon.relative_url_root}/-/ide/`,
routes: [
{
path: '/project/:namespace/:project',
component: EmptyRouterComponent,
children: [
{
path: ':targetmode/:branch/*',
component: EmptyRouterComponent,
},
{
path: 'mr/:mrid',
component: EmptyRouterComponent,
},
],
},
],
});
router.beforeEach((to, from, next) => {
if (to.params.namespace && to.params.project) {
store
.dispatch('getProjectData', {
namespace: to.params.namespace,
projectId: to.params.project,
})
.then(() => {
const fullProjectId = `${to.params.namespace}/${to.params.project}`;
if (to.params.branch) {
store.dispatch('getBranchData', {
projectId: fullProjectId,
branchId: to.params.branch,
});
store
.dispatch('getFiles', {
projectId: fullProjectId,
branchId: to.params.branch,
})
.then(() => {
if (to.params[0]) {
const path =
to.params[0].slice(-1) === '/'
? to.params[0].slice(0, -1)
: to.params[0];
const treeEntry = store.state.entries[path];
if (treeEntry) {
store.dispatch('handleTreeEntryAction', treeEntry);
}
}
})
.catch(e => {
flash(
'Error while loading the branch files. Please try again.',
'alert',
document,
null,
false,
true,
);
throw e;
});
}
})
.catch(e => {
flash(
'Error while loading the project data. Please try again.',
'alert',
document,
null,
false,
true,
);
throw e;
});
}
next();
});
export default router;
app/assets/javascripts/ide/index.js 0 → 100644
View file @ dbe9e0df
import Vue from 'vue';
import Translate from '~/vue_shared/translate';
import ide from './components/ide.vue';
import store from './stores';
import router from './ide_router';
function initIde(el) {
if (!el) return null;
return new Vue({
el,
store,
router,
components: {
ide,
},
render(createElement) {
return createElement('ide', {
props: {
emptyStateSvgPath: el.dataset.emptyStateSvgPath,
noChangesStateSvgPath: el.dataset.noChangesStateSvgPath,
committedStateSvgPath: el.dataset.committedStateSvgPath,
},
});
},
});
}
const ideElement = document.getElementById('ide');
Vue.use(Translate);
initIde(ideElement);
app/assets/javascripts/ide/lib/common/disposable.js 0 → 100644
View file @ dbe9e0df
export default class Disposable {
constructor() {
this.disposers = new Set();
}
add(...disposers) {
disposers.forEach(disposer => this.disposers.add(disposer));
}
dispose() {
this.disposers.forEach(disposer => disposer.dispose());
this.disposers.clear();
}
}
app/assets/javascripts/ide/lib/common/model.js 0 → 100644
View file @ dbe9e0df
/* global monaco */
import Disposable from './disposable';
import eventHub from '../../eventhub';
export default class Model {
constructor(monaco, file) {
this.monaco = monaco;
this.disposable = new Disposable();
this.file = file;
this.content = file.content !== '' ? file.content : file.raw;
this.disposable.add(
(this.originalModel = this.monaco.editor.createModel(
this.file.raw,
undefined,
new this.monaco.Uri(null, null, `original/${this.file.path}`),
)),
(this.model = this.monaco.editor.createModel(
this.content,
undefined,
new this.monaco.Uri(null, null, this.file.path),
)),
);
this.events = new Map();
this.updateContent = this.updateContent.bind(this);
this.dispose = this.dispose.bind(this);
eventHub.$on(`editor.update.model.dispose.${this.file.path}`, this.dispose);
eventHub.$on(
`editor.update.model.content.${this.file.path}`,
this.updateContent,
);
}
get url() {
return this.model.uri.toString();
}
get language() {
return this.model.getModeId();
}
get eol() {
return this.model.getEOL() === '\n' ? 'LF' : 'CRLF';
}
get path() {
return this.file.path;
}
getModel() {
return this.model;
}
getOriginalModel() {
return this.originalModel;
}
setValue(value) {
this.getModel().setValue(value);
}
onChange(cb) {
this.events.set(
this.path,
this.disposable.add(this.model.onDidChangeContent(e => cb(this, e))),
);
}
updateContent(content) {
this.getOriginalModel().setValue(content);
this.getModel().setValue(content);
}
dispose() {
this.disposable.dispose();
this.events.clear();
eventHub.$off(
`editor.update.model.dispose.${this.file.path}`,
this.dispose,
);
eventHub.$off(
`editor.update.model.content.${this.file.path}`,
this.updateContent,
);
}
}
app/assets/javascripts/ide/lib/common/model_manager.js 0 → 100644
View file @ dbe9e0df
import eventHub from '../../eventhub';
import Disposable from './disposable';
import Model from './model';
export default class ModelManager {
constructor(monaco) {
this.monaco = monaco;
this.disposable = new Disposable();
this.models = new Map();
}
hasCachedModel(path) {
return this.models.has(path);
}
getModel(path) {
return this.models.get(path);
}
addModel(file) {
if (this.hasCachedModel(file.path)) {
return this.getModel(file.path);
}
const model = new Model(this.monaco, file);
this.models.set(model.path, model);
this.disposable.add(model);
eventHub.$on(
`editor.update.model.dispose.${file.path}`,
this.removeCachedModel.bind(this, file),
);
return model;
}
removeCachedModel(file) {
this.models.delete(file.path);
eventHub.$off(
`editor.update.model.dispose.${file.path}`,
this.removeCachedModel,
);
}
dispose() {
// dispose of all the models
this.disposable.dispose();
this.models.clear();
}
}
app/assets/javascripts/ide/lib/decorations/controller.js 0 → 100644
View file @ dbe9e0df
export default class DecorationsController {
constructor(editor) {
this.editor = editor;
this.decorations = new Map();
this.editorDecorations = new Map();
}
getAllDecorationsForModel(model) {
if (!this.decorations.has(model.url)) return [];
const modelDecorations = this.decorations.get(model.url);
const decorations = [];
modelDecorations.forEach(val => decorations.push(...val));
return decorations;
}
addDecorations(model, decorationsKey, decorations) {
const decorationMap = this.decorations.get(model.url) || new Map();
decorationMap.set(decorationsKey, decorations);
this.decorations.set(model.url, decorationMap);
this.decorate(model);
}
decorate(model) {
if (!this.editor.instance) return;
const decorations = this.getAllDecorationsForModel(model);
const oldDecorations = this.editorDecorations.get(model.url) || [];
this.editorDecorations.set(
model.url,
this.editor.instance.deltaDecorations(oldDecorations, decorations),
);
}
dispose() {
this.decorations.clear();
this.editorDecorations.clear();
}
}
app/assets/javascripts/ide/lib/diff/controller.js 0 → 100644
View file @ dbe9e0df
/* global monaco */
import { throttle } from 'underscore';
import DirtyDiffWorker from './diff_worker';
import Disposable from '../common/disposable';
export const getDiffChangeType = (change) => {
if (change.modified) {
return 'modified';
} else if (change.added) {
return 'added';
} else if (change.removed) {
return 'removed';
}
return '';
};
export const getDecorator = change => ({
range: new monaco.Range(
change.lineNumber,
1,
change.endLineNumber,
1,
),
options: {
isWholeLine: true,
linesDecorationsClassName: `dirty-diff dirty-diff-${getDiffChangeType(change)}`,
},
});
export default class DirtyDiffController {
constructor(modelManager, decorationsController) {
this.disposable = new Disposable();
this.editorSimpleWorker = null;
this.modelManager = modelManager;
this.decorationsController = decorationsController;
this.dirtyDiffWorker = new DirtyDiffWorker();
this.throttledComputeDiff = throttle(this.computeDiff, 250);
this.decorate = this.decorate.bind(this);
this.dirtyDiffWorker.addEventListener('message', this.decorate);
}
attachModel(model) {
model.onChange(() => this.throttledComputeDiff(model));
}
computeDiff(model) {
this.dirtyDiffWorker.postMessage({
path: model.path,
originalContent: model.getOriginalModel().getValue(),
newContent: model.getModel().getValue(),
});
}
reDecorate(model) {
this.decorationsController.decorate(model);
}
decorate({ data }) {
const decorations = data.changes.map(change => getDecorator(change));
const model = this.modelManager.getModel(data.path);
this.decorationsController.addDecorations(model, 'dirtyDiff', decorations);
}
dispose() {
this.disposable.dispose();
this.dirtyDiffWorker.removeEventListener('message', this.decorate);
this.dirtyDiffWorker.terminate();
}
}
app/assets/javascripts/ide/lib/diff/diff.js 0 → 100644
View file @ dbe9e0df
import { diffLines } from 'diff';
// eslint-disable-next-line import/prefer-default-export
export const computeDiff = (originalContent, newContent) => {
const changes = diffLines(originalContent, newContent);
let lineNumber = 1;
return changes.reduce((acc, change) => {
const findOnLine = acc.find(c => c.lineNumber === lineNumber);
if (findOnLine) {
Object.assign(findOnLine, change, {
modified: true,
endLineNumber: (lineNumber + change.count) - 1,
});
} else if ('added' in change || 'removed' in change) {
acc.push(Object.assign({}, change, {
lineNumber,
modified: undefined,
endLineNumber: (lineNumber + change.count) - 1,
}));
}
if (!change.removed) {
lineNumber += change.count;
}
return acc;
}, []);
};
app/assets/javascripts/ide/lib/diff/diff_worker.js 0 → 100644
View file @ dbe9e0df
import { computeDiff } from './diff';
self.addEventListener('message', (e) => {
const data = e.data;
self.postMessage({
path: data.path,
changes: computeDiff(data.originalContent, data.newContent),
});
});
app/assets/javascripts/ide/lib/editor.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
app/assets/javascripts/ide/lib/editor_options.js 0 → 100644
View file @ dbe9e0df
export const defaultEditorOptions = {
model: null,
readOnly: false,
contextmenu: true,
scrollBeyondLastLine: false,
minimap: {
enabled: false,
},
};
export default [
{
readOnly: model => !!model.file.file_lock,
},
];
app/assets/javascripts/ide/lib/themes/gl_theme.js 0 → 100644
View file @ dbe9e0df
export default {
themeName: 'gitlab',
monacoTheme: {
base: 'vs',
inherit: true,
rules: [],
colors: {
'editorLineNumber.foreground': '#CCCCCC',
'diffEditor.insertedTextBackground': '#ddfbe6',
'diffEditor.removedTextBackground': '#f9d7dc',
'editor.selectionBackground': '#aad6f8',
},
},
};
app/assets/javascripts/ide/monaco_loader.js 0 → 100644
View file @ dbe9e0df
import monacoContext from 'monaco-editor/dev/vs/loader';
monacoContext.require.config({
paths: {
vs: `${__webpack_public_path__}monaco-editor/vs`, // eslint-disable-line camelcase
},
});
// ignore CDN config and use local assets path for service worker which cannot be cross-domain
const relativeRootPath = (gon && gon.relative_url_root) || '';
const monacoPath = `${relativeRootPath}/assets/webpack/monaco-editor/vs`;
window.MonacoEnvironment = { getWorkerUrl: () => `${monacoPath}/base/worker/workerMain.js` };
// eslint-disable-next-line no-underscore-dangle
window.__monaco_context__ = monacoContext;
export default monacoContext.require;
app/assets/javascripts/ide/services/index.js 0 → 100644
View file @ dbe9e0df
import Vue from 'vue';
import VueResource from 'vue-resource';
import Api from '~/api';
Vue.use(VueResource);
export default {
getTreeData(endpoint) {
return Vue.http.get(endpoint, { params: { format: 'json' } });
},
getFileData(endpoint) {
return Vue.http.get(endpoint, { params: { format: 'json' } });
},
getRawFileData(file) {
if (file.tempFile) {
return Promise.resolve(file.content);
}
if (file.raw) {
return Promise.resolve(file.raw);
}
return Vue.http.get(file.rawPath, { params: { format: 'json' } })
.then(res => res.text());
},
getProjectData(namespace, project) {
return Api.project(`${namespace}/${project}`);
},
getBranchData(projectId, currentBranchId) {
return Api.branchSingle(projectId, currentBranchId);
},
createBranch(projectId, payload) {
const url = Api.buildUrl(Api.createBranchPath).replace(':id', projectId);
return Vue.http.post(url, payload);
},
commit(projectId, payload) {
return Api.commitMultiple(projectId, payload);
},
getTreeLastCommit(endpoint) {
return Vue.http.get(endpoint, {
params: {
format: 'json',
},
});
},
getFiles(projectUrl, branchId) {
const url = `${projectUrl}/files/${branchId}`;
return Vue.http.get(url, {
params: {
format: 'json',
},
});
},
};
app/assets/javascripts/ide/stores/actions.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
app/assets/javascripts/ide/stores/actions/file.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
app/assets/javascripts/ide/stores/actions/project.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
app/assets/javascripts/ide/stores/actions/tree.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
app/assets/javascripts/ide/stores/getters.js 0 → 100644
View file @ dbe9e0df
export const activeFile = state =>
state.openFiles.find(file => file.active) || null;
export const addedFiles = state => state.changedFiles.filter(f => f.tempFile);
export const modifiedFiles = state =>
state.changedFiles.filter(f => !f.tempFile);
export const projectsWithTrees = state =>
Object.keys(state.projects).map(projectId => {
const project = state.projects[projectId];
return {
...project,
branches: Object.keys(project.branches).map(branchId => {
const branch = project.branches[branchId];
return {
...branch,
tree: state.trees[branch.treeId],
};
}),
};
});
// eslint-disable-next-line no-confusing-arrow
export const currentIcon = state =>
state.rightPanelCollapsed ? 'angle-double-left' : 'angle-double-right';
export const hasChanges = state => !!state.changedFiles.length;
app/assets/javascripts/ide/stores/index.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
app/assets/javascripts/ide/stores/modules/commit/actions.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
app/assets/javascripts/ide/stores/modules/commit/constants.js 0 → 100644
View file @ dbe9e0df
export const COMMIT_TO_CURRENT_BRANCH = '1';
export const COMMIT_TO_NEW_BRANCH = '2';
export const COMMIT_TO_NEW_BRANCH_MR = '3';
app/assets/javascripts/ide/stores/modules/commit/getters.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
app/assets/javascripts/ide/stores/modules/commit/index.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
app/assets/javascripts/ide/stores/modules/commit/mutation_types.js 0 → 100644
View file @ dbe9e0df
export const UPDATE_COMMIT_MESSAGE = 'UPDATE_COMMIT_MESSAGE';
export const UPDATE_COMMIT_ACTION = 'UPDATE_COMMIT_ACTION';
export const UPDATE_NEW_BRANCH_NAME = 'UPDATE_NEW_BRANCH_NAME';
export const UPDATE_LOADING = 'UPDATE_LOADING';
app/assets/javascripts/ide/stores/modules/commit/mutations.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
app/assets/javascripts/ide/stores/modules/commit/state.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
app/assets/javascripts/ide/stores/mutation_types.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
app/assets/javascripts/ide/stores/mutations.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
app/assets/javascripts/ide/stores/mutations/branch.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
app/assets/javascripts/ide/stores/mutations/file.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
app/assets/javascripts/ide/stores/mutations/project.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
app/assets/javascripts/ide/stores/mutations/tree.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
app/assets/javascripts/ide/stores/state.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
app/assets/javascripts/ide/stores/utils.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
app/assets/javascripts/main.js
View file @ dbe9e0df
This diff is collapsed.
app/assets/javascripts/notes.js
View file @ dbe9e0df
This diff is collapsed.
app/assets/javascripts/performance_bar.js deleted 100644 → 0
View file @ 1c2530de
This diff is collapsed.
app/assets/javascripts/performance_bar/index.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
app/assets/javascripts/profile/profile.js
View file @ dbe9e0df
This diff is collapsed.
app/assets/stylesheets/pages/boards.scss
View file @ dbe9e0df
This diff is collapsed.
app/assets/stylesheets/pages/branches.scss
View file @ dbe9e0df
This diff is collapsed.
app/assets/stylesheets/pages/events.scss
View file @ dbe9e0df
This diff is collapsed.
app/assets/stylesheets/pages/labels.scss
View file @ dbe9e0df
This diff is collapsed.
app/assets/stylesheets/pages/notes.scss
View file @ dbe9e0df
This diff is collapsed.
app/assets/stylesheets/pages/projects.scss
View file @ dbe9e0df
This diff is collapsed.
app/assets/stylesheets/pages/repo.scss
View file @ dbe9e0df
This diff is collapsed.
app/assets/stylesheets/pages/search.scss
View file @ dbe9e0df
This diff is collapsed.
app/assets/stylesheets/performance_bar.scss
View file @ dbe9e0df
This diff is collapsed.
app/controllers/ide_controller.rb 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
app/finders/admin/projects_finder.rb
View file @ dbe9e0df
This diff is collapsed.
app/helpers/application_helper.rb
View file @ dbe9e0df
This diff is collapsed.
app/helpers/application_settings_helper.rb
View file @ dbe9e0df
This diff is collapsed.
app/helpers/blob_helper.rb
View file @ dbe9e0df
This diff is collapsed.
app/helpers/issuables_helper.rb
View file @ dbe9e0df
This diff is collapsed.
app/helpers/projects_helper.rb
View file @ dbe9e0df
This diff is collapsed.
app/helpers/services_helper.rb
View file @ dbe9e0df
This diff is collapsed.
app/mailers/emails/merge_requests.rb
View file @ dbe9e0df
This diff is collapsed.
app/models/application_setting.rb
View file @ dbe9e0df
This diff is collapsed.
app/models/ci/build.rb
View file @ dbe9e0df
This diff is collapsed.
app/models/ci/group_variable.rb
View file @ dbe9e0df
This diff is collapsed.
app/models/ci/pipeline.rb
View file @ dbe9e0df
This diff is collapsed.
app/models/ci/pipeline_schedule_variable.rb
View file @ dbe9e0df
This diff is collapsed.
app/models/ci/variable.rb
View file @ dbe9e0df
This diff is collapsed.
app/models/commit.rb
View file @ dbe9e0df
This diff is collapsed.
app/models/concerns/atomic_internal_id.rb 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
app/models/concerns/avatarable.rb
View file @ dbe9e0df
This diff is collapsed.
app/models/deployment.rb
View file @ dbe9e0df
This diff is collapsed.
app/models/event.rb
View file @ dbe9e0df
This diff is collapsed.
app/models/group.rb
View file @ dbe9e0df
This diff is collapsed.
app/models/internal_id.rb 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
app/models/issue.rb
View file @ dbe9e0df
This diff is collapsed.
app/models/member.rb
View file @ dbe9e0df
This diff is collapsed.
app/models/merge_request.rb
View file @ dbe9e0df
This diff is collapsed.
app/models/milestone.rb
View file @ dbe9e0df
This diff is collapsed.
app/models/notification_recipient.rb
View file @ dbe9e0df
This diff is collapsed.
app/models/notification_setting.rb
View file @ dbe9e0df
This diff is collapsed.
app/models/pages_domain.rb
View file @ dbe9e0df
This diff is collapsed.
app/models/project.rb
View file @ dbe9e0df
This diff is collapsed.
app/models/project_services/jira_service.rb
View file @ dbe9e0df
This diff is collapsed.
app/models/service.rb
View file @ dbe9e0df
This diff is collapsed.
app/models/user.rb
View file @ dbe9e0df
This diff is collapsed.
app/services/ci/create_pipeline_service.rb
View file @ dbe9e0df
This diff is collapsed.
app/services/notification_service.rb
View file @ dbe9e0df
This diff is collapsed.
app/services/projects/destroy_service.rb
View file @ dbe9e0df
This diff is collapsed.
app/services/projects/import_service.rb
View file @ dbe9e0df
This diff is collapsed.
app/services/projects/update_service.rb
View file @ dbe9e0df
This diff is collapsed.
app/services/submit_usage_ping_service.rb
View file @ dbe9e0df
This diff is collapsed.
app/services/web_hook_service.rb
View file @ dbe9e0df
This diff is collapsed.
app/validators/certificate_validator.rb
View file @ dbe9e0df
This diff is collapsed.
app/validators/importable_url_validator.rb
View file @ dbe9e0df
This diff is collapsed.
app/views/admin/application_settings/_help_page.html.haml 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
app/views/admin/application_settings/_pages.html.haml 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
app/views/admin/application_settings/_signin.html.haml 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
app/views/admin/application_settings/_signup.html.haml 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
app/views/ide/index.html.haml 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
app/views/layouts/_mailer.html.haml
View file @ dbe9e0df
This diff is collapsed.
app/views/layouts/_page.html.haml
View file @ dbe9e0df
This diff is collapsed.
app/views/layouts/header/_read_only_banner.html.haml 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
app/views/notify/push_to_merge_request_email.html.haml 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
app/views/notify/push_to_merge_request_email.text.haml 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
app/views/peek/_bar.html.haml 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
app/views/peek/views/_gitaly.html.haml deleted 100644 → 0
View file @ 1c2530de
This diff is collapsed.
app/views/peek/views/_host.html.haml deleted 100644 → 0
View file @ 1c2530de
This diff is collapsed.
app/views/peek/views/_mysql2.html.haml deleted 100644 → 0
View file @ 1c2530de
This diff is collapsed.
app/views/peek/views/_pg.html.haml deleted 100644 → 0
View file @ 1c2530de
This diff is collapsed.
app/views/peek/views/_rblineprof.html.haml deleted 100644 → 0
View file @ 1c2530de
This diff is collapsed.
app/views/peek/views/_sql.html.haml deleted 100644 → 0
View file @ 1c2530de
This diff is collapsed.
app/views/projects/_last_push.html.haml
View file @ dbe9e0df
This diff is collapsed.
app/views/projects/blob/_header.html.haml
View file @ dbe9e0df
This diff is collapsed.
app/views/projects/diffs/_stats.html.haml
View file @ dbe9e0df
This diff is collapsed.
app/views/projects/issues/_issue.html.haml
View file @ dbe9e0df
This diff is collapsed.
app/views/projects/pages/_https_only.html.haml 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
app/views/projects/pages/show.html.haml
View file @ dbe9e0df
This diff is collapsed.
bin/rails
View file @ dbe9e0df
This diff is collapsed.
bin/rake
View file @ dbe9e0df
This diff is collapsed.
bin/setup
View file @ dbe9e0df
This diff is collapsed.
bin/update 0 → 100755
View file @ dbe9e0df
This diff is collapsed.
changelogs/unreleased/26466-natural-sort-mrs.yml deleted 100644 → 0
View file @ 1c2530de
This diff is collapsed.
changelogs/unreleased/29130-api-project-export.yml deleted 100644 → 0
View file @ 1c2530de
This diff is collapsed.
changelogs/unreleased/31114-internal-ids-are-not-atomic.yml 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
changelogs/unreleased/35530-teleporting-emoji.yml deleted 100644 → 0
View file @ 1c2530de
This diff is collapsed.
changelogs/unreleased/38587-pipelines-empty-state.yml deleted 100644 → 0
View file @ 1c2530de
This diff is collapsed.
changelogs/unreleased/41719-mr-title-fix.yml deleted 100644 → 0
View file @ 1c2530de
This diff is collapsed.
changelogs/unreleased/41949-move.yml deleted 100644 → 0
View file @ 1c2530de
This diff is collapsed.
changelogs/unreleased/42314-diff-file.yml deleted 100644 → 0
View file @ 1c2530de
This diff is collapsed.
changelogs/unreleased/42923-close-issue.yml deleted 100644 → 0
View file @ 1c2530de
This diff is collapsed.
changelogs/unreleased/43315-gpg-popover.yml deleted 100644 → 0
View file @ 1c2530de
This diff is collapsed.
changelogs/unreleased/43489-display-runner-ip.yml deleted 100644 → 0
View file @ 1c2530de
This diff is collapsed.
changelogs/unreleased/43643-fix-mr-label-filtering.yml deleted 100644 → 0
View file @ 1c2530de
This diff is collapsed.
changelogs/unreleased/43771-improve-avatar-error-message.yml 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
changelogs/unreleased/44022-singular-1-diff.yml 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
changelogs/unreleased/44024-fix-table-extra-column.yml deleted 100644 → 0
View file @ 1c2530de
This diff is collapsed.
changelogs/unreleased/44149-issue-comment-buttons.yml deleted 100644 → 0
View file @ 1c2530de
This diff is collapsed.
changelogs/unreleased/44232-docs-for-runner-ip-address.yml 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
changelogs/unreleased/44280-fix-code-search.yml 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
changelogs/unreleased/44383-cleanup-framework-header.yml 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
changelogs/unreleased/ajax-requests-in-performance-bar.yml 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
changelogs/unreleased/an-network-controller-fix.yml deleted 100644 → 0
View file @ 1c2530de
This diff is collapsed.
changelogs/unreleased/an-workhorse-3-8-0.yml deleted 100644 → 0
View file @ 1c2530de
This diff is collapsed.
changelogs/unreleased/api-refs-for-commit.yml deleted 100644 → 0
View file @ 1c2530de
This diff is collapsed.
changelogs/unreleased/bvl-allow-maintainer-to-push.yml deleted 100644 → 0
View file @ 1c2530de
This diff is collapsed.
changelogs/unreleased/bvl-port-of-ee-translations.yml deleted 100644 → 0
View file @ 1c2530de
This diff is collapsed.
changelogs/unreleased/cache-refactor.yml deleted 100644 → 0
View file @ 1c2530de
This diff is collapsed.
changelogs/unreleased/ci-pipeline-commit-lookup.yml 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
changelogs/unreleased/discussions-api.yml deleted 100644 → 0
View file @ 1c2530de
This diff is collapsed.
changelogs/unreleased/dm-dont-cache-nil-root-ref.yml deleted 100644 → 0
View file @ 1c2530de
This diff is collapsed.
changelogs/unreleased/dm-escape-commit-message.yml deleted 100644 → 0
View file @ 1c2530de
This diff is collapsed.
changelogs/unreleased/dm-stuck-import-jobs-verify.yml deleted 100644 → 0
View file @ 1c2530de
This diff is collapsed.
changelogs/unreleased/dz-namespace-id-not-null.yml deleted 100644 → 0
View file @ 1c2530de
This diff is collapsed.
changelogs/unreleased/dz-system-hooks-plugins.yml deleted 100644 → 0
View file @ 1c2530de
This diff is collapsed.
changelogs/unreleased/feature-edit_pages_domain.yml deleted 100644 → 0
View file @ 1c2530de
This diff is collapsed.
changelogs/unreleased/feature-oidc-groups-claim.yml deleted 100644 → 0
View file @ 1c2530de
This diff is collapsed.
changelogs/unreleased/fix-40798-namespace-forking.yml 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
changelogs/unreleased/fix-ci-job-auto-retry.yml 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
changelogs/unreleased/fix-dropzone-project-show.yml deleted 100644 → 0
View file @ 1c2530de
This diff is collapsed.
changelogs/unreleased/fj-15329-services-callbacks-ssrf.yml 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
changelogs/unreleased/fj-28141-redirection-loop.yml deleted 100644 → 0
View file @ 1c2530de
This diff is collapsed.
changelogs/unreleased/fl-refresh-btn.yml deleted 100644 → 0
View file @ 1c2530de
This diff is collapsed.
changelogs/unreleased/group-label-page-breadcrumb.yml deleted 100644 → 0
View file @ 1c2530de
This diff is collapsed.
changelogs/unreleased/issue-39885.yml deleted 100644 → 0
View file @ 1c2530de
This diff is collapsed.
changelogs/unreleased/issue_38337.yml deleted 100644 → 0
View file @ 1c2530de
This diff is collapsed.
changelogs/unreleased/jprovazn-issueref.yml 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
changelogs/unreleased/jprovazn-scoped-limit.yml deleted 100644 → 0
View file @ 1c2530de
This diff is collapsed.
changelogs/unreleased/kp-label-select-vue.yml deleted 100644 → 0
View file @ 1c2530de
This diff is collapsed.
changelogs/unreleased/mr-commit-optimization.yml deleted 100644 → 0
View file @ 1c2530de
This diff is collapsed.
changelogs/unreleased/oauth_generic_provider.yml deleted 100644 → 0
View file @ 1c2530de
This diff is collapsed.
changelogs/unreleased/pages_force_https.yml 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
changelogs/unreleased/replace_redcarpet_with_cmark.yml deleted 100644 → 0
View file @ 1c2530de
This diff is collapsed.
changelogs/unreleased/sh-cache-column-exists.yml deleted 100644 → 0
View file @ 1c2530de
This diff is collapsed.
changelogs/unreleased/sh-cache-table-exists.yml deleted 100644 → 0
View file @ 1c2530de
This diff is collapsed.
changelogs/unreleased/sh-cleanup-after-git-gc.yml deleted 100644 → 0
View file @ 1c2530de
This diff is collapsed.
changelogs/unreleased/sh-dashboard-sort-fix.yml deleted 100644 → 0
View file @ 1c2530de
This diff is collapsed.
changelogs/unreleased/tc-api-fix-expose_url.yml deleted 100644 → 0
View file @ 1c2530de
This diff is collapsed.
changelogs/unreleased/tc-re-add-read-only-banner.yml 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
changelogs/unreleased/unassign-when-leaving.yml deleted 100644 → 0
View file @ 1c2530de
This diff is collapsed.
changelogs/unreleased/update-gitlab-ci-yml-services-docs.yml 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
changelogs/unreleased/upgrade-workhorse-4-0-0.yml deleted 100644 → 0
View file @ 1c2530de
This diff is collapsed.
changelogs/unreleased/winh-deprecate-old-modal.yml 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
changelogs/unreleased/winh-new-modal-component.yml deleted 100644 → 0
View file @ 1c2530de
This diff is collapsed.
changelogs/unreleased/wip-new-mr-cmd.yml deleted 100644 → 0
View file @ 1c2530de
This diff is collapsed.
config.ru
View file @ dbe9e0df
This diff is collapsed.
config/application.rb
View file @ dbe9e0df
This diff is collapsed.
config/boot.rb
View file @ dbe9e0df
This diff is collapsed.
config/environment.rb
View file @ dbe9e0df
This diff is collapsed.
config/environments/production.rb
View file @ dbe9e0df
This diff is collapsed.
config/environments/test.rb
View file @ dbe9e0df
This diff is collapsed.
config/initializers/1_settings.rb
View file @ dbe9e0df
This diff is collapsed.
config/initializers/6_validations.rb
View file @ dbe9e0df
This diff is collapsed.
config/initializers/application_controller_renderer.rb 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
config/initializers/ar5_batching.rb
View file @ dbe9e0df
This diff is collapsed.
config/initializers/ar5_pg_10_support.rb
View file @ dbe9e0df
This diff is collapsed.
config/initializers/ar_native_database_types.rb 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
config/initializers/devise.rb
View file @ dbe9e0df
This diff is collapsed.
config/initializers/lograge.rb
View file @ dbe9e0df
This diff is collapsed.
config/initializers/new_framework_defaults.rb 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
config/karma.config.js
View file @ dbe9e0df
This diff is collapsed.
config/routes.rb
View file @ dbe9e0df
This diff is collapsed.
config/routes/project.rb
View file @ dbe9e0df
This diff is collapsed.
config/spring.rb 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
config/webpack.config.js
View file @ dbe9e0df
This diff is collapsed.
db/migrate/20180102220145_add_pages_https_only_to_projects.rb 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
db/migrate/20180305095250_create_internal_ids_table.rb 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
db/schema.rb
View file @ dbe9e0df
This diff is collapsed.
doc/README.md
View file @ dbe9e0df
This diff is collapsed.
doc/api/notification_settings.md
View file @ dbe9e0df
This diff is collapsed.
doc/api/search.md
View file @ dbe9e0df
This diff is collapsed.
doc/ci/README.md
View file @ dbe9e0df
This diff is collapsed.
doc/ci/caching/img/clear_runners_cache.png 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
doc/ci/caching/index.md 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
doc/ci/docker/using_docker_images.md
View file @ dbe9e0df
This diff is collapsed.
doc/ci/runners/README.md
View file @ dbe9e0df
This diff is collapsed.
doc/ci/runners/img/shared_runner_ip_address.png 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
doc/ci/runners/img/specific_runner_ip_address.png 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
doc/ci/yaml/README.md
View file @ dbe9e0df
This diff is collapsed.
doc/development/emails.md
View file @ dbe9e0df
This diff is collapsed.
doc/development/i18n/proofreader.md
View file @ dbe9e0df
This diff is collapsed.
doc/development/migration_style_guide.md
View file @ dbe9e0df
This diff is collapsed.
doc/img/devops_lifecycle.png 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
doc/install/kubernetes/index.md
View file @ dbe9e0df
This diff is collapsed.
doc/integration/auth0.md
View file @ dbe9e0df
This diff is collapsed.
doc/integration/saml.md
View file @ dbe9e0df
This diff is collapsed.
doc/user/gitlab_com/index.md 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
doc/user/project/clusters/index.md
View file @ dbe9e0df
This diff is collapsed.
doc/user/project/integrations/prometheus.md
View file @ dbe9e0df
This diff is collapsed.
doc/user/project/pipelines/schedules.md
View file @ dbe9e0df
This diff is collapsed.
doc/workflow/notifications.md
View file @ dbe9e0df
This diff is collapsed.
lib/api/helpers/internal_helpers.rb
View file @ dbe9e0df
This diff is collapsed.
lib/api/projects.rb
View file @ dbe9e0df
This diff is collapsed.
lib/api/protected_branches.rb
View file @ dbe9e0df
This diff is collapsed.
lib/api/search.rb
View file @ dbe9e0df
This diff is collapsed.
lib/api/services.rb
View file @ dbe9e0df
This diff is collapsed.
lib/api/v3/projects.rb
View file @ dbe9e0df
This diff is collapsed.
lib/backup/repository.rb
View file @ dbe9e0df
This diff is collapsed.
lib/banzai/filter/autolink_filter.rb
View file @ dbe9e0df
This diff is collapsed.
lib/banzai/filter/issuable_state_filter.rb
View file @ dbe9e0df
This diff is collapsed.
lib/banzai/pipeline/gfm_pipeline.rb
View file @ dbe9e0df
This diff is collapsed.
lib/gitlab/auth.rb
View file @ dbe9e0df
This diff is collapsed.
lib/gitlab/auth/database/authentication.rb
View file @ dbe9e0df
This diff is collapsed.
lib/gitlab/auth/ldap/authentication.rb
View file @ dbe9e0df
This diff is collapsed.
lib/gitlab/auth/o_auth/authentication.rb
View file @ dbe9e0df
This diff is collapsed.
lib/gitlab/ci/pipeline/seed/stage.rb
View file @ dbe9e0df
This diff is collapsed.
lib/gitlab/conflict/file_collection.rb
View file @ dbe9e0df
This diff is collapsed.
lib/gitlab/database/migration_helpers.rb
View file @ dbe9e0df
This diff is collapsed.
lib/gitlab/diff/file.rb
View file @ dbe9e0df
This diff is collapsed.
lib/gitlab/encoding_helper.rb
View file @ dbe9e0df
This diff is collapsed.
lib/gitlab/git/conflict/file.rb
View file @ dbe9e0df
This diff is collapsed.
lib/gitlab/git/conflict/parser.rb
View file @ dbe9e0df
This diff is collapsed.
lib/gitlab/git/gitlab_projects.rb
View file @ dbe9e0df
This diff is collapsed.
lib/gitlab/git/repository.rb
View file @ dbe9e0df
This diff is collapsed.
lib/gitlab/git/storage/checker.rb
View file @ dbe9e0df
This diff is collapsed.
lib/gitlab/git/storage/circuit_breaker.rb
View file @ dbe9e0df
This diff is collapsed.
lib/gitlab/git/wiki.rb
View file @ dbe9e0df
This diff is collapsed.
lib/gitlab/gitaly_client/storage_settings.rb 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
lib/gitlab/health_checks/fs_shards_check.rb
View file @ dbe9e0df
This diff is collapsed.
lib/gitlab/http.rb 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
lib/gitlab/middleware/read_only.rb
View file @ dbe9e0df
This diff is collapsed.
lib/gitlab/omniauth_initializer.rb 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
lib/gitlab/profiler.rb
View file @ dbe9e0df
This diff is collapsed.
lib/gitlab/project_search_results.rb
View file @ dbe9e0df
This diff is collapsed.
lib/gitlab/proxy_http_connection_adapter.rb 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
lib/gitlab/repo_path.rb
View file @ dbe9e0df
This diff is collapsed.
lib/gitlab/setup_helper.rb
View file @ dbe9e0df
This diff is collapsed.
lib/gitlab/shell.rb
View file @ dbe9e0df
This diff is collapsed.
lib/gitlab/task_helpers.rb
View file @ dbe9e0df
This diff is collapsed.
lib/gitlab/url_blocker.rb
View file @ dbe9e0df
This diff is collapsed.
lib/mattermost/session.rb
View file @ dbe9e0df
This diff is collapsed.
lib/microsoft_teams/notifier.rb
View file @ dbe9e0df
This diff is collapsed.
lib/peek/views/host.rb 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
lib/system_check/orphans/namespace_check.rb
View file @ dbe9e0df
This diff is collapsed.
lib/tasks/gitlab/check.rake
View file @ dbe9e0df
This diff is collapsed.
lib/tasks/gitlab/cleanup.rake
View file @ dbe9e0df
This diff is collapsed.
lib/tasks/gitlab/info.rake
View file @ dbe9e0df
This diff is collapsed.
lib/tasks/haml-lint.rake
View file @ dbe9e0df
This diff is collapsed.
package.json
View file @ dbe9e0df
This diff is collapsed.
public/robots.txt
View file @ dbe9e0df
This diff is collapsed.
qa/README.md
View file @ dbe9e0df
This diff is collapsed.
qa/qa/page/README.md
View file @ dbe9e0df
This diff is collapsed.
qa/qa/page/merge_request/show.rb
View file @ dbe9e0df
This diff is collapsed.
rubocop/cop/gitlab/httparty.rb 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
rubocop/rubocop.rb
View file @ dbe9e0df
This diff is collapsed.
scripts/frontend/frontend_script_utils.js
View file @ dbe9e0df
This diff is collapsed.
scripts/frontend/prettier.js
View file @ dbe9e0df
This diff is collapsed.
scripts/lint-doc.sh
View file @ dbe9e0df
This diff is collapsed.
spec/factories/internal_ids.rb 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
spec/factories/pages_domains.rb
View file @ dbe9e0df
This diff is collapsed.
spec/features/admin/admin_settings_spec.rb
View file @ dbe9e0df
This diff is collapsed.
spec/features/markdown/copy_as_gfm_spec.rb
View file @ dbe9e0df
This diff is collapsed.
spec/features/projects/pages_spec.rb
View file @ dbe9e0df
This diff is collapsed.
spec/features/projects/tree/create_directory_spec.rb 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
spec/features/projects/tree/create_file_spec.rb 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
spec/features/projects/tree/upload_file_spec.rb 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
spec/features/read_only_spec.rb 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
spec/initializers/6_validations_spec.rb
View file @ dbe9e0df
This diff is collapsed.
spec/initializers/settings_spec.rb
View file @ dbe9e0df
This diff is collapsed.
spec/javascripts/ide/components/changed_file_icon_spec.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
spec/javascripts/ide/components/commit_sidebar/actions_spec.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
spec/javascripts/ide/components/commit_sidebar/list_spec.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
spec/javascripts/ide/components/ide_context_bar_spec.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
spec/javascripts/ide/components/ide_external_links_spec.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
spec/javascripts/ide/components/ide_project_tree_spec.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
spec/javascripts/ide/components/ide_repo_tree_spec.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
spec/javascripts/ide/components/ide_side_bar_spec.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
spec/javascripts/ide/components/ide_spec.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
spec/javascripts/ide/components/new_dropdown/index_spec.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
spec/javascripts/ide/components/new_dropdown/modal_spec.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
spec/javascripts/ide/components/new_dropdown/upload_spec.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
spec/javascripts/ide/components/repo_commit_section_spec.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
spec/javascripts/ide/components/repo_editor_spec.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
spec/javascripts/ide/components/repo_file_buttons_spec.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
spec/javascripts/ide/components/repo_file_spec.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
spec/javascripts/ide/components/repo_loading_file_spec.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
spec/javascripts/ide/components/repo_tab_spec.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
spec/javascripts/ide/components/repo_tabs_spec.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
spec/javascripts/ide/helpers.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
spec/javascripts/ide/lib/common/disposable_spec.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
spec/javascripts/ide/lib/common/model_manager_spec.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
spec/javascripts/ide/lib/common/model_spec.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
spec/javascripts/ide/lib/decorations/controller_spec.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
spec/javascripts/ide/lib/diff/controller_spec.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
spec/javascripts/ide/lib/diff/diff_spec.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
spec/javascripts/ide/lib/editor_options_spec.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
spec/javascripts/ide/lib/editor_spec.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
spec/javascripts/ide/monaco_loader_spec.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
spec/javascripts/ide/stores/actions/file_spec.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
spec/javascripts/ide/stores/actions/tree_spec.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
spec/javascripts/ide/stores/actions_spec.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
spec/javascripts/ide/stores/getters_spec.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
spec/javascripts/ide/stores/modules/commit/actions_spec.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
spec/javascripts/ide/stores/modules/commit/getters_spec.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
spec/javascripts/ide/stores/modules/commit/mutations_spec.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
spec/javascripts/ide/stores/mutations/branch_spec.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
spec/javascripts/ide/stores/mutations/file_spec.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
spec/javascripts/ide/stores/mutations/tree_spec.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
spec/javascripts/ide/stores/mutations_spec.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
spec/javascripts/ide/stores/utils_spec.js 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
spec/javascripts/notes_spec.js
View file @ dbe9e0df
This diff is collapsed.
spec/javascripts/shortcuts_issuable_spec.js
View file @ dbe9e0df
This diff is collapsed.
spec/lib/backup/repository_spec.rb
View file @ dbe9e0df
This diff is collapsed.
spec/lib/gitlab/auth_spec.rb
View file @ dbe9e0df
This diff is collapsed.
spec/lib/gitlab/ci/trace_spec.rb
View file @ dbe9e0df
This diff is collapsed.
spec/lib/gitlab/diff/file_spec.rb
View file @ dbe9e0df
This diff is collapsed.
spec/lib/gitlab/encoding_helper_spec.rb
View file @ dbe9e0df
This diff is collapsed.
spec/lib/gitlab/git/conflict/file_spec.rb 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
spec/lib/gitlab/git/conflict/parser_spec.rb
View file @ dbe9e0df
This diff is collapsed.
spec/lib/gitlab/http_spec.rb 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
spec/lib/gitlab/omniauth_initializer_spec.rb 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
spec/lib/gitlab/profiler_spec.rb
View file @ dbe9e0df
This diff is collapsed.
spec/lib/gitlab/repo_path_spec.rb
View file @ dbe9e0df
This diff is collapsed.
spec/lib/gitlab/shell_spec.rb
View file @ dbe9e0df
This diff is collapsed.
spec/lib/gitlab/url_blocker_spec.rb
View file @ dbe9e0df
This diff is collapsed.
spec/lib/mattermost/command_spec.rb
View file @ dbe9e0df
This diff is collapsed.
spec/lib/mattermost/session_spec.rb
View file @ dbe9e0df
This diff is collapsed.
spec/lib/mattermost/team_spec.rb
View file @ dbe9e0df
This diff is collapsed.
spec/models/ci/build_spec.rb
View file @ dbe9e0df
This diff is collapsed.
spec/models/concerns/issuable_spec.rb
View file @ dbe9e0df
This diff is collapsed.
spec/models/group_spec.rb
View file @ dbe9e0df
This diff is collapsed.
spec/models/internal_id_spec.rb 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
spec/models/issue_spec.rb
View file @ dbe9e0df
This diff is collapsed.
spec/models/merge_request_spec.rb
View file @ dbe9e0df
This diff is collapsed.
spec/models/namespace_spec.rb
View file @ dbe9e0df
This diff is collapsed.
spec/models/pages_domain_spec.rb
View file @ dbe9e0df
This diff is collapsed.
spec/models/project_spec.rb
View file @ dbe9e0df
This diff is collapsed.
spec/models/repository_spec.rb
View file @ dbe9e0df
This diff is collapsed.
spec/models/user_spec.rb
View file @ dbe9e0df
This diff is collapsed.
spec/requests/api/internal_spec.rb
View file @ dbe9e0df
This diff is collapsed.
spec/requests/api/pages_domains_spec.rb
View file @ dbe9e0df
This diff is collapsed.
spec/requests/api/projects_spec.rb
View file @ dbe9e0df
This diff is collapsed.
spec/requests/api/search_spec.rb
View file @ dbe9e0df
This diff is collapsed.
spec/requests/api/templates_spec.rb
View file @ dbe9e0df
This diff is collapsed.
spec/requests/api/v3/templates_spec.rb
View file @ dbe9e0df
This diff is collapsed.
spec/rubocop/cop/gitlab/httparty_spec.rb 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
spec/services/notification_service_spec.rb
View file @ dbe9e0df
This diff is collapsed.
spec/services/projects/fork_service_spec.rb
View file @ dbe9e0df
This diff is collapsed.
spec/services/system_note_service_spec.rb
View file @ dbe9e0df
This diff is collapsed.
spec/services/web_hook_service_spec.rb
View file @ dbe9e0df
This diff is collapsed.
spec/spec_helper.rb
View file @ dbe9e0df
This diff is collapsed.
spec/support/shared_examples/models/atomic_internal_id_spec.rb 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
spec/support/stored_repositories.rb
View file @ dbe9e0df
This diff is collapsed.
spec/support/stub_configuration.rb
View file @ dbe9e0df
This diff is collapsed.
spec/support/test_env.rb
View file @ dbe9e0df
This diff is collapsed.
spec/tasks/gitlab/backup_rake_spec.rb
View file @ dbe9e0df
This diff is collapsed.
spec/tasks/gitlab/cleanup_rake_spec.rb
View file @ dbe9e0df
This diff is collapsed.
spec/tasks/gitlab/git_rake_spec.rb
View file @ dbe9e0df
This diff is collapsed.
spec/tasks/gitlab/gitaly_rake_spec.rb
View file @ dbe9e0df
This diff is collapsed.
spec/tasks/gitlab/shell_rake_spec.rb
View file @ dbe9e0df
This diff is collapsed.
spec/views/projects/diffs/_stats.html.haml_spec.rb 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
spec/views/projects/services/_form.haml_spec.rb 0 → 100644
View file @ dbe9e0df
This diff is collapsed.
vendor/assets/javascripts/peek.js deleted 100644 → 0
View file @ 1c2530de
This diff is collapsed.
yarn.lock
View file @ dbe9e0df
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7