Skip to content

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

Merge branch 'master' into 38542-application-control-panel-in-settings-page

parents 44be5883 dd6aade3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 11593 additions and 3147 deletions
.gitlab/issue_templates/Feature Proposal.md
View file @ 9efb1875
### Description
### Problem to solve
(Include problem, use cases, benefits, and/or goals)
### Further details
(Include use cases, benefits, and/or goals)
### Proposal
### What does success look like, and how can we measure that?
(If no way to measure success, link to an issue that will implement a way to measure this)
### Links / references
/label ~"feature proposal"
CONTRIBUTING.md
View file @ 9efb1875
......@@ -182,7 +182,7 @@ Assigning a team label makes sure issues get the attention of the appropriate
people.
The current team labels are ~Distribution, ~"CI/CD", ~Discussion, ~Documentation, ~Quality,
~Geo, ~Gitaly, ~Monitoring, ~Platform, ~Release, ~"Security Products" and ~"UX".
~Geo, ~Gitaly, ~Monitoring, ~Platform, ~Release, ~"Security Products", ~"Configuration", and ~"UX".
The descriptions on the [labels page][labels-page] explain what falls under the
responsibility of each team.
......@@ -349,7 +349,7 @@ on those issues. Please select someone with relevant experience from the
[GitLab team][team]. If there is nobody mentioned with that expertise look in
the commit history for the affected files to find someone.
[described in our handbook]: https://about.gitlab.com/handbook/engineering/issues/issue-triage-policies/
[described in our handbook]: https://about.gitlab.com/handbook/engineering/issue-triage/
[issue bash events]: https://gitlab.com/gitlab-org/gitlab-ce/issues/17815
### Feature proposals
......@@ -512,7 +512,7 @@ request is as follows:
1. Write [tests](https://docs.gitlab.com/ee/development/rake_tasks.html#run-tests) and code
1. [Generate a changelog entry with `bin/changelog`][changelog]
1. If you are writing documentation, make sure to follow the
[documentation styleguide][doc-styleguide]
[documentation guidelines][doc-guidelines]
1. If you have multiple commits please combine them into a few logically
organized commits by [squashing them][git-squash]
1. Push the commit(s) to your fork
......@@ -727,7 +727,7 @@ available at [http://contributor-covenant.org/version/1/1/0/](http://contributor
[rss-source]: https://github.com/bbatsov/ruby-style-guide/blob/master/README.md#source-code-layout
[rss-naming]: https://github.com/bbatsov/ruby-style-guide/blob/master/README.md#naming
[changelog]: doc/development/changelog.md "Generate a changelog entry"
[doc-styleguide]: doc/development/doc_styleguide.md "Documentation styleguide"
[doc-guidelines]: doc/development/documentation/index.md "Documentation guidelines"
[js-styleguide]: doc/development/fe_guide/style_guide_js.md "JavaScript styleguide"
[scss-styleguide]: doc/development/fe_guide/style_guide_scss.md "SCSS styleguide"
[newlines-styleguide]: doc/development/newlines_styleguide.md "Newlines styleguide"
......
Gemfile
View file @ 9efb1875
......@@ -93,6 +93,10 @@ gem 'grape', '~> 1.0'
gem 'grape-entity', '~> 0.7.1'
gem 'rack-cors', '~> 1.0.0', require: 'rack/cors'
# GraphQL API
gem 'graphql', '~> 1.8.0'
gem 'graphiql-rails', '~> 1.4.10'
# Disable strong_params so that Mash does not respond to :permitted?
gem 'hashie-forbidden_attributes'
......@@ -342,7 +346,7 @@ group :development, :test do
gem 'capybara', '~> 2.15'
gem 'capybara-screenshot', '~> 1.0.0'
gem 'selenium-webdriver', '~> 3.5'
gem 'selenium-webdriver', '~> 3.12'
gem 'spring', '~> 2.0.0'
gem 'spring-commands-rspec', '~> 1.0.4'
......@@ -374,7 +378,7 @@ end
group :test do
gem 'shoulda-matchers', '~> 3.1.2', require: false
gem 'email_spec', '~> 1.6.0'
gem 'email_spec', '~> 2.2.0'
gem 'json-schema', '~> 2.8.0'
gem 'webmock', '~> 2.3.2'
gem 'rails-controller-testing' if rails5? # Rails5 only gem.
......@@ -384,7 +388,7 @@ group :test do
gem 'test-prof', '~> 0.2.5'
end
gem 'octokit', '~> 4.8'
gem 'octokit', '~> 4.9'
gem 'mail_room', '~> 0.9.1'
......
Gemfile.lock
View file @ 9efb1875
......@@ -115,7 +115,7 @@ GEM
mime-types (>= 1.16)
cause (0.1)
charlock_holmes (0.7.6)
childprocess (0.7.0)
childprocess (0.9.0)
ffi (~> 1.0, >= 1.0.11)
chronic (0.10.2)
chronic_duration (0.10.6)
......@@ -172,15 +172,16 @@ GEM
unf (>= 0.0.5, < 1.0.0)
doorkeeper (4.3.2)
railties (>= 4.2)
doorkeeper-openid_connect (1.3.0)
doorkeeper-openid_connect (1.4.0)
doorkeeper (~> 4.3)
json-jwt (~> 1.6)
dropzonejs-rails (0.7.2)
rails (> 3.1)
email_reply_trimmer (0.1.6)
email_spec (1.6.0)
email_spec (2.2.0)
htmlentities (~> 4.3.3)
launchy (~> 2.1)
mail (~> 2.2)
mail (~> 2.7)
encryptor (3.0.0)
equalizer (0.0.11)
erubis (2.7.0)
......@@ -358,12 +359,16 @@ GEM
grape-entity (0.7.1)
activesupport (>= 4.0)
multi_json (>= 1.3.2)
grape-path-helpers (1.0.1)
grape-path-helpers (1.0.2)
activesupport (~> 4)
grape (~> 1.0)
rake (~> 12)
grape_logging (1.7.0)
grape
graphiql-rails (1.4.10)
railties
sprockets-rails
graphql (1.8.1)
grpc (1.11.0)
google-protobuf (~> 3.1)
googleapis-common-protos-types (~> 1.0.0)
......@@ -517,7 +522,7 @@ GEM
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (>= 1.2, < 3)
octokit (4.8.0)
octokit (4.9.0)
sawyer (~> 0.8.0, >= 0.5.3)
omniauth (1.8.1)
hashie (>= 3.4.6, < 3.6.0)
......@@ -828,9 +833,9 @@ GEM
activesupport (>= 3.1)
select2-rails (3.5.9.3)
thor (~> 0.14)
selenium-webdriver (3.5.0)
selenium-webdriver (3.12.0)
childprocess (~> 0.5)
rubyzip (~> 1.0)
rubyzip (~> 1.2)
sentry-raven (2.7.2)
faraday (>= 0.7.6, < 1.0)
settingslogic (2.0.9)
......@@ -1012,7 +1017,7 @@ DEPENDENCIES
doorkeeper-openid_connect (~> 1.3)
dropzonejs-rails (~> 0.7.1)
email_reply_trimmer (~> 0.1)
email_spec (~> 1.6.0)
email_spec (~> 2.2.0)
factory_bot_rails (~> 4.8.2)
faraday (~> 0.12)
fast_blank
......@@ -1052,6 +1057,8 @@ DEPENDENCIES
grape-entity (~> 0.7.1)
grape-path-helpers (~> 1.0)
grape_logging (~> 1.7)
graphiql-rails (~> 1.4.10)
graphql (~> 1.8.0)
grpc (~> 1.11.0)
haml_lint (~> 0.26.0)
hamlit (~> 2.6.1)
......@@ -1084,7 +1091,7 @@ DEPENDENCIES
net-ssh (~> 4.2.0)
nokogiri (~> 1.8.2)
oauth2 (~> 1.4)
octokit (~> 4.8)
octokit (~> 4.9)
omniauth (~> 1.8)
omniauth-auth0 (~> 2.0.0)
omniauth-authentiq (~> 0.3.3)
......@@ -1154,7 +1161,7 @@ DEPENDENCIES
scss_lint (~> 0.56.0)
seed-fu (~> 2.3.7)
select2-rails (~> 3.5.9)
selenium-webdriver (~> 3.5)
selenium-webdriver (~> 3.12)
sentry-raven (~> 2.7)
settingslogic (~> 2.0.9)
sham_rack (~> 1.3.6)
......
Gemfile.rails5.lock
View file @ 9efb1875
......@@ -72,8 +72,6 @@ GEM
attr_encrypted (3.1.0)
encryptor (~> 3.0.0)
attr_required (1.0.1)
autoprefixer-rails (8.1.0.1)
execjs
awesome_print (1.2.0)
axiom-types (0.1.1)
descendants_tracker (~> 0.0.4)
......@@ -93,9 +91,6 @@ GEM
binding_of_caller (0.7.3)
debug_inspector (>= 0.0.1)
blankslate (2.1.2.4)
bootstrap-sass (3.3.7)
autoprefixer-rails (>= 5.2.1)
sass (>= 3.3.4)
bootstrap_form (2.7.0)
brakeman (4.2.1)
browser (2.5.3)
......@@ -175,7 +170,7 @@ GEM
diff-lcs (1.3)
diffy (3.1.0)
docile (1.1.5)
domain_name (0.5.20170404)
domain_name (0.5.20180417)
unf (>= 0.0.5, < 1.0.0)
doorkeeper (4.3.1)
railties (>= 4.2)
......@@ -185,9 +180,10 @@ GEM
dropzonejs-rails (0.7.4)
rails (> 3.1)
email_reply_trimmer (0.1.10)
email_spec (1.6.0)
email_spec (2.2.0)
htmlentities (~> 4.3.3)
launchy (~> 2.1)
mail (~> 2.2)
mail (~> 2.7)
encryptor (3.0.0)
equalizer (0.0.11)
erubis (2.7.0)
......@@ -288,7 +284,7 @@ GEM
gettext_i18n_rails (>= 0.7.1)
po_to_json (>= 1.0.0)
rails (>= 3.2.0)
gitaly-proto (0.99.0)
gitaly-proto (0.100.0)
google-protobuf (~> 3.1)
grpc (~> 1.10)
github-linguist (5.3.3)
......@@ -365,9 +361,9 @@ GEM
grape-entity (0.7.1)
activesupport (>= 4.0)
multi_json (>= 1.3.2)
grape-route-helpers (2.1.0)
grape-path-helpers (1.0.0)
activesupport
grape (>= 0.16.0)
grape (~> 1.0)
rake
grape_logging (1.7.0)
grape
......@@ -417,6 +413,7 @@ GEM
httpclient (2.8.3)
i18n (1.0.1)
concurrent-ruby (~> 1.0)
icalendar (2.4.1)
ice_nine (0.11.2)
influxdb (0.5.3)
ipaddress (0.8.3)
......@@ -450,9 +447,9 @@ GEM
kgio (2.11.2)
knapsack (1.16.0)
rake
kubeclient (3.0.0)
kubeclient (3.1.1)
http (~> 2.2.2)
recursive-open-struct (~> 1.0.4)
recursive-open-struct (~> 1.0, >= 1.0.4)
rest-client (~> 2.0)
launchy (2.4.3)
addressable (~> 2.3)
......@@ -521,15 +518,16 @@ GEM
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (>= 1.2, < 3)
octokit (4.8.0)
octokit (4.9.0)
sawyer (~> 0.8.0, >= 0.5.3)
omniauth (1.8.1)
hashie (>= 3.4.6, < 3.6.0)
rack (>= 1.6.2, < 3)
omniauth-auth0 (2.0.0)
omniauth-oauth2 (~> 1.4)
omniauth-authentiq (0.3.1)
omniauth-oauth2 (~> 1.3, >= 1.3.1)
omniauth-authentiq (0.3.3)
jwt (>= 1.5)
omniauth-oauth2 (>= 1.5)
omniauth-azure-oauth2 (0.0.9)
jwt (~> 1.0)
omniauth (~> 1.0)
......@@ -628,7 +626,7 @@ GEM
parser
unparser
procto (0.0.3)
prometheus-client-mmap (0.9.2)
prometheus-client-mmap (0.9.3)
pry (0.11.3)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
......@@ -702,11 +700,11 @@ GEM
ffi
rbnacl-libsodium (1.0.16)
rbnacl (>= 3.0.1)
rdoc (4.3.0)
rdoc (6.0.4)
re2 (1.1.1)
recaptcha (3.4.0)
json
recursive-open-struct (1.0.5)
recursive-open-struct (1.1.0)
redcarpet (3.4.0)
redis (3.3.5)
redis-actionpack (5.0.2)
......@@ -716,8 +714,8 @@ GEM
redis-activesupport (5.0.4)
activesupport (>= 3, < 6)
redis-store (>= 1.3, < 2)
redis-namespace (1.5.3)
redis (~> 3.0, >= 3.0.4)
redis-namespace (1.6.0)
redis (>= 3.0.4)
redis-rack (2.0.4)
rack (>= 1.5, < 3)
redis-store (>= 1.2, < 2)
......@@ -836,7 +834,7 @@ GEM
activesupport (>= 3.1)
select2-rails (3.5.10)
thor (~> 0.14)
selenium-webdriver (3.11.0)
selenium-webdriver (3.12.0)
childprocess (~> 0.5)
rubyzip (~> 1.2)
sentry-raven (2.7.2)
......@@ -986,7 +984,7 @@ DEPENDENCIES
asciidoctor-plantuml (= 0.0.8)
asset_sync (~> 2.4)
attr_encrypted (~> 3.1.0)
awesome_print (~> 1.2.0)
awesome_print
babosa (~> 1.0.2)
base32 (~> 0.3.0)
batch-loader (~> 1.2.1)
......@@ -994,7 +992,6 @@ DEPENDENCIES
benchmark-ips (~> 2.3.0)
better_errors (~> 2.1.0)
binding_of_caller (~> 0.7.2)
bootstrap-sass (~> 3.3.0)
bootstrap_form (~> 2.7.0)
brakeman (~> 4.2)
browser (~> 2.2)
......@@ -1021,7 +1018,7 @@ DEPENDENCIES
doorkeeper-openid_connect (~> 1.3)
dropzonejs-rails (~> 0.7.1)
email_reply_trimmer (~> 0.1)
email_spec (~> 1.6.0)
email_spec (~> 2.2.0)
factory_bot_rails (~> 4.8.2)
faraday (~> 0.12)
fast_blank
......@@ -1045,7 +1042,7 @@ DEPENDENCIES
gettext (~> 3.2.2)
gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.3)
gitaly-proto (~> 0.99.0)
gitaly-proto (~> 0.100.0)
github-linguist (~> 5.3.3)
gitlab-flowdock-git-hook (~> 1.0.1)
gitlab-gollum-lib (~> 4.2)
......@@ -1059,7 +1056,7 @@ DEPENDENCIES
gpgme
grape (~> 1.0)
grape-entity (~> 0.7.1)
grape-route-helpers (~> 2.1.0)
grape-path-helpers (~> 1.0)
grape_logging (~> 1.7)
grpc (~> 1.11.0)
haml_lint (~> 0.26.0)
......@@ -1070,6 +1067,7 @@ DEPENDENCIES
html-pipeline (~> 2.7.1)
html2text
httparty (~> 0.13.3)
icalendar
influxdb (~> 0.2)
jira-ruby (~> 1.4)
jquery-atwho-rails (~> 1.3.2)
......@@ -1077,7 +1075,7 @@ DEPENDENCIES
jwt (~> 1.5.6)
kaminari (~> 1.0)
knapsack (~> 1.16)
kubeclient (~> 3.0)
kubeclient (~> 3.1.0)
letter_opener_web (~> 1.3.0)
license_finder (~> 3.1)
licensee (~> 8.9)
......@@ -1092,10 +1090,10 @@ DEPENDENCIES
net-ssh (~> 4.2.0)
nokogiri (~> 1.8.2)
oauth2 (~> 1.4)
octokit (~> 4.8)
octokit (~> 4.9)
omniauth (~> 1.8)
omniauth-auth0 (~> 2.0.0)
omniauth-authentiq (~> 0.3.1)
omniauth-authentiq (~> 0.3.3)
omniauth-azure-oauth2 (~> 0.0.9)
omniauth-cas3 (~> 1.1.4)
omniauth-facebook (~> 4.0.0)
......@@ -1118,7 +1116,7 @@ DEPENDENCIES
peek-sidekiq (~> 1.0.3)
pg (~> 0.18.2)
premailer-rails (~> 1.9.7)
prometheus-client-mmap (~> 0.9.2)
prometheus-client-mmap (~> 0.9.3)
pry-byebug (~> 3.4.1)
pry-rails (~> 0.3.4)
rack-attack (~> 4.4.1)
......@@ -1134,12 +1132,12 @@ DEPENDENCIES
rblineprof (~> 0.3.6)
rbnacl (~> 4.0)
rbnacl-libsodium
rdoc (~> 4.2)
rdoc (~> 6.0)
re2 (~> 1.1.1)
recaptcha (~> 3.0)
redcarpet (~> 3.4)
redis (~> 3.2)
redis-namespace (~> 1.5.2)
redis-namespace (~> 1.6.0)
redis-rails (~> 5.0.2)
request_store (~> 1.3)
responders (~> 2.0)
......@@ -1154,6 +1152,7 @@ DEPENDENCIES
rubocop-rspec (~> 1.22.1)
ruby-fogbugz (~> 0.2.1)
ruby-prof (~> 0.17.0)
ruby-progressbar
ruby_parser (~> 3.8)
rufus-scheduler (~> 3.4)
rugged (~> 0.27)
......@@ -1162,12 +1161,12 @@ DEPENDENCIES
scss_lint (~> 0.56.0)
seed-fu (~> 2.3.7)
select2-rails (~> 3.5.9)
selenium-webdriver (~> 3.5)
selenium-webdriver (~> 3.12)
sentry-raven (~> 2.7)
settingslogic (~> 2.0.9)
sham_rack (~> 1.3.6)
shoulda-matchers (~> 3.1.2)
sidekiq (~> 5.0)
sidekiq (~> 5.1)
sidekiq-cron (~> 0.6.0)
sidekiq-limit_fetch (~> 3.4)
simple_po_parser (~> 1.1.2)
......@@ -1199,4 +1198,4 @@ DEPENDENCIES
wikicloth (= 0.8.1)
BUNDLED WITH
1.16.1
1.16.2
PROCESS.md
View file @ 9efb1875
......@@ -168,6 +168,7 @@ the stable branch are:
* Fixes for [regressions](#regressions)
* Fixes for security issues
* Fixes or improvements to automated QA scenarios
* New or updated translations (as long as they do not touch application code)
During the feature freeze all merge requests that are meant to go into the
......
README.md
View file @ 9efb1875
......@@ -126,5 +126,5 @@ Please see [Getting help for GitLab](https://about.gitlab.com/getting-help/) on
## Is it awesome?
Thanks for [asking this question](https://twitter.com/supersloth/status/489462789384056832) Joshua.
[These people](https://twitter.com/gitlab/likes) seem to like it.
app/assets/javascripts/clusters/components/application_row.vue
View file @ 9efb1875
......@@ -187,7 +187,7 @@
role="row"
>
<div
class="alert alert-danger alert-block append-bottom-0"
class="alert alert-danger alert-block append-bottom-0 clusters-error-alert"
role="gridcell"
>
<div>
......
app/assets/javascripts/ide/components/activity_bar.vue
View file @ 9efb1875
<script>
import $ from 'jquery';
import { mapActions, mapGetters, mapState } from 'vuex';
import Icon from '~/vue_shared/components/icon.vue';
import tooltip from '~/vue_shared/directives/tooltip';
......@@ -20,6 +21,13 @@ export default {
},
methods: {
...mapActions(['updateActivityBarView']),
changedActivityView(e, view) {
e.currentTarget.blur();
this.updateActivityBarView(view);
$(e.currentTarget).tooltip('hide');
},
},
activityBarViews,
};
......@@ -54,7 +62,7 @@ export default {
:class="{
active: currentActivityView === $options.activityBarViews.edit
}"
@click.prevent="updateActivityBarView($options.activityBarViews.edit)"
@click.prevent="changedActivityView($event, $options.activityBarViews.edit)"
:title="s__('IDE|Edit')"
:aria-label="s__('IDE|Edit')"
>
......@@ -73,7 +81,7 @@ export default {
:class="{
active: currentActivityView === $options.activityBarViews.review
}"
@click.prevent="updateActivityBarView($options.activityBarViews.review)"
@click.prevent="changedActivityView($event, $options.activityBarViews.review)"
:title="s__('IDE|Review')"
:aria-label="s__('IDE|Review')"
>
......@@ -92,7 +100,7 @@ export default {
:class="{
active: currentActivityView === $options.activityBarViews.commit
}"
@click.prevent="updateActivityBarView($options.activityBarViews.commit)"
@click.prevent="changedActivityView($event, $options.activityBarViews.commit)"
:title="s__('IDE|Commit')"
:aria-label="s__('IDE|Commit')"
>
......
app/assets/javascripts/ide/components/commit_sidebar/message_field.vue
View file @ 9efb1875
......@@ -54,7 +54,7 @@ export default {
placement: 'top',
content: sprintf(
__(`
The character highligher helps you keep the subject line to %{titleLength} characters
The character highlighter helps you keep the subject line to %{titleLength} characters
and wrap the body at %{bodyLength} so they are readable in git.
`),
{ titleLength: MAX_TITLE_LENGTH, bodyLength: MAX_BODY_LENGTH },
......
app/assets/javascripts/ide/components/ide_review.vue
View file @ 9efb1875
......@@ -11,17 +11,20 @@ export default {
},
computed: {
...mapGetters(['currentMergeRequest']),
...mapState(['viewer']),
...mapState(['viewer', 'currentMergeRequestId']),
showLatestChangesText() {
return !this.currentMergeRequest || this.viewer === viewerTypes.diff;
return !this.currentMergeRequestId || this.viewer === viewerTypes.diff;
},
showMergeRequestText() {
return this.currentMergeRequest && this.viewer === viewerTypes.mr;
return this.currentMergeRequestId && this.viewer === viewerTypes.mr;
},
mergeRequestId() {
return `!${this.currentMergeRequest.iid}`;
},
},
mounted() {
this.$nextTick(() => {
this.updateViewer(this.currentMergeRequest ? viewerTypes.mr : viewerTypes.diff);
this.updateViewer(this.currentMergeRequestId ? viewerTypes.mr : viewerTypes.diff);
});
},
methods: {
......@@ -54,7 +57,11 @@ export default {
</template>
<template v-else-if="showMergeRequestText">
{{ __('Merge request') }}
(<a :href="currentMergeRequest.web_url">!{{ currentMergeRequest.iid }}</a>)
(<a
v-if="currentMergeRequest"
:href="currentMergeRequest.web_url"
v-text="mergeRequestId"
></a>)
</template>
</div>
</template>
......
app/assets/javascripts/ide/components/ide_side_bar.vue
View file @ 9efb1875
<script>
import $ from 'jquery';
import { mapState, mapGetters } from 'vuex';
import ProjectAvatarImage from '~/vue_shared/components/project_avatar/image.vue';
import Icon from '~/vue_shared/components/icon.vue';
......@@ -13,6 +14,7 @@ import CommitSection from './repo_commit_section.vue';
import CommitForm from './commit_sidebar/form.vue';
import IdeReview from './ide_review.vue';
import SuccessMessage from './commit_sidebar/success_message.vue';
import MergeRequestDropdown from './merge_requests/dropdown.vue';
import { activityBarViews } from '../constants';
export default {
......@@ -32,10 +34,12 @@ export default {
CommitForm,
IdeReview,
SuccessMessage,
MergeRequestDropdown,
},
data() {
return {
showTooltip: false,
showMergeRequestsDropdown: false,
};
},
computed: {
......@@ -46,6 +50,7 @@ export default {
'changedFiles',
'stagedFiles',
'lastCommitMsg',
'currentMergeRequestId',
]),
...mapGetters(['currentProject', 'someUncommitedChanges']),
showSuccessMessage() {
......@@ -61,9 +66,39 @@ export default {
watch: {
currentBranchId() {
this.$nextTick(() => {
if (!this.$refs.branchId) return;
this.showTooltip = this.$refs.branchId.scrollWidth > this.$refs.branchId.offsetWidth;
});
},
loading() {
this.$nextTick(() => {
this.addDropdownListeners();
});
},
},
mounted() {
this.addDropdownListeners();
},
beforeDestroy() {
$(this.$refs.mergeRequestDropdown)
.off('show.bs.dropdown')
.off('hide.bs.dropdown');
},
methods: {
addDropdownListeners() {
if (!this.$refs.mergeRequestDropdown) return;
$(this.$refs.mergeRequestDropdown)
.on('show.bs.dropdown', () => {
this.toggleMergeRequestDropdown();
}).on('hide.bs.dropdown', () => {
this.toggleMergeRequestDropdown();
});
},
toggleMergeRequestDropdown() {
this.showMergeRequestsDropdown = !this.showMergeRequestsDropdown;
},
},
};
</script>
......@@ -88,9 +123,13 @@ export default {
</div>
</template>
<template v-else>
<div class="context-header ide-context-header">
<a
:href="currentProject.web_url"
<div
class="context-header ide-context-header dropdown"
ref="mergeRequestDropdown"
>
<button
type="button"
data-toggle="dropdown"
>
<div
v-if="currentProject.avatar_url"
......@@ -114,19 +153,41 @@ export default {
<div class="sidebar-context-title">
{{ currentProject.name }}
</div>
<div
class="sidebar-context-title ide-sidebar-branch-title"
ref="branchId"
v-tooltip
:title="branchTooltipTitle"
>
<icon
name="branch"
css-classes="append-right-5"
/>{{ currentBranchId }}
<div class="d-flex">
<div
v-if="currentBranchId"
class="sidebar-context-title ide-sidebar-branch-title"
ref="branchId"
v-tooltip
:title="branchTooltipTitle"
>
<icon
name="branch"
css-classes="append-right-5"
/>{{ currentBranchId }}
</div>
<div
v-if="currentMergeRequestId"
class="sidebar-context-title ide-sidebar-branch-title"
:class="{
'prepend-left-8': currentBranchId
}"
>
<icon
name="git-merge"
css-classes="append-right-5"
/>!{{ currentMergeRequestId }}
</div>
</div>
</div>
</a>
<icon
class="ml-auto"
name="chevron-down"
/>
</button>
<merge-request-dropdown
:show="showMergeRequestsDropdown"
/>
</div>
<div class="multi-file-commit-panel-inner-scroll">
<component
......
app/assets/javascripts/ide/components/ide_status_bar.vue
View file @ 9efb1875
......@@ -35,9 +35,7 @@ export default {
},
watch: {
lastCommit() {
if (!this.isPollingInitialized) {
this.initPipelinePolling();
}
this.initPipelinePolling();
},
},
mounted() {
......@@ -47,9 +45,8 @@ export default {
if (this.intervalId) {
clearInterval(this.intervalId);
}
if (this.isPollingInitialized) {
this.stopPipelinePolling();
}
this.stopPipelinePolling();
},
methods: {
...mapActions('pipelines', ['fetchLatestPipeline', 'stopPipelinePolling']),
......@@ -59,8 +56,9 @@ export default {
}, 1000);
},
initPipelinePolling() {
this.fetchLatestPipeline();
this.isPollingInitialized = true;
if (this.lastCommit) {
this.fetchLatestPipeline();
}
},
commitAgeUpdate() {
if (this.lastCommit) {
......
app/assets/javascripts/ide/components/jobs/detail.vue 0 → 100644
View file @ 9efb1875
<script>
import { mapActions, mapState } from 'vuex';
import _ from 'underscore';
import { __ } from '../../../locale';
import tooltip from '../../../vue_shared/directives/tooltip';
import Icon from '../../../vue_shared/components/icon.vue';
import ScrollButton from './detail/scroll_button.vue';
import JobDescription from './detail/description.vue';
const scrollPositions = {
top: 0,
bottom: 1,
};
export default {
directives: {
tooltip,
},
components: {
Icon,
ScrollButton,
JobDescription,
},
data() {
return {
scrollPos: scrollPositions.top,
};
},
computed: {
...mapState('pipelines', ['detailJob']),
isScrolledToBottom() {
return this.scrollPos === scrollPositions.bottom;
},
isScrolledToTop() {
return this.scrollPos === scrollPositions.top;
},
jobOutput() {
return this.detailJob.output || __('No messages were logged');
},
},
mounted() {
this.getTrace();
},
methods: {
...mapActions('pipelines', ['fetchJobTrace', 'setDetailJob']),
scrollDown() {
if (this.$refs.buildTrace) {
this.$refs.buildTrace.scrollTo(0, this.$refs.buildTrace.scrollHeight);
}
},
scrollUp() {
if (this.$refs.buildTrace) {
this.$refs.buildTrace.scrollTo(0, 0);
}
},
scrollBuildLog: _.throttle(function buildLogScrollDebounce() {
const { scrollTop } = this.$refs.buildTrace;
const { offsetHeight, scrollHeight } = this.$refs.buildTrace;
if (scrollTop + offsetHeight === scrollHeight) {
this.scrollPos = scrollPositions.bottom;
} else if (scrollTop === 0) {
this.scrollPos = scrollPositions.top;
} else {
this.scrollPos = '';
}
}),
getTrace() {
return this.fetchJobTrace().then(() => this.scrollDown());
},
},
};
</script>
<template>
<div class="ide-pipeline build-page d-flex flex-column flex-fill">
<header class="ide-job-header d-flex align-items-center">
<button
class="btn btn-default btn-sm d-flex"
@click="setDetailJob(null)"
>
<icon
name="chevron-left"
/>
{{ __('View jobs') }}
</button>
</header>
<div class="top-bar d-flex border-left-0">
<job-description
:job="detailJob"
/>
<div class="controllers ml-auto">
<a
v-tooltip
:title="__('Show complete raw log')"
data-placement="top"
data-container="body"
class="controllers-buttons"
:href="detailJob.rawPath"
target="_blank"
>
<i
aria-hidden="true"
class="fa fa-file-text-o"
></i>
</a>
<scroll-button
direction="up"
:disabled="isScrolledToTop"
@click="scrollUp"
/>
<scroll-button
direction="down"
:disabled="isScrolledToBottom"
@click="scrollDown"
/>
</div>
</div>
<pre
class="build-trace mb-0 h-100"
ref="buildTrace"
@scroll="scrollBuildLog"
>
<code
class="bash"
v-html="jobOutput"
>
</code>
<div
v-show="detailJob.isLoading"
class="build-loader-animation"
>
</div>
</pre>
</div>
</template>
app/assets/javascripts/ide/components/jobs/detail/description.vue 0 → 100644
View file @ 9efb1875
<script>
import Icon from '../../../../vue_shared/components/icon.vue';
import CiIcon from '../../../../vue_shared/components/ci_icon.vue';
export default {
components: {
Icon,
CiIcon,
},
props: {
job: {
type: Object,
required: true,
},
},
computed: {
jobId() {
return `#${this.job.id}`;
},
},
};
</script>
<template>
<div class="d-flex align-items-center">
<ci-icon
class="d-flex"
:status="job.status"
:borderless="true"
:size="24"
/>
<span class="prepend-left-8">
{{ job.name }}
<a
:href="job.path"
target="_blank"
class="ide-external-link"
>
{{ jobId }}
<icon
name="external-link"
:size="12"
/>
</a>
</span>
</div>
</template>
app/assets/javascripts/ide/components/jobs/detail/scroll_button.vue 0 → 100644
View file @ 9efb1875
<script>
import { __ } from '../../../../locale';
import Icon from '../../../../vue_shared/components/icon.vue';
import tooltip from '../../../../vue_shared/directives/tooltip';
const directions = {
up: 'up',
down: 'down',
};
export default {
directives: {
tooltip,
},
components: {
Icon,
},
props: {
direction: {
type: String,
required: true,
validator(value) {
return Object.keys(directions).includes(value);
},
},
disabled: {
type: Boolean,
required: true,
},
},
computed: {
tooltipTitle() {
return this.direction === directions.up ? __('Scroll to top') : __('Scroll to bottom');
},
iconName() {
return `scroll_${this.direction}`;
},
},
methods: {
clickedScroll() {
this.$emit('click');
},
},
};
</script>
<template>
<div
v-tooltip
class="controllers-buttons"
data-container="body"
data-placement="top"
:title="tooltipTitle"
>
<button
class="btn-scroll btn-transparent btn-blank"
type="button"
:disabled="disabled"
@click="clickedScroll"
>
<icon
:name="iconName"
/>
</button>
</div>
</template>
app/assets/javascripts/ide/components/jobs/item.vue
View file @ 9efb1875
<script>
import Icon from '../../../vue_shared/components/icon.vue';
import CiIcon from '../../../vue_shared/components/ci_icon.vue';
import JobDescription from './detail/description.vue';
export default {
components: {
Icon,
CiIcon,
JobDescription,
},
props: {
job: {
......@@ -18,29 +16,29 @@ export default {
return `#${this.job.id}`;
},
},
methods: {
clickViewLog() {
this.$emit('clickViewLog', this.job);
},
},
};
</script>
<template>
<div class="ide-job-item">
<ci-icon
:status="job.status"
:borderless="true"
:size="24"
<job-description
class="append-right-default"
:job="job"
/>
<span class="prepend-left-8">
{{ job.name }}
<a
:href="job.path"
target="_blank"
class="ide-external-link"
<div class="ml-auto align-self-center">
<button
v-if="job.started"
type="button"
class="btn btn-default btn-sm"
@click="clickViewLog"
>
{{ jobId }}
<icon
name="external-link"
:size="12"
/>
</a>
</span>
{{ __('View log') }}
</button>
</div>
</div>
</template>
app/assets/javascripts/ide/components/jobs/list.vue
View file @ 9efb1875
......@@ -19,7 +19,7 @@ export default {
},
},
methods: {
...mapActions('pipelines', ['fetchJobs', 'toggleStageCollapsed']),
...mapActions('pipelines', ['fetchJobs', 'toggleStageCollapsed', 'setDetailJob']),
},
};
</script>
......@@ -38,6 +38,7 @@ export default {
:stage="stage"
@fetch="fetchJobs"
@toggleCollapsed="toggleStageCollapsed"
@clickViewLog="setDetailJob"
/>
</template>
</div>
......
app/assets/javascripts/ide/components/jobs/stage.vue
View file @ 9efb1875
......@@ -48,6 +48,9 @@ export default {
toggleCollapsed() {
this.$emit('toggleCollapsed', this.stage.id);
},
clickViewLog(job) {
this.$emit('clickViewLog', job);
},
},
};
</script>
......@@ -101,6 +104,7 @@ export default {
v-for="job in stage.jobs"
:key="job.id"
:job="job"
@clickViewLog="clickViewLog"
/>
</template>
</div>
......
app/assets/javascripts/ide/components/merge_requests/dropdown.vue 0 → 100644
View file @ 9efb1875
<script>
import { mapGetters } from 'vuex';
import Tabs from '../../../vue_shared/components/tabs/tabs';
import Tab from '../../../vue_shared/components/tabs/tab.vue';
import List from './list.vue';
export default {
components: {
Tabs,
Tab,
List,
},
props: {
show: {
type: Boolean,
required: true,
},
},
computed: {
...mapGetters('mergeRequests', ['assignedData', 'createdData']),
createdMergeRequestLength() {
return this.createdData.mergeRequests.length;
},
assignedMergeRequestLength() {
return this.assignedData.mergeRequests.length;
},
},
};
</script>
<template>
<div class="dropdown-menu ide-merge-requests-dropdown p-0">
<tabs
v-if="show"
stop-propagation
>
<tab active>
<template slot="title">
{{ __('Created by me') }}
<span class="badge badge-pill">
{{ createdMergeRequestLength }}
</span>
</template>
<list
type="created"
:empty-text="__('You have not created any merge requests')"
/>
</tab>
<tab>
<template slot="title">
{{ __('Assigned to me') }}
<span class="badge badge-pill">
{{ assignedMergeRequestLength }}
</span>
</template>
<list
type="assigned"
:empty-text="__('You do not have any assigned merge requests')"
/>
</tab>
</tabs>
</div>
</template>
app/assets/javascripts/ide/components/merge_requests/item.vue 0 → 100644
View file @ 9efb1875
<script>
import Icon from '../../../vue_shared/components/icon.vue';
export default {
components: {
Icon,
},
props: {
item: {
type: Object,
required: true,
},
currentId: {
type: String,
required: true,
},
currentProjectId: {
type: String,
required: true,
},
},
computed: {
isActive() {
return (
this.item.iid === parseInt(this.currentId, 10) &&
this.currentProjectId === this.item.projectPathWithNamespace
);
},
pathWithID() {
return `${this.item.projectPathWithNamespace}!${this.item.iid}`;
},
},
methods: {
clickItem() {
this.$emit('click', this.item);
},
},
};
</script>
<template>
<button
type="button"
class="btn-link d-flex align-items-center"
@click="clickItem"
>
<span class="d-flex append-right-default ide-merge-request-current-icon">
<icon
v-if="isActive"
name="mobile-issue-close"
:size="18"
/>
</span>
<span>
<strong>
{{ item.title }}
</strong>
<span class="ide-merge-request-project-path d-block mt-1">
{{ pathWithID }}
</span>
</span>
</button>
</template>
app/assets/javascripts/ide/components/merge_requests/list.vue 0 → 100644
View file @ 9efb1875
<script>
import { mapActions, mapGetters, mapState } from 'vuex';
import _ from 'underscore';
import LoadingIcon from '../../../vue_shared/components/loading_icon.vue';
import Item from './item.vue';
export default {
components: {
LoadingIcon,
Item,
},
props: {
type: {
type: String,
required: true,
},
emptyText: {
type: String,
required: true,
},
},
data() {
return {
search: '',
};
},
computed: {
...mapGetters('mergeRequests', ['getData']),
...mapState(['currentMergeRequestId', 'currentProjectId']),
data() {
return this.getData(this.type);
},
isLoading() {
return this.data.isLoading;
},
mergeRequests() {
return this.data.mergeRequests;
},
hasMergeRequests() {
return this.mergeRequests.length !== 0;
},
hasNoSearchResults() {
return this.search !== '' && !this.hasMergeRequests;
},
},
watch: {
isLoading: {
handler: 'focusSearch',
},
},
mounted() {
this.loadMergeRequests();
},
methods: {
...mapActions('mergeRequests', ['fetchMergeRequests', 'openMergeRequest']),
loadMergeRequests() {
this.fetchMergeRequests({ type: this.type, search: this.search });
},
viewMergeRequest(item) {
this.openMergeRequest({
projectPath: item.projectPathWithNamespace,
id: item.iid,
});
},
searchMergeRequests: _.debounce(function debounceSearch() {
this.loadMergeRequests();
}, 250),
focusSearch() {
if (!this.isLoading) {
this.$nextTick(() => {
this.$refs.searchInput.focus();
});
}
},
},
};
</script>
<template>
<div>
<div class="dropdown-input mt-3 pb-3 mb-0 border-bottom">
<input
type="search"
class="dropdown-input-field"
:placeholder="__('Search merge requests')"
v-model="search"
@input="searchMergeRequests"
ref="searchInput"
/>
<i
aria-hidden="true"
class="fa fa-search dropdown-input-search"
></i>
</div>
<div class="dropdown-content ide-merge-requests-dropdown-content d-flex">
<loading-icon
class="mt-3 mb-3 align-self-center ml-auto mr-auto"
v-if="isLoading"
size="2"
/>
<ul
v-else
class="mb-3 w-100"
>
<template v-if="hasMergeRequests">
<li
v-for="item in mergeRequests"
:key="item.id"
>
<item
:item="item"
:current-id="currentMergeRequestId"
:current-project-id="currentProjectId"
@click="viewMergeRequest"
/>
</li>
</template>
<li
v-else
class="ide-merge-requests-empty d-flex align-items-center justify-content-center"
>
<template v-if="hasNoSearchResults">
{{ __('No merge requests found') }}
</template>
<template v-else>
{{ emptyText }}
</template>
</li>
</ul>
</div>
</div>
</template>
app/assets/javascripts/ide/components/panes/right.vue
View file @ 9efb1875
......@@ -4,6 +4,7 @@ import tooltip from '../../../vue_shared/directives/tooltip';
import Icon from '../../../vue_shared/components/icon.vue';
import { rightSidebarViews } from '../../constants';
import PipelinesList from '../pipelines/list.vue';
import JobsDetail from '../jobs/detail.vue';
export default {
directives: {
......@@ -12,9 +13,16 @@ export default {
components: {
Icon,
PipelinesList,
JobsDetail,
},
computed: {
...mapState(['rightPane']),
pipelinesActive() {
return (
this.rightPane === rightSidebarViews.pipelines ||
this.rightPane === rightSidebarViews.jobsDetail
);
},
},
methods: {
...mapActions(['setRightPane']),
......@@ -48,7 +56,7 @@ export default {
:title="__('Pipelines')"
class="ide-sidebar-link is-right"
:class="{
active: rightPane === $options.rightSidebarViews.pipelines
active: pipelinesActive
}"
type="button"
@click="clickTab($event, $options.rightSidebarViews.pipelines)"
......
app/assets/javascripts/ide/constants.js
View file @ 9efb1875
......@@ -23,4 +23,5 @@ export const viewerTypes = {
export const rightSidebarViews = {
pipelines: 'pipelines-list',
jobsDetail: 'jobs-detail',
};
app/assets/javascripts/ide/stores/actions/merge_request.js
View file @ 9efb1875
......@@ -17,9 +17,7 @@ export const getMergeRequestData = (
mergeRequestId,
mergeRequest: data,
});
if (!state.currentMergeRequestId) {
commit(types.SET_CURRENT_MERGE_REQUEST, mergeRequestId);
}
commit(types.SET_CURRENT_MERGE_REQUEST, mergeRequestId);
resolve(data);
})
.catch(() => {
......
app/assets/javascripts/ide/stores/actions/project.js
View file @ 9efb1875
......@@ -13,8 +13,7 @@ export const getProjectData = ({ commit, state }, { namespace, projectId, force
.then(data => {
commit(types.TOGGLE_LOADING, { entry: state });
commit(types.SET_PROJECT, { projectPath: `${namespace}/${projectId}`, project: data });
if (!state.currentProjectId)
commit(types.SET_CURRENT_PROJECT, `${namespace}/${projectId}`);
commit(types.SET_CURRENT_PROJECT, `${namespace}/${projectId}`);
resolve(data);
})
.catch(() => {
......
app/assets/javascripts/ide/stores/modules/merge_requests/actions.js
View file @ 9efb1875
import { __ } from '../../../../locale';
import Api from '../../../../api';
import flash from '../../../../flash';
import router from '../../../ide_router';
import { scopes } from './constants';
import * as types from './mutation_types';
import * as rootTypes from '../../mutation_types';
export const requestMergeRequests = ({ commit }) => commit(types.REQUEST_MERGE_REQUESTS);
export const receiveMergeRequestsError = ({ commit }) => {
export const requestMergeRequests = ({ commit }, type) =>
commit(types.REQUEST_MERGE_REQUESTS, type);
export const receiveMergeRequestsError = ({ commit }, type) => {
flash(__('Error loading merge requests.'));
commit(types.RECEIVE_MERGE_REQUESTS_ERROR);
commit(types.RECEIVE_MERGE_REQUESTS_ERROR, type);
};
export const receiveMergeRequestsSuccess = ({ commit }, data) =>
commit(types.RECEIVE_MERGE_REQUESTS_SUCCESS, data);
export const receiveMergeRequestsSuccess = ({ commit }, { type, data }) =>
commit(types.RECEIVE_MERGE_REQUESTS_SUCCESS, { type, data });
export const fetchMergeRequests = ({ dispatch, state: { scope, state } }, search = '') => {
dispatch('requestMergeRequests');
dispatch('resetMergeRequests');
export const fetchMergeRequests = ({ dispatch, state: { state } }, { type, search = '' }) => {
const scope = scopes[type];
dispatch('requestMergeRequests', type);
dispatch('resetMergeRequests', type);
Api.mergeRequests({ scope, state, search })
.then(({ data }) => dispatch('receiveMergeRequestsSuccess', data))
.catch(() => dispatch('receiveMergeRequestsError'));
.then(({ data }) => dispatch('receiveMergeRequestsSuccess', { type, data }))
.catch(() => dispatch('receiveMergeRequestsError', type));
};
export const resetMergeRequests = ({ commit }) => commit(types.RESET_MERGE_REQUESTS);
export const resetMergeRequests = ({ commit }, type) => commit(types.RESET_MERGE_REQUESTS, type);
export const openMergeRequest = ({ commit, dispatch }, { projectPath, id }) => {
commit(rootTypes.CLEAR_PROJECTS, null, { root: true });
commit(rootTypes.SET_CURRENT_MERGE_REQUEST, `${id}`, { root: true });
commit(rootTypes.RESET_OPEN_FILES, null, { root: true });
dispatch('pipelines/stopPipelinePolling', null, { root: true });
dispatch('pipelines/clearEtagPoll', null, { root: true });
dispatch('pipelines/resetLatestPipeline', null, { root: true });
dispatch('setCurrentBranchId', '', { root: true });
router.push(`/project/${projectPath}/merge_requests/${id}`);
};
export default () => {};
app/assets/javascripts/ide/stores/modules/merge_requests/constants.js
View file @ 9efb1875
export const scopes = {
assignedToMe: 'assigned-to-me',
createdByMe: 'created-by-me',
assigned: 'assigned-to-me',
created: 'created-by-me',
};
export const states = {
......
app/assets/javascripts/ide/stores/modules/merge_requests/getters.js 0 → 100644
View file @ 9efb1875
export const getData = state => type => state[type];
export const assignedData = state => state.assigned;
export const createdData = state => state.created;
app/assets/javascripts/ide/stores/modules/merge_requests/index.js
View file @ 9efb1875
import state from './state';
import * as actions from './actions';
import * as getters from './getters';
import mutations from './mutations';
export default {
......@@ -7,4 +8,5 @@ export default {
state: state(),
actions,
mutations,
getters,
};
app/assets/javascripts/ide/stores/modules/merge_requests/mutations.js
View file @ 9efb1875
......@@ -2,15 +2,15 @@
import * as types from './mutation_types';
export default {
[types.REQUEST_MERGE_REQUESTS](state) {
state.isLoading = true;
[types.REQUEST_MERGE_REQUESTS](state, type) {
state[type].isLoading = true;
},
[types.RECEIVE_MERGE_REQUESTS_ERROR](state) {
state.isLoading = false;
[types.RECEIVE_MERGE_REQUESTS_ERROR](state, type) {
state[type].isLoading = false;
},
[types.RECEIVE_MERGE_REQUESTS_SUCCESS](state, data) {
state.isLoading = false;
state.mergeRequests = data.map(mergeRequest => ({
[types.RECEIVE_MERGE_REQUESTS_SUCCESS](state, { type, data }) {
state[type].isLoading = false;
state[type].mergeRequests = data.map(mergeRequest => ({
id: mergeRequest.id,
iid: mergeRequest.iid,
title: mergeRequest.title,
......@@ -20,7 +20,7 @@ export default {
.replace(`/merge_requests/${mergeRequest.iid}`, ''),
}));
},
[types.RESET_MERGE_REQUESTS](state) {
state.mergeRequests = [];
[types.RESET_MERGE_REQUESTS](state, type) {
state[type].mergeRequests = [];
},
};
app/assets/javascripts/ide/stores/modules/merge_requests/state.js
View file @ 9efb1875
import { scopes, states } from './constants';
import { states } from './constants';
export default () => ({
isLoading: false,
mergeRequests: [],
scope: scopes.assignedToMe,
created: {
isLoading: false,
mergeRequests: [],
},
assigned: {
isLoading: false,
mergeRequests: [],
},
state: states.opened,
});
app/assets/javascripts/ide/stores/modules/pipelines/actions.js
View file @ 9efb1875
......@@ -4,6 +4,7 @@ import { __ } from '../../../../locale';
import flash from '../../../../flash';
import Poll from '../../../../lib/utils/poll';
import service from '../../../services';
import { rightSidebarViews } from '../../../constants';
import * as types from './mutation_types';
let eTagPoll;
......@@ -77,4 +78,31 @@ export const fetchJobs = ({ dispatch }, stage) => {
export const toggleStageCollapsed = ({ commit }, stageId) =>
commit(types.TOGGLE_STAGE_COLLAPSE, stageId);
export const setDetailJob = ({ commit, dispatch }, job) => {
commit(types.SET_DETAIL_JOB, job);
dispatch('setRightPane', job ? rightSidebarViews.jobsDetail : rightSidebarViews.pipelines, {
root: true,
});
};
export const requestJobTrace = ({ commit }) => commit(types.REQUEST_JOB_TRACE);
export const receiveJobTraceError = ({ commit }) => {
flash(__('Error fetching job trace'));
commit(types.RECEIVE_JOB_TRACE_ERROR);
};
export const receiveJobTraceSuccess = ({ commit }, data) =>
commit(types.RECEIVE_JOB_TRACE_SUCCESS, data);
export const fetchJobTrace = ({ dispatch, state }) => {
dispatch('requestJobTrace');
return axios
.get(`${state.detailJob.path}/trace`, { params: { format: 'json' } })
.then(({ data }) => dispatch('receiveJobTraceSuccess', data))
.catch(() => dispatch('receiveJobTraceError'));
};
export const resetLatestPipeline = ({ commit }) =>
commit(types.RECEIVE_LASTEST_PIPELINE_SUCCESS, null);
export default () => {};
app/assets/javascripts/ide/stores/modules/pipelines/mutation_types.js
View file @ 9efb1875
......@@ -7,3 +7,9 @@ export const RECEIVE_JOBS_ERROR = 'RECEIVE_JOBS_ERROR';
export const RECEIVE_JOBS_SUCCESS = 'RECEIVE_JOBS_SUCCESS';
export const TOGGLE_STAGE_COLLAPSE = 'TOGGLE_STAGE_COLLAPSE';
export const SET_DETAIL_JOB = 'SET_DETAIL_JOB';
export const REQUEST_JOB_TRACE = 'REQUEST_JOB_TRACE';
export const RECEIVE_JOB_TRACE_ERROR = 'RECEIVE_JOB_TRACE_ERROR';
export const RECEIVE_JOB_TRACE_SUCCESS = 'RECEIVE_JOB_TRACE_SUCCESS';
app/assets/javascripts/ide/stores/modules/pipelines/mutations.js
View file @ 9efb1875
......@@ -63,4 +63,17 @@ export default {
isCollapsed: stage.id === id ? !stage.isCollapsed : stage.isCollapsed,
}));
},
[types.SET_DETAIL_JOB](state, job) {
state.detailJob = { ...job };
},
[types.REQUEST_JOB_TRACE](state) {
state.detailJob.isLoading = true;
},
[types.RECEIVE_JOB_TRACE_ERROR](state) {
state.detailJob.isLoading = false;
},
[types.RECEIVE_JOB_TRACE_SUCCESS](state, data) {
state.detailJob.isLoading = false;
state.detailJob.output = data.html;
},
};
app/assets/javascripts/ide/stores/modules/pipelines/state.js
View file @ 9efb1875
......@@ -3,4 +3,5 @@ export default () => ({
isLoadingJobs: false,
latestPipeline: null,
stages: [],
detailJob: null,
});
app/assets/javascripts/ide/stores/modules/pipelines/utils.js
View file @ 9efb1875
......@@ -4,4 +4,8 @@ export const normalizeJob = job => ({
name: job.name,
status: job.status,
path: job.build_path,
rawPath: `${job.build_path}/raw`,
started: job.started,
output: '',
isLoading: false,
});
app/assets/javascripts/ide/stores/mutation_types.js
View file @ 9efb1875
......@@ -68,3 +68,6 @@ export const TOGGLE_FILE_FINDER = 'TOGGLE_FILE_FINDER';
export const BURST_UNUSED_SEAL = 'BURST_UNUSED_SEAL';
export const SET_RIGHT_PANE = 'SET_RIGHT_PANE';
export const CLEAR_PROJECTS = 'CLEAR_PROJECTS';
export const RESET_OPEN_FILES = 'RESET_OPEN_FILES';
app/assets/javascripts/ide/stores/mutations.js
View file @ 9efb1875
......@@ -157,6 +157,12 @@ export default {
[types.SET_LINKS](state, links) {
Object.assign(state, { links });
},
[types.CLEAR_PROJECTS](state) {
Object.assign(state, { projects: {}, trees: {} });
},
[types.RESET_OPEN_FILES](state) {
Object.assign(state, { openFiles: [] });
},
...projectMutations,
...mergeRequestMutation,
...fileMutations,
......
app/assets/javascripts/importer_status.js
View file @ 9efb1875
......@@ -58,7 +58,7 @@ class ImporterStatus {
job.find('.import-target').html(`<a href="${data.full_path}">${data.full_path}</a>`);
$('table.import-jobs tbody').prepend(job);
job.addClass('active');
job.addClass('table-active');
const connectingVerb = this.ciCdOnly ? __('connecting') : __('importing');
job.find('.import-actions').html(sprintf(
_.escape(__('%{loadingIcon} Started')), {
......@@ -67,7 +67,15 @@ class ImporterStatus {
false,
));
})
.catch(() => flash(__('An error occurred while importing project')));
.catch((error) => {
let details = error;
if (error.response && error.response.data && error.response.data.errors) {
details = error.response.data.errors;
}
flash(__(`An error occurred while importing project: ${details}`));
});
}
autoUpdate() {
......@@ -81,7 +89,7 @@ class ImporterStatus {
switch (job.import_status) {
case 'finished':
jobItem.removeClass('active').addClass('success');
jobItem.removeClass('table-active').addClass('table-success');
statusField.html(`<span><i class="fa fa-check"></i> ${__('Done')}</span>`);
break;
case 'scheduled':
......
app/assets/javascripts/init_changes_dropdown.js
View file @ 9efb1875
import $ from 'jquery';
import stickyMonitor from './lib/utils/sticky';
import { stickyMonitor } from './lib/utils/sticky';
export default (stickyTop) => {
stickyMonitor(document.querySelector('.js-diff-files-changed'), stickyTop);
......
app/assets/javascripts/job.js
View file @ 9efb1875
import $ from 'jquery';
import _ from 'underscore';
import StickyFill from 'stickyfilljs';
import { polyfillSticky } from './lib/utils/sticky';
import axios from './lib/utils/axios_utils';
import { visitUrl } from './lib/utils/url_utility';
import bp from './breakpoints';
import { numberToHumanSize } from './lib/utils/number_utils';
import { setCiStatusFavicon } from './lib/utils/common_utils';
import { isScrolledToBottom, scrollDown } from './lib/utils/scroll_utils';
import LogOutputBehaviours from './lib/utils/logoutput_behaviours';
export default class Job {
export default class Job extends LogOutputBehaviours {
constructor(options) {
super();
this.timeout = null;
this.state = null;
this.fetchingStatusFavicon = false;
......@@ -29,10 +32,6 @@ export default class Job {
this.$buildTraceOutput = $('.js-build-output');
this.$topBar = $('.js-top-bar');
// Scroll controllers
this.$scrollTopBtn = $('.js-scroll-up');
this.$scrollBottomBtn = $('.js-scroll-down');
clearTimeout(this.timeout);
this.initSidebar();
......@@ -48,23 +47,14 @@ export default class Job {
.off('click', '.stage-item')
.on('click', '.stage-item', this.updateDropdown);
// add event listeners to the scroll buttons
this.$scrollTopBtn
.off('click')
.on('click', this.scrollToTop.bind(this));
this.$scrollBottomBtn
.off('click')
.on('click', this.scrollToBottom.bind(this));
this.scrollThrottled = _.throttle(this.toggleScroll.bind(this), 100);
this.$window
.off('scroll')
.on('scroll', () => {
if (!this.isScrolledToBottom()) {
if (!isScrolledToBottom()) {
this.toggleScrollAnimation(false);
} else if (this.isScrolledToBottom() && !this.isLogComplete) {
} else if (isScrolledToBottom() && !this.isLogComplete) {
this.toggleScrollAnimation(true);
}
this.scrollThrottled();
......@@ -80,70 +70,11 @@ export default class Job {
}
initAffixTopArea() {
/**
If the browser does not support position sticky, it returns the position as static.
If the browser does support sticky, then we allow the browser to handle it, if not
then we use a polyfill
*/
if (this.$topBar.css('position') !== 'static') return;
StickyFill.add(this.$topBar);
}
// eslint-disable-next-line class-methods-use-this
canScroll() {
return $(document).height() > $(window).height();
}
toggleScroll() {
const $document = $(document);
const currentPosition = $document.scrollTop();
const scrollHeight = $document.height();
const windowHeight = $(window).height();
if (this.canScroll()) {
if (currentPosition > 0 &&
(scrollHeight - currentPosition !== windowHeight)) {
// User is in the middle of the log
this.toggleDisableButton(this.$scrollTopBtn, false);
this.toggleDisableButton(this.$scrollBottomBtn, false);
} else if (currentPosition === 0) {
// User is at Top of Log
this.toggleDisableButton(this.$scrollTopBtn, true);
this.toggleDisableButton(this.$scrollBottomBtn, false);
} else if (this.isScrolledToBottom()) {
// User is at the bottom of the build log.
this.toggleDisableButton(this.$scrollTopBtn, false);
this.toggleDisableButton(this.$scrollBottomBtn, true);
}
} else {
this.toggleDisableButton(this.$scrollTopBtn, true);
this.toggleDisableButton(this.$scrollBottomBtn, true);
}
}
// eslint-disable-next-line class-methods-use-this
isScrolledToBottom() {
const $document = $(document);
const currentPosition = $document.scrollTop();
const scrollHeight = $document.height();
const windowHeight = $(window).height();
return scrollHeight - currentPosition === windowHeight;
}
// eslint-disable-next-line class-methods-use-this
scrollDown() {
const $document = $(document);
$document.scrollTop($document.height());
polyfillSticky(this.$topBar);
}
scrollToBottom() {
this.scrollDown();
scrollDown();
this.hasBeenScrolled = true;
this.toggleScroll();
}
......@@ -154,12 +85,6 @@ export default class Job {
this.toggleScroll();
}
// eslint-disable-next-line class-methods-use-this
toggleDisableButton($button, disable) {
if (disable && $button.prop('disabled')) return;
$button.prop('disabled', disable);
}
toggleScrollAnimation(toggle) {
this.$scrollBottomBtn.toggleClass('animate', toggle);
}
......@@ -191,7 +116,7 @@ export default class Job {
this.state = log.state;
}
this.isScrollInBottom = this.isScrolledToBottom();
this.isScrollInBottom = isScrolledToBottom();
if (log.append) {
this.$buildTraceOutput.append(log.html);
......@@ -231,7 +156,7 @@ export default class Job {
})
.then(() => {
if (this.isScrollInBottom) {
this.scrollDown();
scrollDown();
}
})
.then(() => this.toggleScroll());
......
app/assets/javascripts/jobs/components/header.vue
View file @ 9efb1875
......@@ -42,6 +42,9 @@ export default {
jobStarted() {
return !this.job.started === false;
},
headerTime() {
return this.jobStarted ? this.job.started : this.job.created_at;
},
},
watch: {
job() {
......@@ -73,7 +76,7 @@ export default {
:status="status"
item-name="Job"
:item-id="job.id"
:time="job.created_at"
:time="headerTime"
:user="job.user"
:actions="actions"
:has-sidebar-button="true"
......
app/assets/javascripts/labels_select.js
View file @ 9efb1875
......@@ -426,7 +426,7 @@ export default class LabelsSelect {
const tpl = _.template([
'<% _.each(labels, function(label){ %>',
'<a href="<%- issueUpdateURL.slice(0, issueUpdateURL.lastIndexOf("/")) %>?label_name[]=<%- encodeURIComponent(label.title) %>">',
'<span class="label has-tooltip color-label" title="<%- label.description %>" style="background-color: <%- label.color %>; color: <%- label.text_color %>;">',
'<span class="badge label has-tooltip color-label" title="<%- label.description %>" style="background-color: <%- label.color %>; color: <%- label.text_color %>;">',
'<%- label.title %>',
'</span>',
'</a>',
......
app/assets/javascripts/lib/utils/logoutput_behaviours.js 0 → 100644
View file @ 9efb1875
import $ from 'jquery';
import { canScroll, isScrolledToBottom, toggleDisableButton } from './scroll_utils';
export default class LogOutputBehaviours {
constructor() {
// Scroll buttons
this.$scrollTopBtn = $('.js-scroll-up');
this.$scrollBottomBtn = $('.js-scroll-down');
this.$scrollTopBtn.off('click').on('click', this.scrollToTop.bind(this));
this.$scrollBottomBtn.off('click').on('click', this.scrollToBottom.bind(this));
}
toggleScroll() {
const $document = $(document);
const currentPosition = $document.scrollTop();
const scrollHeight = $document.height();
const windowHeight = $(window).height();
if (canScroll()) {
if (currentPosition > 0 && scrollHeight - currentPosition !== windowHeight) {
// User is in the middle of the log
toggleDisableButton(this.$scrollTopBtn, false);
toggleDisableButton(this.$scrollBottomBtn, false);
} else if (currentPosition === 0) {
// User is at Top of Log
toggleDisableButton(this.$scrollTopBtn, true);
toggleDisableButton(this.$scrollBottomBtn, false);
} else if (isScrolledToBottom()) {
// User is at the bottom of the build log.
toggleDisableButton(this.$scrollTopBtn, false);
toggleDisableButton(this.$scrollBottomBtn, true);
}
} else {
toggleDisableButton(this.$scrollTopBtn, true);
toggleDisableButton(this.$scrollBottomBtn, true);
}
}
toggleScrollAnimation(toggle) {
this.$scrollBottomBtn.toggleClass('animate', toggle);
}
}
app/assets/javascripts/lib/utils/scroll_utils.js 0 → 100644
View file @ 9efb1875
import $ from 'jquery';
export const canScroll = () => $(document).height() > $(window).height();
/**
* Checks if the entire page is scrolled down all the way to the bottom
*/
export const isScrolledToBottom = () => {
const $document = $(document);
const currentPosition = $document.scrollTop();
const scrollHeight = $document.height();
const windowHeight = $(window).height();
return scrollHeight - currentPosition === windowHeight;
};
export const scrollDown = () => {
const $document = $(document);
$document.scrollTop($document.height());
};
export const toggleDisableButton = ($button, disable) => {
if (disable && $button.prop('disabled')) return;
$button.prop('disabled', disable);
};
export default {};
app/assets/javascripts/lib/utils/sticky.js
View file @ 9efb1875
import StickyFill from 'stickyfilljs';
export const createPlaceholder = () => {
const placeholder = document.createElement('div');
placeholder.classList.add('sticky-placeholder');
......@@ -28,7 +30,16 @@ export const isSticky = (el, scrollY, stickyTop, insertPlaceholder) => {
}
};
export default (el, stickyTop, insertPlaceholder = true) => {
/**
* Create a listener that will toggle a 'is-stuck' class, based on the current scroll position.
*
* - If the current environment does not support `position: sticky`, do nothing.
*
* @param {HTMLElement} el The `position: sticky` element.
* @param {Number} stickyTop Used to determine when an element is stuck.
* @param {Boolean} insertPlaceholder Should a placeholder element be created when element is stuck?
*/
export const stickyMonitor = (el, stickyTop, insertPlaceholder = true) => {
if (!el) return;
if (typeof CSS === 'undefined' || !(CSS.supports('(position: -webkit-sticky) or (position: sticky)'))) return;
......@@ -37,3 +48,13 @@ export default (el, stickyTop, insertPlaceholder = true) => {
passive: true,
});
};
/**
* Polyfill the `position: sticky` behavior.
*
* - If the current environment supports `position: sticky`, do nothing.
* - Can receive an iterable element list (NodeList, jQuery collection, etc.) or single HTMLElement.
*/
export const polyfillSticky = (el) => {
StickyFill.add(el);
};
app/assets/javascripts/monitoring/components/dashboard.vue
View file @ 9efb1875
......@@ -174,7 +174,10 @@ export default {
:tags-path="tagsPath"
:show-legend="showLegend"
:small-graph="forceSmallGraph"
/>
>
<!-- EE content -->
{{ null }}
</graph>
</graph-group>
</div>
<empty-state
......
app/assets/javascripts/monitoring/components/graph.vue
View file @ 9efb1875
......@@ -232,9 +232,14 @@ export default {
@mouseover="showFlagContent = true"
@mouseleave="showFlagContent = false"
>
<h5 class="text-center graph-title">
{{ graphData.title }}
</h5>
<div class="prometheus-graph-header">
<h5 class="prometheus-graph-title">
{{ graphData.title }}
</h5>
<div class="prometheus-graph-widgets">
<slot></slot>
</div>
</div>
<div
class="prometheus-svg-container"
:style="paddingBottomRootSvg"
......
app/assets/javascripts/notes/constants.js
View file @ 9efb1875
......@@ -14,6 +14,7 @@ export const EPIC_NOTEABLE_TYPE = 'epic';
export const MERGE_REQUEST_NOTEABLE_TYPE = 'merge_request';
export const UNRESOLVE_NOTE_METHOD_NAME = 'delete';
export const RESOLVE_NOTE_METHOD_NAME = 'post';
export const DESCRIPTION_TYPE = 'changed the description';
export const NOTEABLE_TYPE_MAPPING = {
Issue: ISSUE_NOTEABLE_TYPE,
......
app/assets/javascripts/notes/stores/collapse_utils.js 0 → 100644
View file @ 9efb1875
import { n__, s__, sprintf } from '~/locale';
import { DESCRIPTION_TYPE } from '../constants';
/**
* Changes the description from a note, returns 'changed the description n number of times'
*/
export const changeDescriptionNote = (note, descriptionChangedTimes, timeDifferenceMinutes) => {
const descriptionNote = Object.assign({}, note);
descriptionNote.note_html = sprintf(
s__(`MergeRequest|
%{paragraphStart}changed the description %{descriptionChangedTimes} times %{timeDifferenceMinutes}%{paragraphEnd}`),
{
paragraphStart: '<p dir="auto">',
paragraphEnd: '</p>',
descriptionChangedTimes,
timeDifferenceMinutes: n__('within %d minute ', 'within %d minutes ', timeDifferenceMinutes),
},
false,
);
descriptionNote.times_updated = descriptionChangedTimes;
return descriptionNote;
};
/**
* Checks the time difference between two notes from their 'created_at' dates
* returns an integer
*/
export const getTimeDifferenceMinutes = (noteBeggining, noteEnd) => {
const descriptionNoteBegin = new Date(noteBeggining.created_at);
const descriptionNoteEnd = new Date(noteEnd.created_at);
const timeDifferenceMinutes = (descriptionNoteEnd - descriptionNoteBegin) / 1000 / 60;
return Math.ceil(timeDifferenceMinutes);
};
/**
* Checks if a note is a system note and if the content is description
*
* @param {Object} note
* @returns {Boolean}
*/
export const isDescriptionSystemNote = note => note.system && note.note === DESCRIPTION_TYPE;
/**
* Collapses the system notes of a description type, e.g. Changed the description, n minutes ago
* the notes will collapse as long as they happen no more than 10 minutes away from each away
* in between the notes can be anything, another type of system note
* (such as 'changed the weight') or a comment.
*
* @param {Array} notes
* @returns {Array}
*/
export const collapseSystemNotes = notes => {
let lastDescriptionSystemNote = null;
let lastDescriptionSystemNoteIndex = -1;
let descriptionChangedTimes = 1;
return notes.slice(0).reduce((acc, currentNote) => {
const note = currentNote.notes[0];
if (isDescriptionSystemNote(note)) {
// is it the first one?
if (!lastDescriptionSystemNote) {
lastDescriptionSystemNote = note;
lastDescriptionSystemNoteIndex = acc.length;
} else if (lastDescriptionSystemNote) {
const timeDifferenceMinutes = getTimeDifferenceMinutes(
lastDescriptionSystemNote,
note,
);
// are they less than 10 minutes appart?
if (timeDifferenceMinutes > 10) {
// reset counter
descriptionChangedTimes = 1;
// update the previous system note
lastDescriptionSystemNote = note;
lastDescriptionSystemNoteIndex = acc.length;
} else {
// increase counter
descriptionChangedTimes += 1;
// delete the previous one
acc.splice(lastDescriptionSystemNoteIndex, 1);
// replace the text of the current system note with the collapsed note.
currentNote.notes.splice(
0,
1,
changeDescriptionNote(note, descriptionChangedTimes, timeDifferenceMinutes),
);
// update the previous system note index
lastDescriptionSystemNoteIndex = acc.length;
}
}
}
acc.push(currentNote);
return acc;
}, []);
};
// for babel-rewire
export default {};
app/assets/javascripts/notes/stores/getters.js
View file @ 9efb1875
import _ from 'underscore';
import { collapseSystemNotes } from './collapse_utils';
export const notes = state => collapseSystemNotes(state.notes);
export const notes = state => state.notes;
export const targetNoteHash = state => state.targetNoteHash;
export const getNotesData = state => state.notesData;
......
app/assets/javascripts/performance_bar/components/detailed_metric.vue
View file @ 9efb1875
......@@ -56,6 +56,7 @@ export default {
<gl-modal
:id="`modal-peek-${metric}-details`"
:header-title-text="header"
modal-size="lg"
class="performance-bar-modal"
>
<table
......@@ -70,7 +71,7 @@ export default {
<td
v-for="key in keys"
:key="key"
class="break-word"
class="break-word all-words"
>
{{ item[key] }}
</td>
......
app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
View file @ 9efb1875
......@@ -265,10 +265,10 @@ export default {
/>
<section
v-if="mr.maintainerEditAllowed"
v-if="mr.allowCollaboration"
class="mr-info-list mr-links"
>
{{ s__("mrWidget|Allows edits from maintainers") }}
{{ s__("mrWidget|Allows commits from members who can merge to the target branch") }}
</section>
<mr-widget-related-links
......
app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
View file @ 9efb1875
......@@ -83,7 +83,7 @@ export default class MergeRequestStore {
this.canBeMerged = data.can_be_merged || false;
this.isMergeAllowed = data.mergeable || false;
this.mergeOngoing = data.merge_ongoing;
this.maintainerEditAllowed = data.allow_maintainer_to_push;
this.allowCollaboration = data.allow_collaboration;
// Cherry-pick and Revert actions related
this.canCherryPickInCurrentMR = currentUser.can_cherry_pick_on_current_merge_request || false;
......
app/assets/javascripts/vue_shared/components/gl_modal.vue
View file @ 9efb1875
<script>
const buttonVariants = ['danger', 'primary', 'success', 'warning'];
const sizeVariants = ['sm', 'md', 'lg'];
export default {
name: 'GlModal',
props: {
id: {
type: String,
required: false,
default: null,
},
modalSize: {
type: String,
required: false,
default: 'md',
validator: value => sizeVariants.includes(value),
},
headerTitleText: {
type: String,
required: false,
......@@ -27,7 +33,11 @@ export default {
default: '',
},
},
computed: {
modalSizeClass() {
return this.modalSize === 'md' ? '' : `modal-${this.modalSize}`;
},
},
methods: {
emitCancel(event) {
this.$emit('cancel', event);
......@@ -48,6 +58,7 @@ export default {
>
<div
class="modal-dialog"
:class="modalSizeClass"
role="document"
>
<div class="modal-content">
......
app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value.vue
View file @ 9efb1875
......@@ -35,7 +35,12 @@ export default {
</script>
<template>
<div class="hide-collapsed value issuable-show-labels js-value">
<div
class="hide-collapsed value issuable-show-labels js-value"
:class="{
'has-labels':!isEmpty,
}"
>
<span
v-if="isEmpty"
class="text-secondary"
......@@ -50,7 +55,7 @@ export default {
>
<span
v-tooltip
class="label color-label"
class="badge color-label"
data-placement="bottom"
data-container="body"
:style="labelStyle(label)"
......
app/assets/javascripts/vue_shared/components/table_pagination.vue
View file @ 9efb1875
......@@ -124,15 +124,18 @@
break;
}
},
hideOnSmallScreen(item) {
return !item.first && !item.last && !item.next && !item.prev && !item.active;
},
},
};
</script>
<template>
<div
v-if="showPagination"
class="gl-pagination"
class="gl-pagination prepend-top-default"
>
<ul class="pagination clearfix">
<ul class="pagination justify-content-center">
<li
v-for="(item, index) in getItems"
:key="index"
......@@ -142,12 +145,17 @@
'js-next-button': item.next,
'js-last-button': item.last,
'js-first-button': item.first,
'd-none d-md-block': hideOnSmallScreen(item),
separator: item.separator,
active: item.active,
disabled: item.disabled
disabled: item.disabled || item.separator
}"
class="page-item"
>
<a @click.prevent="changePage(item.title, item.disabled)">
<a
@click.prevent="changePage(item.title, item.disabled)"
class="page-link"
>
{{ item.title }}
</a>
</li>
......
app/assets/javascripts/vue_shared/components/tabs/tab.vue
View file @ 9efb1875
......@@ -26,6 +26,11 @@ export default {
created() {
this.isTab = true;
},
updated() {
if (this.$parent) {
this.$parent.$forceUpdate();
}
},
};
</script>
......
app/assets/javascripts/vue_shared/components/tabs/tabs.js
View file @ 9efb1875
export default {
props: {
stopPropagation: {
type: Boolean,
required: false,
default: false,
},
},
data() {
return {
currentIndex: 0,
......@@ -13,7 +20,12 @@ export default {
this.tabs = this.$children.filter(child => child.isTab);
this.currentIndex = this.tabs.findIndex(tab => tab.localActive);
},
setTab(index) {
setTab(e, index) {
if (this.stopPropagation) {
e.stopPropagation();
e.preventDefault();
}
this.tabs[this.currentIndex].localActive = false;
this.tabs[index].localActive = true;
......@@ -36,7 +48,7 @@ export default {
href: '#',
},
on: {
click: () => this.setTab(i),
click: e => this.setTab(e, i),
},
},
tab.$slots.title || tab.title,
......
app/assets/stylesheets/bootstrap_migration.scss
View file @ 9efb1875
......@@ -24,16 +24,60 @@ html {
font-size: 14px;
}
legend {
border-bottom: 1px solid $border-color;
margin-bottom: 20px;
}
button,
html [type="button"],
[type="reset"],
[type="submit"] {
[type="submit"],
[role="button"] {
// Override bootstrap reboot
-webkit-appearance: inherit;
cursor: pointer;
}
[role="button"] {
cursor: pointer;
h1,
h2,
h3,
h4,
h5,
h6 {
color: $gl-text-color;
font-weight: 600;
}
h1,
.h1,
h2,
.h2,
h3,
.h3 {
margin-top: 20px;
margin-bottom: 10px;
}
h4,
.h4,
h5,
.h5,
h6,
.h6 {
margin-top: 10px;
margin-bottom: 10px;
}
h5,
.h5 {
font-size: $gl-font-size;
}
input[type="file"] {
// Bootstrap 4 file input height is taller by default
// which makes them look ugly
line-height: 1;
}
b,
......@@ -53,10 +97,29 @@ a {
}
}
kbd {
display: inline-block;
}
code {
padding: 2px 4px;
color: $red-600;
background-color: $red-100;
border-radius: 3px;
.code & {
background-color: inherit;
padding: unset;
}
.build-trace & {
background-color: inherit;
padding: inherit;
}
}
.code {
padding: 9.5px;
}
table {
......@@ -87,6 +150,16 @@ table {
color: $gl-text-color-secondary !important;
}
.bg-success,
.bg-primary,
.bg-info,
.bg-danger,
.bg-warning {
.card-header {
color: $white-light;
}
}
// Polyfill deprecated selectors
.hidden {
......@@ -161,8 +234,13 @@ table {
}
.nav-tabs {
// Override bootstrap's default border
border-bottom: 0;
.nav-link {
border: 0;
border-top: 0;
border-left: 0;
border-right: 0;
}
.nav-item {
......
app/assets/stylesheets/framework/common.scss
View file @ 9efb1875
......@@ -448,6 +448,10 @@ img.emoji {
.break-word {
word-wrap: break-word;
&.all-words {
word-break: break-word;
}
}
/** COMMON CLASSES **/
......
app/assets/stylesheets/framework/contextual_sidebar.scss
View file @ 9efb1875
......@@ -26,19 +26,25 @@
margin-right: 2px;
width: $contextual-sidebar-width;
a {
> a,
> button {
transition: padding $sidebar-transition-duration;
font-weight: $gl-font-weight-bold;
display: flex;
width: 100%;
align-items: center;
padding: 10px 16px 10px 10px;
color: $gl-text-color;
}
background-color: transparent;
border: 0;
text-align: left;
&:hover,
a:hover {
background-color: $link-hover-background;
color: $gl-text-color;
&:hover,
&:focus {
background-color: $link-hover-background;
color: $gl-text-color;
outline: 0;
}
}
.avatar-container {
......
app/assets/stylesheets/framework/dropdowns.scss
View file @ 9efb1875
......@@ -35,6 +35,12 @@
@include media-breakpoint-down(xs) {
width: 100%;
}
&.projects-dropdown-menu {
padding: 0;
overflow-y: initial;
max-height: initial;
}
}
.dropdown-toggle,
......
app/assets/stylesheets/framework/gitlab_theme.scss
View file @ 9efb1875
......@@ -35,7 +35,7 @@
}
&.active > a,
&.dropdown.open > a {
&.dropdown.show > a {
color: $color-900;
background-color: $color-alternate;
}
......@@ -74,7 +74,7 @@
}
&.active > a,
&.dropdown.open > a {
&.dropdown.show > a {
color: $color-900;
background-color: $color-alternate;
......
app/assets/stylesheets/framework/header.scss
View file @ 9efb1875
......@@ -297,12 +297,6 @@
display: flex;
margin: 0 0 0 6px;
.projects-dropdown-menu {
padding: 0;
overflow-y: initial;
max-height: initial;
}
.dropdown-chevron {
position: relative;
top: -1px;
......
app/assets/stylesheets/framework/layout.scss
View file @ 9efb1875
......@@ -115,9 +115,3 @@ body {
.with-performance-bar .layout-page {
margin-top: $header-height + $performance-bar-height;
}
.vertical-center {
min-height: 100vh;
display: flex;
align-items: center;
}
app/assets/stylesheets/framework/pagination.scss
View file @ 9efb1875
.gl-pagination {
text-align: center;
border-top: 1px solid $border-color;
margin: 0;
margin-top: 0;
.pagination {
padding: 0;
margin: 20px 0;
a {
cursor: pointer;
}
.separator,
.separator:hover {
a {
cursor: default;
background-color: $gray-light;
padding: $gl-vert-padding;
}
}
}
.gap,
.gap:hover {
background-color: $gray-light;
padding: $gl-vert-padding;
cursor: default;
}
}
.card > .gl-pagination {
margin: 0;
}
/**
* Extra-small screen pagination.
*/
@media (max-width: 320px) {
.gl-pagination {
.first,
.last {
display: none;
}
.page-item {
display: none;
&.active {
display: inline;
}
}
}
}
/**
* Small screen pagination
*/
@include media-breakpoint-down(xs) {
.gl-pagination {
.pagination li a {
padding: 6px 10px;
}
.page-item {
display: none;
&.active {
display: inline;
}
}
}
}
/**
* Medium screen pagination
*/
@media (min-width: map-get($grid-breakpoints, xs)) and (max-width: map-get($grid-breakpoints, sm)) {
.gl-pagination {
.page-item {
display: none;
&.active,
&.sibling {
display: inline;
}
}
a {
color: inherit;
text-decoration: none;
}
}
app/assets/stylesheets/framework/terms.scss
View file @ 9efb1875
......@@ -11,15 +11,15 @@
padding-top: $gl-padding;
}
.panel {
.panel-heading {
.card {
.card-header {
display: -webkit-flex;
display: flex;
align-items: center;
justify-content: space-between;
line-height: $line-height-base;
.title {
.card-title {
display: flex;
align-items: center;
......@@ -34,6 +34,8 @@
.navbar-collapse {
padding-right: 0;
flex-grow: 0;
flex-basis: auto;
.navbar-nav {
margin: 0;
......
app/assets/stylesheets/framework/toggle.scss
View file @ 9efb1875
......@@ -42,6 +42,10 @@
background: none;
}
&:focus {
outline: none;
}
.toggle-icon {
position: relative;
display: block;
......
app/assets/stylesheets/framework/typography.scss
View file @ 9efb1875
......@@ -114,26 +114,27 @@
font-size: 0.95em;
}
blockquote,
.blockquote {
color: $gl-grayish-blue;
font-size: inherit;
padding: 8px 24px;
margin: 16px 0;
border-left: 3px solid $white-dark;
}
.blockquote:dir(rtl) {
border-left: 0;
border-right: 3px solid $white-dark;
}
&:dir(rtl) {
border-left: 0;
border-right: 3px solid $white-dark;
}
.blockquote p {
color: $gl-grayish-blue !important;
font-size: inherit;
line-height: 1.5;
p {
color: $gl-grayish-blue !important;
font-size: inherit;
line-height: 1.5;
&:last-child {
margin: 0;
&:last-child {
margin: 0;
}
}
}
......
app/assets/stylesheets/mailers/highlighted_diff_email.scss
View file @ 9efb1875
......@@ -138,6 +138,7 @@ pre {
margin: 0;
}
blockquote,
.blockquote {
color: $gl-grayish-blue;
padding: 0 0 0 15px;
......
app/assets/stylesheets/pages/builds.scss
View file @ 9efb1875
......@@ -75,6 +75,7 @@
.top-bar {
height: 35px;
min-height: 35px;
background: $gray-light;
border: 1px solid $border-color;
color: $gl-text-color;
......
app/assets/stylesheets/pages/clusters.scss
View file @ 9efb1875
......@@ -13,6 +13,10 @@
max-width: 100%;
}
.clusters-error-alert {
width: 100%;
}
.clusters-container {
.nav-bar-right {
padding: $gl-padding-top $gl-padding;
......
app/assets/stylesheets/pages/environments.scss
View file @ 9efb1875
......@@ -23,7 +23,6 @@
}
.btn-group {
> a {
color: $gl-text-color-secondary;
}
......@@ -245,6 +244,7 @@
.prometheus-graph {
flex: 1 0 auto;
min-width: 450px;
max-width: 100%;
padding: $gl-padding / 2;
h5 {
......@@ -256,6 +256,17 @@
}
}
.prometheus-graph-header {
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: $gl-padding-8;
h5 {
margin: 0;
}
}
.prometheus-graph-cursor {
position: absolute;
background: $theme-gray-600;
......
app/assets/stylesheets/pages/issuable.scss
View file @ 9efb1875
......@@ -485,6 +485,15 @@
.sidebar-collapsed-user {
padding-bottom: 0;
margin-bottom: 10px;
.author_link {
padding-left: 0;
.avatar {
position: static;
margin: 0;
}
}
}
.issuable-header-btn {
......
app/assets/stylesheets/pages/labels.scss
View file @ 9efb1875
......@@ -196,6 +196,10 @@
.prioritized-labels {
margin-bottom: 30px;
h5 {
font-size: $gl-font-size;
}
.add-priority {
display: none;
color: $gray-light;
......@@ -210,6 +214,10 @@
}
.other-labels {
h5 {
font-size: $gl-font-size;
}
.remove-priority {
display: none;
}
......
app/assets/stylesheets/pages/repo.scss
View file @ 9efb1875
......@@ -183,7 +183,7 @@
svg {
position: relative;
top: -1px;
top: -2px;
}
.ide-file-changed-icon {
......@@ -458,9 +458,9 @@
width: auto;
margin-right: 0;
a:hover,
a:focus {
text-decoration: none;
> a,
> button {
height: 60px;
}
}
......@@ -718,9 +718,17 @@
}
.ide-new-btn {
.btn {
padding-top: 3px;
padding-bottom: 3px;
}
.dropdown {
display: flex;
}
.dropdown-toggle svg {
margin-top: -2px;
margin-bottom: 2px;
top: 0;
}
.dropdown-menu {
......@@ -877,6 +885,7 @@
border-top: 1px solid transparent;
border-bottom: 1px solid transparent;
outline: 0;
cursor: pointer;
svg {
margin: 0 auto;
......@@ -1122,6 +1131,11 @@
.avatar {
flex: 0 0 40px;
}
.ide-merge-requests-dropdown.dropdown-menu {
width: 385px;
max-height: initial;
}
}
.ide-sidebar-project-title {
......@@ -1130,11 +1144,20 @@
.sidebar-context-title {
white-space: nowrap;
}
.ide-sidebar-branch-title {
min-width: 50px;
}
}
.ide-external-link {
position: relative;
svg {
display: none;
position: absolute;
top: 2px;
right: -$gl-padding;
}
&:hover,
......@@ -1165,6 +1188,8 @@
display: flex;
flex-direction: column;
height: 100%;
margin-top: -$grid-size;
margin-bottom: -$grid-size;
.empty-state {
margin-top: auto;
......@@ -1181,6 +1206,17 @@
margin: 0;
}
}
.build-trace,
.top-bar {
margin-left: -$gl-padding;
}
&.build-page .top-bar {
top: 0;
font-size: 12px;
border-top-right-radius: $border-radius-default;
}
}
.ide-pipeline-list {
......@@ -1189,7 +1225,7 @@
}
.ide-pipeline-header {
min-height: 50px;
min-height: 55px;
padding-left: $gl-padding;
padding-right: $gl-padding;
......@@ -1209,8 +1245,7 @@
.ci-status-icon {
display: flex;
justify-content: center;
height: 20px;
margin-top: -2px;
min-width: 24px;
overflow: hidden;
}
}
......@@ -1240,3 +1275,56 @@
overflow: hidden;
text-overflow: ellipsis;
}
.ide-job-header {
min-height: 60px;
}
.ide-merge-requests-dropdown {
.nav-links li {
width: 50%;
padding-left: 0;
padding-right: 0;
a {
text-align: center;
&:not(.active) {
background-color: $gray-light;
}
}
}
.dropdown-input {
padding-left: $gl-padding;
padding-right: $gl-padding;
.fa {
right: 26px;
}
}
.btn-link {
padding-top: $gl-padding;
padding-bottom: $gl-padding;
}
}
.ide-merge-request-current-icon {
min-width: 18px;
}
.ide-merge-requests-empty {
height: 230px;
}
.ide-merge-requests-dropdown-content {
min-height: 230px;
max-height: 470px;
}
.ide-merge-request-project-path {
font-size: 12px;
line-height: 16px;
color: $gl-text-color-secondary;
}
app/assets/stylesheets/pages/settings.scss
View file @ 9efb1875
......@@ -102,10 +102,6 @@
.form-text.text-muted {
margin-top: 0;
}
.label-light {
margin-bottom: 0;
}
}
.settings-list-icon {
......@@ -174,7 +170,7 @@
.option-description,
.option-disabled-reason {
margin-left: 45px;
margin-left: 30px;
color: $project-option-descr-color;
}
......
app/assets/stylesheets/print.scss
View file @ 9efb1875
......@@ -22,9 +22,9 @@
header,
nav,
nav.main-nav,
nav.navbar-collapse,
nav.navbar-collapse.collapse,
.nav-sidebar,
.profiler-results,
.tree-ref-holder,
.tree-holder .breadcrumb,
......@@ -38,7 +38,8 @@ ul.notes-form,
.edit-link,
.note-action-button,
.right-sidebar,
.flash-container {
.flash-container,
#js-peek {
display: none !important;
}
......
app/controllers/application_controller.rb
View file @ 9efb1875
......@@ -130,12 +130,17 @@ class ApplicationController < ActionController::Base
end
def access_denied!(message = nil)
# If we display a custom access denied message to the user, we don't want to
# hide existence of the resource, rather tell them they cannot access it using
# the provided message
status = message.present? ? :forbidden : :not_found
respond_to do |format|
format.any { head :not_found }
format.any { head status }
format.html do
render "errors/access_denied",
layout: "errors",
status: 404,
status: status,
locals: { message: message }
end
end
......
app/controllers/graphql_controller.rb 0 → 100644
View file @ 9efb1875
class GraphqlController < ApplicationController
# Unauthenticated users have access to the API for public data
skip_before_action :authenticate_user!
before_action :check_graphql_feature_flag!
def execute
variables = Gitlab::Graphql::Variables.new(params[:variables]).to_h
query = params[:query]
operation_name = params[:operationName]
context = {
current_user: current_user
}
result = GitlabSchema.execute(query, variables: variables, context: context, operation_name: operation_name)
render json: result
end
rescue_from StandardError do |exception|
log_exception(exception)
render_error("Internal server error")
end
rescue_from Gitlab::Graphql::Variables::Invalid do |exception|
render_error(exception.message, status: :unprocessable_entity)
end
private
# Overridden from the ApplicationController to make the response look like
# a GraphQL response. That is nicely picked up in Graphiql.
def render_404
render_error("Not found!", status: :not_found)
end
def render_error(message, status: 500)
error = { errors: [message: message] }
render json: error, status: status
end
def check_graphql_feature_flag!
render_404 unless Feature.enabled?(:graphql)
end
end
app/controllers/groups/group_members_controller.rb
View file @ 9efb1875
......@@ -3,8 +3,12 @@ class Groups::GroupMembersController < Groups::ApplicationController
include MembersPresentation
include SortingHelper
def self.admin_not_required_endpoints
%i[index leave request_access]
end
# Authorize
before_action :authorize_admin_group_member!, except: [:index, :leave, :request_access]
before_action :authorize_admin_group_member!, except: admin_not_required_endpoints
skip_cross_project_access_check :index, :create, :update, :destroy, :request_access,
:approve_access_request, :leave, :resend_invite,
......
app/controllers/groups/milestones_controller.rb
View file @ 9efb1875
......@@ -76,12 +76,15 @@ class Groups::MilestonesController < Groups::ApplicationController
def milestones
milestones = MilestonesFinder.new(search_params).execute
legacy_milestones = GroupMilestone.build_collection(group, group_projects, params)
@sort = params[:sort] || 'due_date_asc'
MilestoneArray.sort(milestones + legacy_milestones, @sort)
end
def legacy_milestones
GroupMilestone.build_collection(group, group_projects, params)
end
def milestone
@milestone =
if params[:title]
......
app/controllers/groups/shared_projects_controller.rb
View file @ 9efb1875
......@@ -24,7 +24,9 @@ module Groups
# Make the `search` param consistent for the frontend,
# which will be using `filter`.
params[:search] ||= params[:filter] if params[:filter]
params.permit(:sort, :search)
# Don't show archived projects
params[:non_archived] = true
params.permit(:sort, :search, :non_archived)
end
end
end
......
app/controllers/import/base_controller.rb
View file @ 9efb1875
......@@ -25,4 +25,8 @@ class Import::BaseController < ApplicationController
current_user.namespace
end
def project_save_error(project)
project.errors.full_messages.join(', ')
end
end
app/controllers/import/bitbucket_controller.rb
View file @ 9efb1875
......@@ -55,7 +55,7 @@ class Import::BitbucketController < Import::BaseController
if project.persisted?
render json: ProjectSerializer.new.represent(project)
else
render json: { errors: project.errors.full_messages }, status: :unprocessable_entity
render json: { errors: project_save_error(project) }, status: :unprocessable_entity
end
else
render json: { errors: 'This namespace has already been taken! Please choose another one.' }, status: :unprocessable_entity
......
app/controllers/import/fogbugz_controller.rb
View file @ 9efb1875
......@@ -66,7 +66,7 @@ class Import::FogbugzController < Import::BaseController
if project.persisted?
render json: ProjectSerializer.new.represent(project)
else
render json: { errors: project.errors.full_messages }, status: :unprocessable_entity
render json: { errors: project_save_error(project) }, status: :unprocessable_entity
end
end
......
app/controllers/import/github_controller.rb
View file @ 9efb1875
......@@ -48,7 +48,7 @@ class Import::GithubController < Import::BaseController
if project.persisted?
render json: ProjectSerializer.new.represent(project)
else
render json: { errors: project.errors.full_messages }, status: :unprocessable_entity
render json: { errors: project_save_error(project) }, status: :unprocessable_entity
end
else
render json: { errors: 'This namespace has already been taken! Please choose another one.' }, status: :unprocessable_entity
......
app/controllers/import/gitlab_controller.rb
View file @ 9efb1875
......@@ -32,7 +32,7 @@ class Import::GitlabController < Import::BaseController
if project.persisted?
render json: ProjectSerializer.new.represent(project)
else
render json: { errors: project.errors.full_messages }, status: :unprocessable_entity
render json: { errors: project_save_error(project) }, status: :unprocessable_entity
end
else
render json: { errors: 'This namespace has already been taken! Please choose another one.' }, status: :unprocessable_entity
......
app/controllers/import/google_code_controller.rb
View file @ 9efb1875
......@@ -92,7 +92,7 @@ class Import::GoogleCodeController < Import::BaseController
if project.persisted?
render json: ProjectSerializer.new.represent(project)
else
render json: { errors: project.errors.full_messages }, status: :unprocessable_entity
render json: { errors: project_save_error(project) }, status: :unprocessable_entity
end
end
......
app/controllers/projects/lfs_storage_controller.rb
View file @ 9efb1875
......@@ -18,7 +18,7 @@ class Projects::LfsStorageController < Projects::GitHttpClientController
def upload_authorize
set_workhorse_internal_api_content_type
authorized = LfsObjectUploader.workhorse_authorize
authorized = LfsObjectUploader.workhorse_authorize(has_length: true)
authorized.merge!(LfsOid: oid, LfsSize: size)
render json: authorized
......
app/controllers/projects/merge_requests/application_controller.rb
View file @ 9efb1875
......@@ -15,7 +15,7 @@ class Projects::MergeRequests::ApplicationController < Projects::ApplicationCont
def merge_request_params_attributes
[
:allow_maintainer_to_push,
:allow_collaboration,
:assignee_id,
:description,
:force_remove_source_branch,
......
app/controllers/projects/merge_requests_controller.rb
View file @ 9efb1875
......@@ -28,15 +28,14 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
end
def show
validates_merge_request
close_merge_request_without_source_project
check_if_can_be_merged
# Return if the response has already been rendered
return if response_body
close_merge_request_if_no_source_project
mark_merge_request_mergeable
respond_to do |format|
format.html do
# use next to appease Rubocop
next render('invalid') if target_branch_missing?
# Build a note object for comment form
@note = @project.notes.new(noteable: @merge_request)
......@@ -234,20 +233,6 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
alias_method :issuable, :merge_request
alias_method :awardable, :merge_request
def validates_merge_request
# Show git not found page
# if there is no saved commits between source & target branch
if @merge_request.has_no_commits?
# and if target branch doesn't exist
return invalid_mr unless @merge_request.target_branch_exists?
end
end
def invalid_mr
# Render special view for MR with removed target branch
render 'invalid'
end
def merge_params
params.permit(merge_params_attributes)
end
......@@ -261,7 +246,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
@merge_request.head_pipeline && @merge_request.head_pipeline.active?
end
def close_merge_request_without_source_project
def close_merge_request_if_no_source_project
if !@merge_request.source_project && @merge_request.open?
@merge_request.close
end
......@@ -269,7 +254,11 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
private
def check_if_can_be_merged
def target_branch_missing?
@merge_request.has_no_commits? && !@merge_request.target_branch_exists?
end
def mark_merge_request_mergeable
@merge_request.check_if_can_be_merged
end
......
app/controllers/projects/milestones_controller.rb
View file @ 9efb1875
class Projects::MilestonesController < Projects::ApplicationController
include Gitlab::Utils::StrongMemoize
include MilestoneActions
before_action :check_issuables_available!
......@@ -103,7 +104,7 @@ class Projects::MilestonesController < Projects::ApplicationController
protected
def milestones
@milestones ||= begin
strong_memoize(:milestones) do
MilestonesFinder.new(search_params).execute
end
end
......@@ -121,10 +122,10 @@ class Projects::MilestonesController < Projects::ApplicationController
end
def search_params
if @project.group && can?(current_user, :read_group, @project.group)
group = @project.group
if request.format.json? && @project.group && can?(current_user, :read_group, @project.group)
groups = @project.group.self_and_ancestors
end
params.permit(:state).merge(project_ids: @project.id, group_ids: group&.id)
params.permit(:state).merge(project_ids: @project.id, group_ids: groups&.select(:id))
end
end
app/controllers/projects/pipelines_controller.rb
View file @ 9efb1875
......@@ -23,8 +23,6 @@ class Projects::PipelinesController < Projects::ApplicationController
@finished_count = limited_pipelines_count(project, 'finished')
@pipelines_count = limited_pipelines_count(project)
Gitlab::Ci::Pipeline::Preloader.preload(@pipelines)
respond_to do |format|
format.html
format.json do
......@@ -34,7 +32,7 @@ class Projects::PipelinesController < Projects::ApplicationController
pipelines: PipelineSerializer
.new(project: @project, current_user: @current_user)
.with_pagination(request, response)
.represent(@pipelines, disable_coverage: true),
.represent(@pipelines, disable_coverage: true, preload: true),
count: {
all: @pipelines_count,
running: @running_count,
......
app/controllers/users/terms_controller.rb
View file @ 9efb1875
......@@ -13,6 +13,10 @@ module Users
def index
@redirect = redirect_path
if @term.accepted_by_user?(current_user)
flash.now[:notice] = "You have already accepted the Terms of Service as #{current_user.to_reference}"
end
end
def accept
......
app/graphql/functions/base_function.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
app/graphql/functions/echo.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
app/graphql/gitlab_schema.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
app/graphql/resolvers/base_resolver.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
app/graphql/resolvers/full_path_resolver.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
app/graphql/resolvers/merge_request_resolver.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
app/graphql/resolvers/project_resolver.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
app/graphql/types/base_enum.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
app/graphql/types/base_field.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
app/graphql/types/base_input_object.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
app/graphql/types/base_interface.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
app/graphql/types/base_object.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
app/graphql/types/base_scalar.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
app/graphql/types/base_union.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
app/graphql/types/merge_request_type.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
app/graphql/types/mutation_type.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
app/graphql/types/project_type.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
app/graphql/types/query_type.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
app/graphql/types/time_type.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
app/helpers/application_settings_helper.rb
View file @ 9efb1875
This diff is collapsed.
app/helpers/merge_requests_helper.rb
View file @ 9efb1875
This diff is collapsed.
app/helpers/projects_helper.rb
View file @ 9efb1875
This diff is collapsed.
app/helpers/search_helper.rb
View file @ 9efb1875
This diff is collapsed.
app/helpers/workhorse_helper.rb
View file @ 9efb1875
This diff is collapsed.
app/models/application_setting/term.rb
View file @ 9efb1875
This diff is collapsed.
app/models/ci/build.rb
View file @ 9efb1875
This diff is collapsed.
app/models/ci/group.rb
View file @ 9efb1875
This diff is collapsed.
app/models/ci/legacy_stage.rb
View file @ 9efb1875
This diff is collapsed.
app/models/ci/pipeline.rb
View file @ 9efb1875
This diff is collapsed.
app/models/ci/runner.rb
View file @ 9efb1875
This diff is collapsed.
app/models/ci/stage.rb
View file @ 9efb1875
This diff is collapsed.
app/models/clusters/platforms/kubernetes.rb
View file @ 9efb1875
This diff is collapsed.
app/models/clusters/providers/gcp.rb
View file @ 9efb1875
This diff is collapsed.
app/models/concerns/atomic_internal_id.rb
View file @ 9efb1875
This diff is collapsed.
app/models/concerns/avatarable.rb
View file @ 9efb1875
This diff is collapsed.
app/models/concerns/has_status.rb
View file @ 9efb1875
This diff is collapsed.
app/models/concerns/iid_routes.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
app/models/concerns/protected_ref_access.rb
View file @ 9efb1875
This diff is collapsed.
app/models/concerns/with_uploads.rb
View file @ 9efb1875
This diff is collapsed.
app/models/deployment.rb
View file @ 9efb1875
This diff is collapsed.
app/models/internal_id.rb
View file @ 9efb1875
This diff is collapsed.
app/models/issue.rb
View file @ 9efb1875
This diff is collapsed.
app/models/merge_request.rb
View file @ 9efb1875
This diff is collapsed.
app/models/milestone.rb
View file @ 9efb1875
This diff is collapsed.
app/models/note.rb
View file @ 9efb1875
This diff is collapsed.
app/models/personal_snippet.rb
View file @ 9efb1875
This diff is collapsed.
app/models/project.rb
View file @ 9efb1875
This diff is collapsed.
app/models/project_wiki.rb
View file @ 9efb1875
This diff is collapsed.
app/models/protected_branch.rb
View file @ 9efb1875
This diff is collapsed.
app/models/repository.rb
View file @ 9efb1875
This diff is collapsed.
app/models/term_agreement.rb
View file @ 9efb1875
This diff is collapsed.
app/policies/ci/build_policy.rb
View file @ 9efb1875
This diff is collapsed.
app/policies/ci/pipeline_policy.rb
View file @ 9efb1875
This diff is collapsed.
app/policies/project_policy.rb
View file @ 9efb1875
This diff is collapsed.
app/presenters/merge_request_presenter.rb
View file @ 9efb1875
This diff is collapsed.
app/serializers/pipeline_details_entity.rb
View file @ 9efb1875
This diff is collapsed.
app/serializers/pipeline_serializer.rb
View file @ 9efb1875
This diff is collapsed.
app/services/applications/create_service.rb
View file @ 9efb1875
This diff is collapsed.
app/services/base_service.rb
View file @ 9efb1875
This diff is collapsed.
app/services/lfs/unlock_file_service.rb
View file @ 9efb1875
This diff is collapsed.
app/services/merge_requests/base_service.rb
View file @ 9efb1875
This diff is collapsed.
app/services/pages_service.rb deleted 100644 → 0
View file @ 44be5883
This diff is collapsed.
app/services/projects/create_service.rb
View file @ 9efb1875
This diff is collapsed.
app/services/projects/import_service.rb
View file @ 9efb1875
This diff is collapsed.
app/services/projects/lfs_pointers/lfs_download_service.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
app/services/projects/lfs_pointers/lfs_import_service.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
app/services/projects/lfs_pointers/lfs_link_service.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
app/services/projects/lfs_pointers/lfs_list_service.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
app/services/projects/update_service.rb
View file @ 9efb1875
This diff is collapsed.
app/services/test_hooks/project_service.rb
View file @ 9efb1875
This diff is collapsed.
app/uploaders/object_storage.rb
View file @ 9efb1875
This diff is collapsed.
app/views/admin/projects/show.html.haml
View file @ 9efb1875
This diff is collapsed.
app/views/admin/runners/index.html.haml
View file @ 9efb1875
This diff is collapsed.
app/views/admin/users/_form.html.haml
View file @ 9efb1875
This diff is collapsed.
app/views/groups/_activities.html.haml
View file @ 9efb1875
This diff is collapsed.
app/views/help/_shortcuts.html.haml
View file @ 9efb1875
This diff is collapsed.
app/views/import/gitea/new.html.haml
View file @ 9efb1875
This diff is collapsed.
app/views/import/github/new.html.haml
View file @ 9efb1875
This diff is collapsed.
app/views/kaminari/gitlab/_gap.html.haml
View file @ 9efb1875
This diff is collapsed.
app/views/kaminari/gitlab/_page.html.haml
View file @ 9efb1875
This diff is collapsed.
app/views/layouts/terms.html.haml
View file @ 9efb1875
This diff is collapsed.
app/views/projects/_home_panel.html.haml
View file @ 9efb1875
This diff is collapsed.
app/views/projects/buttons/_xcode_link.html.haml 0 → 100644
View file @ 9efb1875
This diff is collapsed.
app/views/projects/jobs/show.html.haml
View file @ 9efb1875
This diff is collapsed.
app/views/projects/labels/index.html.haml
View file @ 9efb1875
This diff is collapsed.
app/views/projects/new.html.haml
View file @ 9efb1875
This diff is collapsed.
app/views/projects/pages/_destroy.haml
View file @ 9efb1875
This diff is collapsed.
app/views/search/results/_blob.html.haml
View file @ 9efb1875
This diff is collapsed.
app/views/search/results/_blob_data.html.haml 0 → 100644
View file @ 9efb1875
This diff is collapsed.
app/views/shared/builds/_build_output.html.haml 0 → 100644
View file @ 9efb1875
This diff is collapsed.
app/views/users/terms/index.html.haml
View file @ 9efb1875
This diff is collapsed.
app/workers/all_queues.yml
View file @ 9efb1875
This diff is collapsed.
app/workers/ci/archive_traces_cron_worker.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
app/workers/git_garbage_collect_worker.rb
View file @ 9efb1875
This diff is collapsed.
app/workers/gitlab/github_import/import_lfs_object_worker.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
changelogs/unreleased/36862-subgroup-milestones.yml 0 → 100644
View file @ 9efb1875
This diff is collapsed.
changelogs/unreleased/42751-rename-master-to-maintainer.yml 0 → 100644
View file @ 9efb1875
This diff is collapsed.
changelogs/unreleased/42751-rename-mr-maintainer-push.yml 0 → 100644
View file @ 9efb1875
This diff is collapsed.
changelogs/unreleased/45820-add-xcode-link.yml 0 → 100644
View file @ 9efb1875
This diff is collapsed.
changelogs/unreleased/45821-avatar_api.yml 0 → 100644
View file @ 9efb1875
This diff is collapsed.
changelogs/unreleased/46585-gdpr-terms-acceptance.yml 0 → 100644
View file @ 9efb1875
This diff is collapsed.
changelogs/unreleased/46845-update-email_spec-to-2-2-0.yml 0 → 100644
View file @ 9efb1875
This diff is collapsed.
changelogs/unreleased/47189-github_import_visibility.yml 0 → 100644
View file @ 9efb1875
This diff is collapsed.
changelogs/unreleased/bvl-bump-gitlab-shell-7-1-3.yml 0 → 100644
View file @ 9efb1875
This diff is collapsed.
changelogs/unreleased/bvl-graphql-start-34754.yml 0 → 100644
View file @ 9efb1875
This diff is collapsed.
changelogs/unreleased/fix-avatars-n-plus-one.yml 0 → 100644
View file @ 9efb1875
This diff is collapsed.
changelogs/unreleased/fj-40401-support-import-lfs-objects.yml 0 → 100644
View file @ 9efb1875
This diff is collapsed.
changelogs/unreleased/gh-importer-transactions.yml 0 → 100644
View file @ 9efb1875
This diff is collapsed.
changelogs/unreleased/jivl-smarter-system-notes.yml 0 → 100644
View file @ 9efb1875
This diff is collapsed.
changelogs/unreleased/jprovazn-uploader-migration.yml 0 → 100644
View file @ 9efb1875
This diff is collapsed.
changelogs/unreleased/live-trace-v2-persist-data.yml 0 → 100644
View file @ 9efb1875
This diff is collapsed.
changelogs/unreleased/optimise-pages-service-calling.yml 0 → 100644
View file @ 9efb1875
This diff is collapsed.
changelogs/unreleased/optimise-runner-update-cached-info.yml 0 → 100644
View file @ 9efb1875
This diff is collapsed.
changelogs/unreleased/per-project-pipeline-iid.yml 0 → 100644
View file @ 9efb1875
This diff is collapsed.
changelogs/unreleased/presigned-multipart-uploads.yml 0 → 100644
View file @ 9efb1875
This diff is collapsed.
changelogs/unreleased/rails5-fix-46236.yml 0 → 100644
View file @ 9efb1875
This diff is collapsed.
changelogs/unreleased/rails5-fix-46281.yml 0 → 100644
View file @ 9efb1875
This diff is collapsed.
changelogs/unreleased/rails5-fix-47368.yml 0 → 100644
View file @ 9efb1875
This diff is collapsed.
changelogs/unreleased/rails5-fix-47376.yml 0 → 100644
View file @ 9efb1875
This diff is collapsed.
changelogs/unreleased/remove-unused-query-in-hooks.yml 0 → 100644
View file @ 9efb1875
This diff is collapsed.
changelogs/unreleased/sh-add-uncached-query-limiter.yml 0 → 100644
View file @ 9efb1875
This diff is collapsed.
changelogs/unreleased/sh-fix-events-nplus-one.yml 0 → 100644
View file @ 9efb1875
This diff is collapsed.
changelogs/unreleased/sh-fix-pipeline-jobs-nplus-one.yml 0 → 100644
View file @ 9efb1875
This diff is collapsed.
changelogs/unreleased/sh-fix-secrets-not-working.yml 0 → 100644
View file @ 9efb1875
This diff is collapsed.
changelogs/unreleased/sh-fix-source-project-nplus-one.yml 0 → 100644
View file @ 9efb1875
This diff is collapsed.
changelogs/unreleased/sh-improve-import-status-error.yml 0 → 100644
View file @ 9efb1875
This diff is collapsed.
changelogs/unreleased/update-help-integration-screenshot.yml 0 → 100644
View file @ 9efb1875
This diff is collapsed.
config/initializers/1_settings.rb
View file @ 9efb1875
This diff is collapsed.
config/initializers/artifacts_direct_upload_support.rb deleted 100644 → 0
View file @ 44be5883
This diff is collapsed.
config/initializers/direct_upload_support.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
config/routes/api.rb
View file @ 9efb1875
This diff is collapsed.
config/settings.rb
View file @ 9efb1875
This diff is collapsed.
db/migrate/20180424160449_add_pipeline_iid_to_ci_pipelines.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
db/migrate/20180530135500_add_index_to_stages_position.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
db/schema.rb
View file @ 9efb1875
This diff is collapsed.
doc/README.md
View file @ 9efb1875
This diff is collapsed.
doc/administration/integration/terminal.md
View file @ 9efb1875
This diff is collapsed.
doc/administration/job_artifacts.md
View file @ 9efb1875
This diff is collapsed.
doc/administration/pages/index.md
View file @ 9efb1875
This diff is collapsed.
doc/administration/pages/source.md
View file @ 9efb1875
This diff is collapsed.
doc/api/access_requests.md
View file @ 9efb1875
This diff is collapsed.
doc/api/avatar.md 0 → 100644
View file @ 9efb1875
This diff is collapsed.
doc/api/graphql/index.md 0 → 100644
View file @ 9efb1875
This diff is collapsed.
doc/api/members.md
View file @ 9efb1875
This diff is collapsed.
doc/api/merge_requests.md
View file @ 9efb1875
This diff is collapsed.
doc/api/namespaces.md
View file @ 9efb1875
This diff is collapsed.
doc/api/pipelines.md
View file @ 9efb1875
This diff is collapsed.
doc/api/protected_branches.md
View file @ 9efb1875
This diff is collapsed.
doc/api/services.md
View file @ 9efb1875
This diff is collapsed.
doc/api/settings.md
View file @ 9efb1875
This diff is collapsed.
doc/articles/index.md
View file @ 9efb1875
This diff is collapsed.
doc/ci/docker/using_docker_images.md
View file @ 9efb1875
This diff is collapsed.
doc/ci/environments.md
View file @ 9efb1875
This diff is collapsed.
doc/ci/examples/deployment/README.md
View file @ 9efb1875
This diff is collapsed.
doc/ci/pipelines.md
View file @ 9efb1875
This diff is collapsed.
doc/ci/runners/README.md
View file @ 9efb1875
This diff is collapsed.
doc/ci/ssh_keys/README.md
View file @ 9efb1875
This diff is collapsed.
doc/ci/triggers/README.md
View file @ 9efb1875
This diff is collapsed.
doc/ci/variables/README.md
View file @ 9efb1875
This diff is collapsed.
doc/ci/yaml/README.md
View file @ 9efb1875
This diff is collapsed.
doc/development/README.md
View file @ 9efb1875
This diff is collapsed.
doc/development/api_graphql_styleguide.md 0 → 100644
View file @ 9efb1875
This diff is collapsed.
doc/development/doc_styleguide.md
View file @ 9efb1875
This diff is collapsed.
doc/development/documentation/index.md 0 → 100644
View file @ 9efb1875
This diff is collapsed.
doc/development/documentation/styleguide.md 0 → 100644
View file @ 9efb1875
This diff is collapsed.
doc/development/i18n/proofreader.md
View file @ 9efb1875
This diff is collapsed.
doc/development/query_recorder.md
View file @ 9efb1875
This diff is collapsed.
doc/development/rake_tasks.md
View file @ 9efb1875
This diff is collapsed.
doc/development/writing_documentation.md
View file @ 9efb1875
This diff is collapsed.
doc/downgrade_ee_to_ce/README.md
View file @ 9efb1875
This diff is collapsed.
doc/install/kubernetes/gitlab_omnibus.md
View file @ 9efb1875
This diff is collapsed.
doc/integration/github.md
View file @ 9efb1875
This diff is collapsed.
doc/integration/gitlab.md
View file @ 9efb1875
This diff is collapsed.
doc/integration/img/gitlab_app.png
View file @ 9efb1875
This diff is collapsed.
doc/raketasks/backup_restore.md
View file @ 9efb1875
This diff is collapsed.
doc/security/information_exclusivity.md
View file @ 9efb1875
This diff is collapsed.
doc/security/webhooks.md
View file @ 9efb1875
This diff is collapsed.
doc/ssh/README.md
View file @ 9efb1875
This diff is collapsed.
doc/system_hooks/system_hooks.md
View file @ 9efb1875
This diff is collapsed.
doc/topics/autodevops/index.md
View file @ 9efb1875
This diff is collapsed.
doc/update/10.6-to-10.7.md
View file @ 9efb1875
This diff is collapsed.
doc/user/discussions/index.md
View file @ 9efb1875
This diff is collapsed.
doc/user/group/index.md
View file @ 9efb1875
This diff is collapsed.
doc/user/group/subgroups/index.md
View file @ 9efb1875
This diff is collapsed.
doc/user/index.md
View file @ 9efb1875
This diff is collapsed.
doc/user/permissions.md
View file @ 9efb1875
This diff is collapsed.
doc/user/project/clusters/eks_and_gitlab/img/add_cluster.png 0 → 100644
View file @ 9efb1875
This diff is collapsed.
doc/user/project/clusters/eks_and_gitlab/img/create_dns.png 0 → 100644
View file @ 9efb1875
This diff is collapsed.
doc/user/project/clusters/eks_and_gitlab/img/create_project.png 0 → 100644
View file @ 9efb1875
This diff is collapsed.
doc/user/project/clusters/eks_and_gitlab/img/deploy_apps.png 0 → 100644
View file @ 9efb1875
This diff is collapsed.
doc/user/project/clusters/eks_and_gitlab/img/environment.png 0 → 100644
View file @ 9efb1875
This diff is collapsed.
doc/user/project/clusters/eks_and_gitlab/img/new_project.png 0 → 100644
View file @ 9efb1875
This diff is collapsed.
doc/user/project/clusters/eks_and_gitlab/img/pipeline.png 0 → 100644
View file @ 9efb1875
This diff is collapsed.
doc/user/project/clusters/eks_and_gitlab/index.md 0 → 100644
View file @ 9efb1875
This diff is collapsed.
doc/user/project/clusters/index.md
View file @ 9efb1875
This diff is collapsed.
doc/user/project/container_registry.md
View file @ 9efb1875
This diff is collapsed.
doc/user/project/deploy_tokens/index.md
View file @ 9efb1875
This diff is collapsed.
doc/user/project/import/github.md
View file @ 9efb1875
This diff is collapsed.
doc/user/project/integrations/index.md
View file @ 9efb1875
This diff is collapsed.
doc/user/project/members/index.md
View file @ 9efb1875
This diff is collapsed.
doc/user/project/merge_requests/allow_collaboration.md 0 → 100644
View file @ 9efb1875
This diff is collapsed.
doc/user/project/merge_requests/img/allow_collaboration.png 0 → 100644
View file @ 9efb1875
This diff is collapsed.
doc/user/project/merge_requests/index.md
View file @ 9efb1875
This diff is collapsed.
doc/user/project/pages/index.md
View file @ 9efb1875
This diff is collapsed.
doc/user/project/protected_branches.md
View file @ 9efb1875
This diff is collapsed.
doc/user/project/protected_tags.md
View file @ 9efb1875
This diff is collapsed.
doc/user/project/settings/import_export.md
View file @ 9efb1875
This diff is collapsed.
doc/user/project/settings/index.md
View file @ 9efb1875
This diff is collapsed.
doc/workflow/gitlab_flow.md
View file @ 9efb1875
This diff is collapsed.
doc/workflow/repository_mirroring.md
View file @ 9efb1875
This diff is collapsed.
doc_styleguide.md deleted 100644 → 0
View file @ 44be5883
This diff is collapsed.
lib/api/api.rb
View file @ 9efb1875
This diff is collapsed.
lib/api/avatar.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
lib/api/entities.rb
View file @ 9efb1875
This diff is collapsed.
lib/api/events.rb
View file @ 9efb1875
This diff is collapsed.
lib/api/issues.rb
View file @ 9efb1875
This diff is collapsed.
lib/api/jobs.rb
View file @ 9efb1875
This diff is collapsed.
lib/api/merge_requests.rb
View file @ 9efb1875
This diff is collapsed.
lib/api/pipelines.rb
View file @ 9efb1875
This diff is collapsed.
lib/api/protected_branches.rb
View file @ 9efb1875
This diff is collapsed.
lib/api/runner.rb
View file @ 9efb1875
This diff is collapsed.
lib/api/search.rb
View file @ 9efb1875
This diff is collapsed.
lib/backup.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
lib/backup/database.rb
View file @ 9efb1875
This diff is collapsed.
lib/backup/files.rb
View file @ 9efb1875
This diff is collapsed.
lib/backup/manager.rb
View file @ 9efb1875
This diff is collapsed.
lib/backup/repository.rb
View file @ 9efb1875
This diff is collapsed.
lib/constraints/feature_constrainer.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
lib/gitlab/access.rb
View file @ 9efb1875
This diff is collapsed.
lib/gitlab/auth.rb
View file @ 9efb1875
This diff is collapsed.
lib/gitlab/background_migration/archive_legacy_traces.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
lib/gitlab/checks/change_access.rb
View file @ 9efb1875
This diff is collapsed.
lib/gitlab/ci/pipeline/chain/populate.rb
View file @ 9efb1875
This diff is collapsed.
lib/gitlab/ci/pipeline/preloader.rb
View file @ 9efb1875
This diff is collapsed.
lib/gitlab/ci/status/stage/common.rb
View file @ 9efb1875
This diff is collapsed.
lib/gitlab/ci/trace.rb
View file @ 9efb1875
This diff is collapsed.
lib/gitlab/database/median.rb
View file @ 9efb1875
This diff is collapsed.
lib/gitlab/diff/file.rb
View file @ 9efb1875
This diff is collapsed.
lib/gitlab/diff/line.rb
View file @ 9efb1875
This diff is collapsed.
lib/gitlab/file_finder.rb
View file @ 9efb1875
This diff is collapsed.
lib/gitlab/git/commit.rb
View file @ 9efb1875
This diff is collapsed.
lib/gitlab/git/repository.rb
View file @ 9efb1875
This diff is collapsed.
lib/gitlab/git/rev_list.rb
View file @ 9efb1875
This diff is collapsed.
lib/gitlab/gitaly_client.rb
View file @ 9efb1875
This diff is collapsed.
lib/gitlab/github_import/importer/lfs_object_importer.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
lib/gitlab/github_import/importer/lfs_objects_importer.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
lib/gitlab/github_import/representation/lfs_object.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
lib/gitlab/gpg.rb
View file @ 9efb1875
This diff is collapsed.
lib/gitlab/graphql.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
lib/gitlab/graphql/authorize.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
lib/gitlab/graphql/authorize/instrumentation.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
lib/gitlab/graphql/present.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
lib/gitlab/graphql/present/instrumentation.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
lib/gitlab/graphql/variables.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
lib/gitlab/import_export/repo_saver.rb
View file @ 9efb1875
This diff is collapsed.
lib/gitlab/import_export/wiki_repo_saver.rb
View file @ 9efb1875
This diff is collapsed.
lib/gitlab/project_search_results.rb
View file @ 9efb1875
This diff is collapsed.
lib/gitlab/slash_commands/command.rb
View file @ 9efb1875
This diff is collapsed.
lib/gitlab/task_helpers.rb
View file @ 9efb1875
This diff is collapsed.
lib/gitlab/user_access.rb
View file @ 9efb1875
This diff is collapsed.
lib/gitlab/utils/override.rb
View file @ 9efb1875
This diff is collapsed.
lib/gitlab/wiki_file_finder.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
lib/object_storage/direct_upload.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
lib/tasks/gitlab/cleanup.rake
View file @ 9efb1875
This diff is collapsed.
lib/tasks/gitlab/traces.rake
View file @ 9efb1875
This diff is collapsed.
locale/gitlab.pot
View file @ 9efb1875
This diff is collapsed.
qa/Dockerfile
View file @ 9efb1875
This diff is collapsed.
qa/qa.rb
View file @ 9efb1875
This diff is collapsed.
qa/qa/factory/repository/push.rb
View file @ 9efb1875
This diff is collapsed.
qa/qa/factory/resource/kubernetes_cluster.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
qa/qa/fixtures/auto_devops_rack/Gemfile 0 → 100644
View file @ 9efb1875
This diff is collapsed.
qa/qa/fixtures/auto_devops_rack/Gemfile.lock 0 → 100644
View file @ 9efb1875
This diff is collapsed.
qa/qa/fixtures/auto_devops_rack/Rakefile 0 → 100644
View file @ 9efb1875
This diff is collapsed.
qa/qa/fixtures/auto_devops_rack/config.ru 0 → 100644
View file @ 9efb1875
This diff is collapsed.
qa/qa/page/menu/side.rb
View file @ 9efb1875
This diff is collapsed.
qa/qa/page/project/job/show.rb
View file @ 9efb1875
This diff is collapsed.
qa/qa/page/project/operations/kubernetes/add.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
qa/qa/page/project/operations/kubernetes/add_existing.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
qa/qa/page/project/operations/kubernetes/index.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
qa/qa/page/project/operations/kubernetes/show.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
qa/qa/page/project/pipeline/show.rb
View file @ 9efb1875
This diff is collapsed.
qa/qa/page/project/settings/ci_cd.rb
View file @ 9efb1875
This diff is collapsed.
qa/qa/scenario/test/integration/kubernetes.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
qa/qa/service/kubernetes_cluster.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
qa/qa/service/runner.rb
View file @ 9efb1875
This diff is collapsed.
qa/qa/specs/features/project/auto_devops_spec.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
spec/controllers/graphql_controller_spec.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
spec/controllers/search_controller_spec.rb
View file @ 9efb1875
This diff is collapsed.
spec/factories/merge_requests.rb
View file @ 9efb1875
This diff is collapsed.
spec/factories/term_agreements.rb
View file @ 9efb1875
This diff is collapsed.
spec/features/markdown/markdown_spec.rb
View file @ 9efb1875
This diff is collapsed.
spec/features/protected_branches_spec.rb
View file @ 9efb1875
This diff is collapsed.
spec/features/runners_spec.rb
View file @ 9efb1875
This diff is collapsed.
spec/features/users/terms_spec.rb
View file @ 9efb1875
This diff is collapsed.
spec/graphql/gitlab_schema_spec.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
spec/graphql/resolvers/merge_request_resolver_spec.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
spec/graphql/resolvers/project_resolver_spec.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
spec/graphql/types/project_type_spec.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
spec/graphql/types/query_type_spec.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
spec/graphql/types/time_type_spec.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
spec/helpers/projects_helper_spec.rb
View file @ 9efb1875
This diff is collapsed.
spec/initializers/direct_upload_support_spec.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
spec/javascripts/ide/components/jobs/detail_spec.js 0 → 100644
View file @ 9efb1875
This diff is collapsed.
spec/javascripts/ide/components/merge_requests/item_spec.js 0 → 100644
View file @ 9efb1875
This diff is collapsed.
spec/javascripts/ide/components/merge_requests/list_spec.js 0 → 100644
View file @ 9efb1875
This diff is collapsed.
spec/javascripts/ide/mock_data.js
View file @ 9efb1875
This diff is collapsed.
spec/javascripts/importer_status_spec.js
View file @ 9efb1875
This diff is collapsed.
spec/javascripts/jobs/header_spec.js
View file @ 9efb1875
This diff is collapsed.
spec/javascripts/labels_select_spec.js
View file @ 9efb1875
This diff is collapsed.
spec/javascripts/monitoring/graph_spec.js
View file @ 9efb1875
This diff is collapsed.
spec/javascripts/notes/mock_data.js
View file @ 9efb1875
This diff is collapsed.
spec/javascripts/notes/stores/collapse_utils_spec.js 0 → 100644
View file @ 9efb1875
This diff is collapsed.
spec/lib/backup/files_spec.rb
View file @ 9efb1875
This diff is collapsed.
spec/lib/backup/manager_spec.rb
View file @ 9efb1875
This diff is collapsed.
spec/lib/backup/repository_spec.rb
View file @ 9efb1875
This diff is collapsed.
spec/lib/gitlab/ci/trace_spec.rb
View file @ 9efb1875
This diff is collapsed.
spec/lib/gitlab/diff/file_spec.rb
View file @ 9efb1875
This diff is collapsed.
spec/lib/gitlab/file_finder_spec.rb
View file @ 9efb1875
This diff is collapsed.
spec/lib/gitlab/git/repository_spec.rb
View file @ 9efb1875
This diff is collapsed.
spec/lib/gitlab/git/rev_list_spec.rb
View file @ 9efb1875
This diff is collapsed.
spec/lib/gitlab/git_access_spec.rb
View file @ 9efb1875
This diff is collapsed.
spec/lib/gitlab/gpg_spec.rb
View file @ 9efb1875
This diff is collapsed.
spec/lib/gitlab/import_export/fork_spec.rb
View file @ 9efb1875
This diff is collapsed.
spec/lib/gitlab/import_sources_spec.rb
View file @ 9efb1875
This diff is collapsed.
spec/lib/gitlab/path_regex_spec.rb
View file @ 9efb1875
This diff is collapsed.
spec/lib/gitlab/shell_spec.rb
View file @ 9efb1875
This diff is collapsed.
spec/lib/gitlab/sql/glob_spec.rb
View file @ 9efb1875
This diff is collapsed.
spec/lib/gitlab/user_access_spec.rb
View file @ 9efb1875
This diff is collapsed.
spec/lib/gitlab/utils/override_spec.rb
View file @ 9efb1875
This diff is collapsed.
spec/lib/gitlab/wiki_file_finder_spec.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
spec/lib/object_storage/direct_upload_spec.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
spec/mailers/notify_spec.rb
View file @ 9efb1875
This diff is collapsed.
spec/migrations/schedule_to_archive_legacy_traces_spec.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
spec/models/application_setting_spec.rb
View file @ 9efb1875
This diff is collapsed.
spec/models/ci/build_spec.rb
View file @ 9efb1875
This diff is collapsed.
spec/models/ci/group_spec.rb
View file @ 9efb1875
This diff is collapsed.
spec/models/ci/pipeline_spec.rb
View file @ 9efb1875
This diff is collapsed.
spec/models/ci/runner_spec.rb
View file @ 9efb1875
This diff is collapsed.
spec/models/ci/stage_spec.rb
View file @ 9efb1875
This diff is collapsed.
spec/models/deployment_spec.rb
View file @ 9efb1875
This diff is collapsed.
spec/models/issue_spec.rb
View file @ 9efb1875
This diff is collapsed.
spec/models/merge_request_spec.rb
View file @ 9efb1875
This diff is collapsed.
spec/models/milestone_spec.rb
View file @ 9efb1875
This diff is collapsed.
spec/models/namespace_spec.rb
View file @ 9efb1875
This diff is collapsed.
spec/models/project_spec.rb
View file @ 9efb1875
This diff is collapsed.
spec/models/project_team_spec.rb
View file @ 9efb1875
This diff is collapsed.
spec/models/repository_spec.rb
View file @ 9efb1875
This diff is collapsed.
spec/models/term_agreement_spec.rb
View file @ 9efb1875
This diff is collapsed.
spec/policies/ci/build_policy_spec.rb
View file @ 9efb1875
This diff is collapsed.
spec/policies/ci/pipeline_policy_spec.rb
View file @ 9efb1875
This diff is collapsed.
spec/policies/project_policy_spec.rb
View file @ 9efb1875
This diff is collapsed.
spec/requests/api/avatar_spec.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
spec/requests/api/events_spec.rb
View file @ 9efb1875
This diff is collapsed.
spec/requests/api/graphql/merge_request_query_spec.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
spec/requests/api/graphql/project_query_spec.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
spec/requests/api/internal_spec.rb
View file @ 9efb1875
This diff is collapsed.
spec/requests/api/issues_spec.rb
View file @ 9efb1875
This diff is collapsed.
spec/requests/api/jobs_spec.rb
View file @ 9efb1875
This diff is collapsed.
spec/requests/api/merge_requests_spec.rb
View file @ 9efb1875
This diff is collapsed.
spec/requests/api/pipelines_spec.rb
View file @ 9efb1875
This diff is collapsed.
spec/requests/api/repositories_spec.rb
View file @ 9efb1875
This diff is collapsed.
spec/requests/api/runner_spec.rb
View file @ 9efb1875
This diff is collapsed.
spec/requests/api/settings_spec.rb
View file @ 9efb1875
This diff is collapsed.
spec/requests/api/tags_spec.rb
View file @ 9efb1875
This diff is collapsed.
spec/requests/lfs_http_spec.rb
View file @ 9efb1875
This diff is collapsed.
spec/routing/api_routing_spec.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
spec/services/pages_service_spec.rb deleted 100644 → 0
View file @ 44be5883
This diff is collapsed.
spec/services/projects/lfs_pointers/lfs_import_service_spec.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
spec/services/projects/lfs_pointers/lfs_link_service_spec.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
spec/spec_helper.rb
View file @ 9efb1875
This diff is collapsed.
spec/support/helpers/graphql_helpers.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
spec/support/helpers/query_recorder.rb
View file @ 9efb1875
This diff is collapsed.
spec/support/helpers/stub_object_storage.rb
View file @ 9efb1875
This diff is collapsed.
spec/support/matchers/email_matchers.rb deleted 100644 → 0
View file @ 44be5883
This diff is collapsed.
spec/support/matchers/exceed_query_limit.rb
View file @ 9efb1875
This diff is collapsed.
spec/support/matchers/graphql_matchers.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
spec/support/shared_examples/file_finder.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
spec/support/trace/trace_helpers.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
spec/tasks/gitlab/backup_rake_spec.rb
View file @ 9efb1875
This diff is collapsed.
spec/uploaders/object_storage_spec.rb
View file @ 9efb1875
This diff is collapsed.
spec/workers/ci/archive_traces_cron_worker_spec.rb 0 → 100644
View file @ 9efb1875
This diff is collapsed.
spec/workers/stuck_ci_jobs_worker_spec.rb
View file @ 9efb1875
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