Skip to content

G
gitlab-ce
Commit 02838d5b authored by Jose Ivan Vargas's avatar Jose Ivan Vargas
Browse files
Options

Merge branch 'master' into sh-headless-chrome-support

parents 035bf5d4 3cbab382
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 12231 additions and 3083 deletions
.flayignore
View file @ 02838d5b
......@@ -5,3 +5,4 @@ app/policies/project_policy.rb
app/models/concerns/relative_positioning.rb
app/workers/stuck_merge_jobs_worker.rb
lib/gitlab/redis/*.rb
lib/gitlab/gitaly_client/operation_service.rb
.gitlab-ci.yml
View file @ 02838d5b
......@@ -27,7 +27,7 @@ variables:
GET_SOURCES_ATTEMPTS: "3"
KNAPSACK_RSPEC_SUITE_REPORT_PATH: knapsack/${CI_PROJECT_NAME}/rspec_report-master.json
KNAPSACK_SPINACH_SUITE_REPORT_PATH: knapsack/${CI_PROJECT_NAME}/spinach_report-master.json
FLAKY_RSPEC_SUITE_REPORT_PATH: rspec_flaky/${CI_PROJECT_NAME}/report-master.json
FLAKY_RSPEC_SUITE_REPORT_PATH: rspec_flaky/report-suite.json
before_script:
- bundle --version
......@@ -87,12 +87,13 @@ stages:
- export CI_NODE_TOTAL=${JOB_NAME[-1]}
- export KNAPSACK_REPORT_PATH=knapsack/${CI_PROJECT_NAME}/${JOB_NAME[0]}_node_${CI_NODE_INDEX}_${CI_NODE_TOTAL}_report.json
- export KNAPSACK_GENERATE_REPORT=true
- export ALL_FLAKY_RSPEC_REPORT_PATH=rspec_flaky/${CI_PROJECT_NAME}/all_node_${CI_NODE_INDEX}_${CI_NODE_TOTAL}_report.json
- export NEW_FLAKY_RSPEC_REPORT_PATH=rspec_flaky/${CI_PROJECT_NAME}/new_node_${CI_NODE_INDEX}_${CI_NODE_TOTAL}_report.json
- export SUITE_FLAKY_RSPEC_REPORT_PATH=${FLAKY_RSPEC_SUITE_REPORT_PATH}
- export FLAKY_RSPEC_REPORT_PATH=rspec_flaky/all_${JOB_NAME[0]}_${CI_NODE_INDEX}_${CI_NODE_TOTAL}_report.json
- export NEW_FLAKY_RSPEC_REPORT_PATH=rspec_flaky/new_${JOB_NAME[0]}_${CI_NODE_INDEX}_${CI_NODE_TOTAL}_report.json
- export FLAKY_RSPEC_GENERATE_REPORT=true
- export CACHE_CLASSES=true
- cp ${KNAPSACK_RSPEC_SUITE_REPORT_PATH} ${KNAPSACK_REPORT_PATH}
- cp ${FLAKY_RSPEC_SUITE_REPORT_PATH} ${ALL_FLAKY_RSPEC_REPORT_PATH}
- '[[ -f $FLAKY_RSPEC_REPORT_PATH ]] || echo "{}" > ${FLAKY_RSPEC_REPORT_PATH}'
- '[[ -f $NEW_FLAKY_RSPEC_REPORT_PATH ]] || echo "{}" > ${NEW_FLAKY_RSPEC_REPORT_PATH}'
- scripts/gitaly-test-spawn
- knapsack rspec "--color --format documentation"
......@@ -233,7 +234,7 @@ retrieve-tests-metadata:
- wget -O $KNAPSACK_SPINACH_SUITE_REPORT_PATH http://${TESTS_METADATA_S3_BUCKET}.s3.amazonaws.com/$KNAPSACK_SPINACH_SUITE_REPORT_PATH || rm $KNAPSACK_SPINACH_SUITE_REPORT_PATH
- '[[ -f $KNAPSACK_RSPEC_SUITE_REPORT_PATH ]] || echo "{}" > ${KNAPSACK_RSPEC_SUITE_REPORT_PATH}'
- '[[ -f $KNAPSACK_SPINACH_SUITE_REPORT_PATH ]] || echo "{}" > ${KNAPSACK_SPINACH_SUITE_REPORT_PATH}'
- mkdir -p rspec_flaky/${CI_PROJECT_NAME}/
- mkdir -p rspec_flaky/
- wget -O $FLAKY_RSPEC_SUITE_REPORT_PATH http://${TESTS_METADATA_S3_BUCKET}.s3.amazonaws.com/$FLAKY_RSPEC_SUITE_REPORT_PATH || rm $FLAKY_RSPEC_SUITE_REPORT_PATH
- '[[ -f $FLAKY_RSPEC_SUITE_REPORT_PATH ]] || echo "{}" > ${FLAKY_RSPEC_SUITE_REPORT_PATH}'
......@@ -252,22 +253,21 @@ update-tests-metadata:
- retry gem install fog-aws mime-types
- scripts/merge-reports ${KNAPSACK_RSPEC_SUITE_REPORT_PATH} knapsack/${CI_PROJECT_NAME}/rspec-pg_node_*.json
- scripts/merge-reports ${KNAPSACK_SPINACH_SUITE_REPORT_PATH} knapsack/${CI_PROJECT_NAME}/spinach-pg_node_*.json
- scripts/merge-reports ${FLAKY_RSPEC_SUITE_REPORT_PATH} rspec_flaky/${CI_PROJECT_NAME}/all_node_*.json
- scripts/merge-reports ${FLAKY_RSPEC_SUITE_REPORT_PATH} rspec_flaky/all_*_*.json
- '[[ -z ${TESTS_METADATA_S3_BUCKET} ]] || scripts/sync-reports put $TESTS_METADATA_S3_BUCKET $KNAPSACK_RSPEC_SUITE_REPORT_PATH $KNAPSACK_SPINACH_SUITE_REPORT_PATH'
- '[[ -z ${TESTS_METADATA_S3_BUCKET} ]] || scripts/sync-reports put $TESTS_METADATA_S3_BUCKET $FLAKY_RSPEC_SUITE_REPORT_PATH'
- rm -f knapsack/${CI_PROJECT_NAME}/*_node_*.json
- rm -f rspec_flaky/${CI_PROJECT_NAME}/*_node_*.json
- rm -f rspec_flaky/all_*.json rspec_flaky/new_*.json
flaky-examples-check:
<<: *dedicated-runner
image: ruby:2.3-alpine
services: []
before_script: []
cache: {}
variables:
SETUP_DB: "false"
USE_BUNDLE_INSTALL: "false"
NEW_FLAKY_SPECS_REPORT: rspec_flaky/${CI_PROJECT_NAME}/new_rspec_flaky_examples.json
NEW_FLAKY_SPECS_REPORT: rspec_flaky/report-new.json
stage: post-test
allow_failure: yes
only:
......@@ -281,7 +281,7 @@ flaky-examples-check:
- rspec_flaky/
script:
- '[[ -f $NEW_FLAKY_SPECS_REPORT ]] || echo "{}" > ${NEW_FLAKY_SPECS_REPORT}'
- scripts/merge-reports $NEW_FLAKY_SPECS_REPORT rspec_flaky/${CI_PROJECT_NAME}/new_node_*.json
- scripts/merge-reports ${NEW_FLAKY_SPECS_REPORT} rspec_flaky/new_*_*.json
- scripts/detect-new-flaky-examples $NEW_FLAKY_SPECS_REPORT
setup-test-env:
......
CHANGELOG.md
View file @ 02838d5b
......@@ -2,6 +2,23 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
## 10.0.3 (2017-10-05)
- [FIXED] find_user Users helper method no longer overrides find_user API helper method. !14418
- [FIXED] Fix CSRF validation issue when closing/opening merge requests from the UI. !14555
- [FIXED] Kubernetes integration: ensure v1.8.0 compatibility. !14635
- [FIXED] Fixes data parameter not being sent in ajax request for jobs log.
- [FIXED] Improves UX of autodevops popover to match gpg one.
- [FIXED] Fixed commenting on side-by-side commit diff.
- [FIXED] Make sure API responds with 401 when invalid authentication info is provided.
- [FIXED] Fix merge request counter updates after merge.
- [FIXED] Fix gitlab-rake gitlab:import:repos task failing.
- [FIXED] Fix pushes to an empty repository not invalidating has_visible_content? cache.
- [FIXED] Ensure all refs are restored on a restore from backup.
- [FIXED] Gitaly RepositoryExists remains opt-in for all method calls.
- [FIXED] Fix 500 error on merged merge requests when GitLab is restored from a backup.
- [FIXED] Adjust MRs being stuck on "process of being merged" for more than 2 hours.
## 10.0.2 (2017-09-27)
- [FIXED] Notes will not show an empty bubble when the author isn't a member. !14450
......@@ -195,6 +212,14 @@ entry.
- Added type to CHANGELOG entries. (Jacopo Beschi @jacopo-beschi)
- [BUGIFX] Improves subgroup creation permissions. !13418
## 9.5.8 (2017-10-04)
- [FIXED] Fixed fork button being disabled for users who can fork to a group.
## 9.5.7 (2017-10-03)
- Fix gitlab rake:import:repos task.
## 9.5.6 (2017-09-29)
- [FIXED] Fix MR ready to merge buttons/controls at mobile breakpoint. !14242
......
Gemfile
View file @ 02838d5b
......@@ -23,7 +23,7 @@ gem 'faraday', '~> 0.12'
# Authentication libraries
gem 'devise', '~> 4.2'
gem 'doorkeeper', '~> 4.2.0'
gem 'doorkeeper-openid_connect', '~> 1.1.0'
gem 'doorkeeper-openid_connect', '~> 1.2.0'
gem 'omniauth', '~> 1.4.2'
gem 'omniauth-auth0', '~> 1.4.1'
gem 'omniauth-azure-oauth2', '~> 0.0.9'
......
Gemfile.lock
View file @ 02838d5b
......@@ -80,7 +80,7 @@ GEM
coderay (>= 1.0.0)
erubis (>= 2.6.6)
rack (>= 0.9.0)
bindata (2.3.5)
bindata (2.4.1)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
bootstrap-sass (3.3.6)
......@@ -167,9 +167,9 @@ GEM
docile (1.1.5)
domain_name (0.5.20161021)
unf (>= 0.0.5, < 1.0.0)
doorkeeper (4.2.0)
doorkeeper (4.2.6)
railties (>= 4.2)
doorkeeper-openid_connect (1.1.2)
doorkeeper-openid_connect (1.2.0)
doorkeeper (~> 4.0)
json-jwt (~> 1.6)
dropzonejs-rails (0.7.2)
......@@ -411,7 +411,7 @@ GEM
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (1.8.6)
json-jwt (1.7.1)
json-jwt (1.7.2)
activesupport
bindata
multi_json (>= 1.3)
......@@ -677,7 +677,7 @@ GEM
rainbow (2.2.2)
rake
raindrops (0.18.0)
rake (12.0.0)
rake (12.1.0)
rblineprof (0.3.6)
debugger-ruby_core_source (~> 1.3)
rbnacl (4.0.2)
......@@ -909,7 +909,7 @@ GEM
json (>= 1.8.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.2)
unf_ext (0.0.7.4)
unicode-display_width (1.3.0)
unicorn (5.1.0)
kgio (~> 2.6)
......@@ -998,7 +998,7 @@ DEPENDENCIES
devise-two-factor (~> 3.0.0)
diffy (~> 3.1.0)
doorkeeper (~> 4.2.0)
doorkeeper-openid_connect (~> 1.1.0)
doorkeeper-openid_connect (~> 1.2.0)
dropzonejs-rails (~> 0.7.1)
email_reply_trimmer (~> 0.1)
email_spec (~> 1.6.0)
......
app/assets/javascripts/build_artifacts.js
View file @ 02838d5b
/* eslint-disable func-names, space-before-function-paren, wrap-iife, prefer-arrow-callback, no-unused-vars, no-return-assign, max-len */
import { visitUrl } from './lib/utils/url_utility';
import { convertPermissionToBoolean } from './lib/utils/common_utils';
window.BuildArtifacts = (function() {
function BuildArtifacts() {
this.disablePropagation();
this.setupEntryClick();
this.setupTooltips();
}
BuildArtifacts.prototype.disablePropagation = function() {
......@@ -17,9 +20,28 @@ window.BuildArtifacts = (function() {
BuildArtifacts.prototype.setupEntryClick = function() {
return $('.tree-holder').on('click', 'tr[data-link]', function(e) {
return window.location = this.dataset.link;
visitUrl(this.dataset.link, convertPermissionToBoolean(this.dataset.externalLink));
});
};
BuildArtifacts.prototype.setupTooltips = function() {
$('.js-artifact-tree-tooltip').tooltip({
placement: 'bottom',
// Stop the tooltip from hiding when we stop hovering the element directly
// We handle all the showing/hiding below
trigger: 'manual',
});
// We want the tooltip to show if you hover anywhere on the row
// But be placed below and in the middle of the file name
$('.js-artifact-tree-row')
.on('mouseenter', (e) => {
$(e.currentTarget).find('.js-artifact-tree-tooltip').tooltip('show');
})
.on('mouseleave', (e) => {
$(e.currentTarget).find('.js-artifact-tree-tooltip').tooltip('hide');
});
};
return BuildArtifacts;
})();
app/assets/javascripts/clusters.js 0 → 100644
View file @ 02838d5b
/* globals Flash */
import Visibility from 'visibilityjs';
import axios from 'axios';
import Poll from './lib/utils/poll';
import { s__ } from './locale';
import './flash';
/**
* Cluster page has 2 separate parts:
* Toggle button
*
* - Polling status while creating or scheduled
* -- Update status area with the response result
*/
class ClusterService {
constructor(options = {}) {
this.options = options;
}
fetchData() {
return axios.get(this.options.endpoint);
}
}
export default class Clusters {
constructor() {
const dataset = document.querySelector('.js-edit-cluster-form').dataset;
this.state = {
statusPath: dataset.statusPath,
clusterStatus: dataset.clusterStatus,
clusterStatusReason: dataset.clusterStatusReason,
toggleStatus: dataset.toggleStatus,
};
this.service = new ClusterService({ endpoint: this.state.statusPath });
this.toggleButton = document.querySelector('.js-toggle-cluster');
this.toggleInput = document.querySelector('.js-toggle-input');
this.errorContainer = document.querySelector('.js-cluster-error');
this.successContainer = document.querySelector('.js-cluster-success');
this.creatingContainer = document.querySelector('.js-cluster-creating');
this.errorReasonContainer = this.errorContainer.querySelector('.js-error-reason');
this.toggleButton.addEventListener('click', this.toggle.bind(this));
if (this.state.clusterStatus !== 'created') {
this.updateContainer(this.state.clusterStatus, this.state.clusterStatusReason);
}
if (this.state.statusPath) {
this.initPolling();
}
}
toggle() {
this.toggleButton.classList.toggle('checked');
this.toggleInput.setAttribute('value', this.toggleButton.classList.contains('checked').toString());
}
initPolling() {
this.poll = new Poll({
resource: this.service,
method: 'fetchData',
successCallback: (data) => {
const { status, status_reason } = data.data;
this.updateContainer(status, status_reason);
},
errorCallback: () => {
Flash(s__('ClusterIntegration|Something went wrong on our end.'));
},
});
if (!Visibility.hidden()) {
this.poll.makeRequest();
} else {
this.service.fetchData();
}
Visibility.change(() => {
if (!Visibility.hidden()) {
this.poll.restart();
} else {
this.poll.stop();
}
});
}
hideAll() {
this.errorContainer.classList.add('hidden');
this.successContainer.classList.add('hidden');
this.creatingContainer.classList.add('hidden');
}
updateContainer(status, error) {
this.hideAll();
switch (status) {
case 'created':
this.successContainer.classList.remove('hidden');
break;
case 'errored':
this.errorContainer.classList.remove('hidden');
this.errorReasonContainer.textContent = error;
break;
case 'scheduled':
case 'creating':
this.creatingContainer.classList.remove('hidden');
break;
default:
this.hideAll();
}
}
}
app/assets/javascripts/cycle_analytics/components/total_time_component.vue
View file @ 02838d5b
......@@ -20,7 +20,7 @@
<template v-if="time.days">{{ time.days }} <span>{{ n__('day', 'days', time.days) }}</span></template>
<template v-if="time.hours">{{ time.hours }} <span>{{ n__('Time|hr', 'Time|hrs', time.hours) }}</span></template>
<template v-if="time.mins && !time.days">{{ time.mins }} <span>{{ n__('Time|min', 'Time|mins', time.mins) }}</span></template>
<template v-if="time.seconds && hasDa === 1 || time.seconds === 0">{{ time.seconds }} <span>{{ s__('Time|s') }}</span></template>
<template v-if="time.seconds && hasData === 1 || time.seconds === 0">{{ time.seconds }} <span>{{ s__('Time|s') }}</span></template>
</template>
<template v-else>
--
......
app/assets/javascripts/diff.js
View file @ 02838d5b
......@@ -17,7 +17,8 @@ class Diff {
}
});
FilesCommentButton.init($diffFile);
const tab = document.getElementById('diffs');
if (!tab || (tab && tab.dataset && tab.dataset.isLocked !== '')) FilesCommentButton.init($diffFile);
$diffFile.each((index, file) => new gl.ImageFile(file));
......
app/assets/javascripts/dispatcher.js
View file @ 02838d5b
......@@ -525,6 +525,11 @@ import { ajaxGet, convertPermissionToBoolean } from './lib/utils/common_utils';
case 'admin:impersonation_tokens:index':
new gl.DueDateSelectors();
break;
case 'projects:clusters:show':
import(/* webpackChunkName: "clusters" */ './clusters')
.then(cluster => new cluster.default()) // eslint-disable-line new-cap
.catch(() => {});
break;
}
switch (path[0]) {
case 'sessions':
......
app/assets/javascripts/gl_dropdown.js
View file @ 02838d5b
......@@ -738,7 +738,7 @@ GitLabDropdown = (function() {
: selectedObject.id;
if (isInput) {
field = $(this.el);
} else if (value) {
} else if (value != null) {
field = this.dropdown.parent().find("input[name='" + fieldName + "'][value='" + value.toString().replace(/'/g, '\\\'') + "']");
}
......@@ -746,7 +746,7 @@ GitLabDropdown = (function() {
return;
}
if (el.hasClass(ACTIVE_CLASS)) {
if (el.hasClass(ACTIVE_CLASS) && value !== 0) {
isMarking = false;
el.removeClass(ACTIVE_CLASS);
if (field && field.length) {
......@@ -852,7 +852,7 @@ GitLabDropdown = (function() {
if (href && href !== '#') {
gl.utils.visitUrl(href);
} else {
$el.first().trigger('click');
$el.trigger('click');
}
}
};
......
app/assets/javascripts/lib/utils/csrf.js
View file @ 02838d5b
......@@ -14,6 +14,9 @@ If you need to compose a headers object, use the spread operator:
someOtherHeader: '12345',
}
```
see also http://guides.rubyonrails.org/security.html#cross-site-request-forgery-csrf
and https://github.com/rails/jquery-rails/blob/v4.3.1/vendor/assets/javascripts/jquery_ujs.js#L59-L62
*/
const csrf = {
......@@ -53,4 +56,3 @@ if ($.rails) {
}
export default csrf;
app/assets/javascripts/lib/utils/url_utility.js
View file @ 02838d5b
/* eslint-disable func-names, space-before-function-paren, wrap-iife, no-var, no-param-reassign, no-cond-assign, one-var, one-var-declaration-per-line, no-void, guard-for-in, no-restricted-syntax, prefer-template, quotes, max-len */
var base;
var w = window;
if (w.gl == null) {
......@@ -86,6 +87,21 @@ w.gl.utils.getLocationHash = function(url) {
w.gl.utils.refreshCurrentPage = () => gl.utils.visitUrl(document.location.href);
w.gl.utils.visitUrl = (url) => {
document.location.href = url;
// eslint-disable-next-line import/prefer-default-export
export function visitUrl(url, external = false) {
if (external) {
// Simulate `target="blank" rel="noopener noreferrer"`
// See https://mathiasbynens.github.io/rel-noopener/
const otherWindow = window.open();
otherWindow.opener = null;
otherWindow.location = url;
} else {
document.location.href = url;
}
}
window.gl = window.gl || {};
window.gl.utils = {
...(window.gl.utils || {}),
visitUrl,
};
app/assets/javascripts/line_highlighter.js
View file @ 02838d5b
......@@ -54,12 +54,14 @@ LineHighlighter.prototype.bindEvents = function() {
$fileHolder.on('highlight:line', this.highlightHash);
};
LineHighlighter.prototype.highlightHash = function() {
var range;
LineHighlighter.prototype.highlightHash = function(newHash) {
let range;
if (newHash && typeof newHash === 'string') this._hash = newHash;
this.clearHighlight();
if (this._hash !== '') {
range = this.hashToRange(this._hash);
if (range[0]) {
this.highlightRange(range);
const lineSelector = `#L${range[0]}`;
......
app/assets/javascripts/locale/index.js
View file @ 02838d5b
import Jed from 'jed';
import sprintf from './sprintf';
/**
This is required to require all the translation folders in the current directory
this saves us having to do this manually & keep up to date with new languages
**/
function requireAll(requireContext) { return requireContext.keys().map(requireContext); }
const allLocales = requireAll(require.context('./', true, /^(?!.*(?:index.js$)).*\.js$/));
const locales = allLocales.reduce((d, obj) => {
const data = d;
const localeKey = Object.keys(obj)[0];
data[localeKey] = obj[localeKey];
return data;
}, {});
const langAttribute = document.querySelector('html').getAttribute('lang');
const lang = (langAttribute || 'en').replace(/-/g, '_');
const locale = new Jed(locales[lang]);
const locale = new Jed(window.translations || {});
delete window.translations;
/**
Translates `text`
@param text The text to be translated
@returns {String} The translated text
**/
......
app/assets/javascripts/merge_request.js
View file @ 02838d5b
......@@ -127,6 +127,21 @@ import IssuablesHelper from './helpers/issuables_helper';
$el.text(gl.text.addDelimiter(count));
};
MergeRequest.prototype.hideCloseButton = function() {
const el = document.querySelector('.merge-request .issuable-actions');
const closeDropdownItem = el.querySelector('li.close-item');
if (closeDropdownItem) {
closeDropdownItem.classList.add('hidden');
// Selects the next dropdown item
el.querySelector('li.report-item').click();
} else {
// No dropdown just hide the Close button
el.querySelector('.btn-close').classList.add('hidden');
}
// Dropdown for mobile screen
el.querySelector('li.js-close-item').classList.add('hidden');
};
return MergeRequest;
})();
}).call(window);
app/assets/javascripts/monitoring/components/dashboard.vue
View file @ 02838d5b
......@@ -29,6 +29,7 @@
showEmptyState: true,
updateAspectRatio: false,
updatedAspectRatios: 0,
hoverData: {},
resizeThrottled: {},
};
},
......@@ -64,6 +65,10 @@
this.updatedAspectRatios = 0;
}
},
hoverChanged(data) {
this.hoverData = data;
},
},
created() {
......@@ -72,10 +77,12 @@
deploymentEndpoint: this.deploymentEndpoint,
});
eventHub.$on('toggleAspectRatio', this.toggleAspectRatio);
eventHub.$on('hoverChanged', this.hoverChanged);
},
beforeDestroy() {
eventHub.$off('toggleAspectRatio', this.toggleAspectRatio);
eventHub.$off('hoverChanged', this.hoverChanged);
window.removeEventListener('resize', this.resizeThrottled, false);
},
......@@ -102,6 +109,7 @@
v-for="(graphData, index) in groupData.metrics"
:key="index"
:graph-data="graphData"
:hover-data="hoverData"
:update-aspect-ratio="updateAspectRatio"
:deployment-data="store.deploymentData"
/>
......
app/assets/javascripts/monitoring/components/empty_state.vue
View file @ 02838d5b
......@@ -73,34 +73,22 @@
<template>
<div class="prometheus-state">
<div class="row">
<div class="col-md-4 col-md-offset-4 state-svg svg-content">
<img :src="currentState.svgUrl"/>
</div>
<div class="state-svg svg-content">
<img :src="currentState.svgUrl"/>
</div>
<div class="row">
<div class="col-md-6 col-md-offset-3">
<h4 class="text-center state-title">
{{currentState.title}}
</h4>
</div>
</div>
<div class="row">
<div class="col-md-6 col-md-offset-3">
<div class="description-text text-center state-description">
{{currentState.description}}
<a v-if="showButtonDescription" :href="settingsPath">
Prometheus server
</a>
</div>
</div>
</div>
<div class="row state-button-section">
<div class="col-md-4 col-md-offset-4 text-center state-button">
<a class="btn btn-success" :href="buttonPath">
{{currentState.buttonText}}
</a>
</div>
<h4 class="state-title">
{{currentState.title}}
</h4>
<p class="state-description">
{{currentState.description}}
<a v-if="showButtonDescription" :href="settingsPath">
Prometheus server
</a>
</p>
<div class="state-button">
<a class="btn btn-success" :href="buttonPath">
{{currentState.buttonText}}
</a>
</div>
</div>
</template>
app/assets/javascripts/monitoring/components/graph.vue
View file @ 02838d5b
......@@ -3,16 +3,14 @@
import GraphLegend from './graph/legend.vue';
import GraphFlag from './graph/flag.vue';
import GraphDeployment from './graph/deployment.vue';
import GraphPath from './graph_path.vue';
import GraphPath from './graph/path.vue';
import MonitoringMixin from '../mixins/monitoring_mixins';
import eventHub from '../event_hub';
import measurements from '../utils/measurements';
import { timeScaleFormat } from '../utils/date_time_formatters';
import { timeScaleFormat, bisectDate } from '../utils/date_time_formatters';
import createTimeSeries from '../utils/multiple_time_series';
import bp from '../../breakpoints';
const bisectDate = d3.bisector(d => d.time).left;
export default {
props: {
graphData: {
......@@ -27,6 +25,11 @@
type: Array,
required: true,
},
hoverData: {
type: Object,
required: false,
default: () => ({}),
},
},
mixins: [MonitoringMixin],
......@@ -52,6 +55,7 @@
currentXCoordinate: 0,
currentFlagPosition: 0,
showFlag: false,
showFlagContent: false,
showDeployInfo: true,
timeSeries: [],
};
......@@ -65,7 +69,7 @@
},
computed: {
outterViewBox() {
outerViewBox() {
return `0 0 ${this.baseGraphWidth} ${this.baseGraphHeight}`;
},
......@@ -122,36 +126,30 @@
const d1 = firstTimeSeries.values[overlayIndex];
if (d0 === undefined || d1 === undefined) return;
const evalTime = timeValueOverlay - d0[0] > d1[0] - timeValueOverlay;
this.currentData = evalTime ? d1 : d0;
this.currentDataIndex = evalTime ? overlayIndex : (overlayIndex - 1);
this.currentXCoordinate = Math.floor(firstTimeSeries.timeSeriesScaleX(this.currentData.time));
const hoveredDataIndex = evalTime ? overlayIndex : (overlayIndex - 1);
const hoveredDate = firstTimeSeries.values[hoveredDataIndex].time;
const currentDeployXPos = this.mouseOverDeployInfo(point.x);
if (this.currentXCoordinate > (this.graphWidth - 200)) {
this.currentFlagPosition = this.currentXCoordinate - 103;
} else {
this.currentFlagPosition = this.currentXCoordinate;
}
if (currentDeployXPos) {
this.showFlag = false;
} else {
this.showFlag = true;
}
eventHub.$emit('hoverChanged', {
hoveredDate,
currentDeployXPos,
});
},
renderAxesPaths() {
this.timeSeries = createTimeSeries(this.graphData.queries[0],
this.graphWidth,
this.graphHeight,
this.graphHeightOffset);
this.timeSeries = createTimeSeries(
this.graphData.queries[0],
this.graphWidth,
this.graphHeight,
this.graphHeightOffset,
);
if (this.timeSeries.length > 3) {
this.baseGraphHeight = this.baseGraphHeight += (this.timeSeries.length - 3) * 20;
}
const axisXScale = d3.time.scale()
.range([0, this.graphWidth]);
.range([0, this.graphWidth - 70]);
const axisYScale = d3.scale.linear()
.range([this.graphHeight - this.graphHeightOffset, 0]);
......@@ -194,6 +192,10 @@
eventHub.$emit('toggleAspectRatio');
}
},
hoverData() {
this.positionFlag();
},
},
mounted() {
......@@ -203,7 +205,10 @@
</script>
<template>
<div class="prometheus-graph">
<div
class="prometheus-graph"
@mouseover="showFlagContent = true"
@mouseleave="showFlagContent = false">
<h5 class="text-center graph-title">
{{graphData.title}}
</h5>
......@@ -211,7 +216,7 @@
class="prometheus-svg-container"
:style="paddingBottomRootSvg">
<svg
:viewBox="outterViewBox"
:viewBox="outerViewBox"
ref="baseSvg">
<g
class="x-axis"
......@@ -247,6 +252,7 @@
<graph-deployment
:show-deploy-info="showDeployInfo"
:deployment-data="reducedDeploymentData"
:graph-width="graphWidth"
:graph-height="graphHeight"
:graph-height-offset="graphHeightOffset"
/>
......@@ -257,6 +263,7 @@
:current-flag-position="currentFlagPosition"
:graph-height="graphHeight"
:graph-height-offset="graphHeightOffset"
:show-flag-content="showFlagContent"
/>
<rect
class="prometheus-graph-overlay"
......
app/assets/javascripts/monitoring/components/graph/deployment.vue
View file @ 02838d5b
......@@ -19,6 +19,10 @@
type: Number,
required: true,
},
graphWidth: {
type: Number,
required: true,
},
},
computed: {
......@@ -47,6 +51,14 @@
transformDeploymentGroup(deployment) {
return `translate(${Math.floor(deployment.xPos) + 1}, 20)`;
},
positionFlag(deployment) {
let xPosition = 3;
if (deployment.xPos > (this.graphWidth - 200)) {
xPosition = -97;
}
return xPosition;
},
},
};
</script>
......@@ -77,7 +89,7 @@
<svg
v-if="deployment.showDeploymentFlag"
class="js-deploy-info-box"
x="3"
:x="positionFlag(deployment)"
y="0"
width="92"
height="60">
......
app/assets/javascripts/monitoring/components/graph/flag.vue
View file @ 02838d5b
......@@ -23,6 +23,10 @@
type: Number,
required: true,
},
showFlagContent: {
type: Boolean,
required: true,
},
},
data() {
......@@ -57,6 +61,7 @@
transform="translate(-5, 20)">
</line>
<svg
v-if="showFlagContent"
class="rect-text-metric"
:x="currentFlagPosition"
y="0">
......
app/assets/javascripts/monitoring/mixins/monitoring_mixins.js
View file @ 02838d5b
import { bisectDate } from '../utils/date_time_formatters';
const mixins = {
methods: {
mouseOverDeployInfo(mouseXPos) {
......@@ -18,6 +20,7 @@ const mixins = {
return dataFound;
},
formatDeployments() {
this.reducedDeploymentData = this.deploymentData.reduce((deploymentDataArray, deployment) => {
const time = new Date(deployment.created_at);
......@@ -40,6 +43,25 @@ const mixins = {
return deploymentDataArray;
}, []);
},
positionFlag() {
const timeSeries = this.timeSeries[0];
const hoveredDataIndex = bisectDate(timeSeries.values, this.hoverData.hoveredDate, 1);
this.currentData = timeSeries.values[hoveredDataIndex];
this.currentDataIndex = hoveredDataIndex;
this.currentXCoordinate = Math.floor(timeSeries.timeSeriesScaleX(this.currentData.time));
if (this.currentXCoordinate > (this.graphWidth - 200)) {
this.currentFlagPosition = this.currentXCoordinate - 103;
} else {
this.currentFlagPosition = this.currentXCoordinate;
}
if (this.hoverData.currentDeployXPos) {
this.showFlag = false;
} else {
this.showFlag = true;
}
},
},
};
......
app/assets/javascripts/monitoring/monitoring_bundle.js
View file @ 02838d5b
......@@ -3,8 +3,5 @@ import Dashboard from './components/dashboard.vue';
document.addEventListener('DOMContentLoaded', () => new Vue({
el: '#prometheus-graphs',
components: {
Dashboard,
},
render: createElement => createElement('dashboard'),
render: createElement => createElement(Dashboard),
}));
app/assets/javascripts/monitoring/stores/monitoring_store.js
View file @ 02838d5b
......@@ -13,7 +13,7 @@ function normalizeMetrics(metrics) {
...result,
values: result.values.map(([timestamp, value]) => ({
time: new Date(timestamp * 1000),
value,
value: Number(value),
})),
})),
})),
......
app/assets/javascripts/monitoring/utils/date_time_formatters.js
View file @ 02838d5b
......@@ -2,6 +2,7 @@ import d3 from 'd3';
export const dateFormat = d3.time.format('%b %-d, %Y');
export const timeFormat = d3.time.format('%-I:%M%p');
export const bisectDate = d3.bisector(d => d.time).left;
export const timeScaleFormat = d3.time.format.multi([
['.%L', d => d.getMilliseconds()],
......
app/assets/javascripts/notebook/cells/code.vue
View file @ 02838d5b
<template>
<div class="cell">
<code-cell
type="input"
:raw-code="rawInputCode"
:count="cell.execution_count"
:code-css-class="codeCssClass" />
<output-cell
v-if="hasOutput"
:count="cell.execution_count"
:output="output"
:code-css-class="codeCssClass" />
</div>
</template>
<script>
import CodeCell from './code/index.vue';
import OutputCell from './output/index.vue';
......@@ -51,6 +36,21 @@ export default {
};
</script>
<template>
<div class="cell">
<code-cell
type="input"
:raw-code="rawInputCode"
:count="cell.execution_count"
:code-css-class="codeCssClass" />
<output-cell
v-if="hasOutput"
:count="cell.execution_count"
:output="output"
:code-css-class="codeCssClass" />
</div>
</template>
<style scoped>
.cell {
flex-direction: column;
......
app/assets/javascripts/notebook/cells/code/index.vue
View file @ 02838d5b
<template>
<div :class="type">
<prompt
:type="promptType"
:count="count" />
<pre
class="language-python"
:class="codeCssClass"
ref="code"
v-text="code">
</pre>
</div>
</template>
<script>
import Prism from '../../lib/highlight';
import Prompt from '../prompt.vue';
......@@ -55,3 +41,17 @@
},
};
</script>
<template>
<div :class="type">
<prompt
:type="promptType"
:count="count" />
<pre
class="language-python"
:class="codeCssClass"
ref="code"
v-text="code">
</pre>
</div>
</template>
app/assets/javascripts/notebook/cells/markdown.vue
View file @ 02838d5b
<template>
<div class="cell text-cell">
<prompt />
<div class="markdown" v-html="markdown"></div>
</div>
</template>
<script>
/* global katex */
import marked from 'marked';
......@@ -95,6 +88,13 @@
};
</script>
<template>
<div class="cell text-cell">
<prompt />
<div class="markdown" v-html="markdown"></div>
</div>
</template>
<style>
.markdown .katex {
display: block;
......
app/assets/javascripts/notebook/cells/output/html.vue
View file @ 02838d5b
<template>
<div class="output">
<prompt />
<div v-html="rawCode"></div>
</div>
</template>
<script>
import Prompt from '../prompt.vue';
......@@ -20,3 +13,10 @@ export default {
},
};
</script>
<template>
<div class="output">
<prompt />
<div v-html="rawCode"></div>
</div>
</template>
app/assets/javascripts/notebook/cells/output/image.vue
View file @ 02838d5b
<template>
<div class="output">
<prompt />
<img
:src="'data:' + outputType + ';base64,' + rawCode" />
</div>
</template>
<script>
import Prompt from '../prompt.vue';
......@@ -25,3 +17,11 @@ export default {
},
};
</script>
<template>
<div class="output">
<prompt />
<img
:src="'data:' + outputType + ';base64,' + rawCode" />
</div>
</template>
app/assets/javascripts/notebook/cells/output/index.vue
View file @ 02838d5b
<template>
<component :is="componentName"
type="output"
:outputType="outputType"
:count="count"
:raw-code="rawCode"
:code-css-class="codeCssClass" />
</template>
<script>
import CodeCell from '../code/index.vue';
import Html from './html.vue';
......@@ -81,3 +72,12 @@ export default {
},
};
</script>
<template>
<component :is="componentName"
type="output"
:outputType="outputType"
:count="count"
:raw-code="rawCode"
:code-css-class="codeCssClass" />
</template>
app/assets/javascripts/notebook/cells/prompt.vue
View file @ 02838d5b
<template>
<div class="prompt">
<span v-if="type && count">
{{ type }} [{{ count }}]:
</span>
</div>
</template>
<script>
export default {
props: {
......@@ -21,6 +13,14 @@
};
</script>
<template>
<div class="prompt">
<span v-if="type && count">
{{ type }} [{{ count }}]:
</span>
</div>
</template>
<style scoped>
.prompt {
padding: 0 10px;
......
app/assets/javascripts/notebook/index.vue
View file @ 02838d5b
<template>
<div v-if="hasNotebook">
<component
v-for="(cell, index) in cells"
:is="cellType(cell.cell_type)"
:cell="cell"
:key="index"
:code-css-class="codeCssClass" />
</div>
</template>
<script>
import {
MarkdownCell,
......@@ -59,6 +48,17 @@
};
</script>
<template>
<div v-if="hasNotebook">
<component
v-for="(cell, index) in cells"
:is="cellType(cell.cell_type)"
:cell="cell"
:key="index"
:code-css-class="codeCssClass" />
</div>
</template>
<style>
.cell,
.input,
......
app/assets/javascripts/notes/components/issue_comment_form.vue
View file @ 02838d5b
......@@ -7,10 +7,12 @@
import TaskList from '../../task_list';
import * as constants from '../constants';
import eventHub from '../event_hub';
import confidentialIssue from '../../vue_shared/components/issue/confidential_issue_warning.vue';
import issueWarning from '../../vue_shared/components/issue/issue_warning.vue';
import issueNoteSignedOutWidget from './issue_note_signed_out_widget.vue';
import issueDiscussionLockedWidget from './issue_discussion_locked_widget.vue';
import markdownField from '../../vue_shared/components/markdown/field.vue';
import userAvatarLink from '../../vue_shared/components/user_avatar/user_avatar_link.vue';
import issuableStateMixin from '../mixins/issuable_state';
export default {
name: 'issueCommentForm',
......@@ -26,8 +28,9 @@
};
},
components: {
confidentialIssue,
issueWarning,
issueNoteSignedOutWidget,
issueDiscussionLockedWidget,
markdownField,
userAvatarLink,
},
......@@ -55,6 +58,9 @@
isIssueOpen() {
return this.issueState === constants.OPENED || this.issueState === constants.REOPENED;
},
canCreateNote() {
return this.getIssueData.current_user.can_create_note;
},
issueActionButtonTitle() {
if (this.note.length) {
const actionText = this.isIssueOpen ? 'close' : 'reopen';
......@@ -90,9 +96,6 @@
endpoint() {
return this.getIssueData.create_note_path;
},
isConfidentialIssue() {
return this.getIssueData.confidential;
},
},
methods: {
...mapActions([
......@@ -220,6 +223,9 @@
});
},
},
mixins: [
issuableStateMixin,
],
mounted() {
// jQuery is needed here because it is a custom event being dispatched with jQuery.
$(document).on('issuable:change', (e, isClosed) => {
......@@ -235,6 +241,7 @@
<template>
<div>
<issue-note-signed-out-widget v-if="!isLoggedIn" />
<issue-discussion-locked-widget v-else-if="!canCreateNote" />
<ul
v-else
class="notes notes-form timeline">
......@@ -253,15 +260,22 @@
<div class="timeline-content timeline-content-form">
<form
ref="commentForm"
class="new-note js-quick-submit common-note-form gfm-form js-main-target-form">
<confidentialIssue v-if="isConfidentialIssue" />
class="new-note js-quick-submit common-note-form gfm-form js-main-target-form"
>
<div class="error-alert"></div>
<issue-warning
v-if="hasWarning(getIssueData)"
:is-locked="isLocked(getIssueData)"
:is-confidential="isConfidential(getIssueData)"
/>
<markdown-field
:markdown-preview-path="markdownPreviewPath"
:markdown-docs-path="markdownDocsPath"
:quick-actions-docs-path="quickActionsDocsPath"
:add-spacing-classes="false"
:is-confidential-issue="isConfidentialIssue"
ref="markdownField">
<textarea
id="note-body"
......@@ -272,6 +286,7 @@
v-model="note"
ref="textarea"
slot="textarea"
:disabled="isSubmitting"
placeholder="Write a comment or drag your files here..."
@keydown.up="editCurrentUserLastNote()"
@keydown.meta.enter="handleSave()">
......
app/assets/javascripts/notes/components/issue_discussion_locked_widget.vue 0 → 100644
View file @ 02838d5b
<script>
export default {
computed: {
lockIcon() {
return gl.utils.spriteIcon('lock');
},
},
};
</script>
<template>
<div class="disabled-comment text-center">
<span class="issuable-note-warning">
<span class="icon" v-html="lockIcon"></span>
<span>This issue is locked. Only <b>project members</b> can comment.</span>
</span>
</div>
</template>
app/assets/javascripts/notes/components/issue_note_form.vue
View file @ 02838d5b
<script>
import { mapGetters } from 'vuex';
import eventHub from '../event_hub';
import confidentialIssue from '../../vue_shared/components/issue/confidential_issue_warning.vue';
import issueWarning from '../../vue_shared/components/issue/issue_warning.vue';
import markdownField from '../../vue_shared/components/markdown/field.vue';
import issuableStateMixin from '../mixins/issuable_state';
export default {
name: 'issueNoteForm',
......@@ -39,12 +40,13 @@
};
},
components: {
confidentialIssue,
issueWarning,
markdownField,
},
computed: {
...mapGetters([
'getDiscussionLastNote',
'getIssueData',
'getIssueDataByProp',
'getNotesDataByProp',
'getUserDataByProp',
......@@ -67,9 +69,6 @@
isDisabled() {
return !this.note.length || this.isSubmitting;
},
isConfidentialIssue() {
return this.getIssueDataByProp('confidential');
},
},
methods: {
handleUpdate() {
......@@ -95,6 +94,9 @@
this.$emit('cancelFormEdition', shouldConfirm, this.noteBody !== this.note);
},
},
mixins: [
issuableStateMixin,
],
mounted() {
this.$refs.textarea.focus();
},
......@@ -125,7 +127,13 @@
<div class="flash-container timeline-content"></div>
<form
class="edit-note common-note-form js-quick-submit gfm-form">
<confidentialIssue v-if="isConfidentialIssue" />
<issue-warning
v-if="hasWarning(getIssueData)"
:is-locked="isLocked(getIssueData)"
:is-confidential="isConfidential(getIssueData)"
/>
<markdown-field
:markdown-preview-path="markdownPreviewPath"
:markdown-docs-path="markdownDocsPath"
......
app/assets/javascripts/notes/mixins/issuable_state.js 0 → 100644
View file @ 02838d5b
export default {
methods: {
isConfidential(issue) {
return !!issue.confidential;
},
isLocked(issue) {
return !!issue.discussion_locked;
},
hasWarning(issue) {
return this.isConfidential(issue) || this.isLocked(issue);
},
},
};
app/assets/javascripts/pdf/index.vue
View file @ 02838d5b
<template>
<div class="pdf-viewer" v-if="hasPDF">
<page v-for="(page, index) in pages"
:key="index"
:v-if="!loading"
:page="page"
:number="index + 1" />
</div>
</template>
<script>
import pdfjsLib from 'vendor/pdf';
import workerSrc from 'vendor/pdf.worker.min';
......@@ -64,6 +54,16 @@
};
</script>
<template>
<div class="pdf-viewer" v-if="hasPDF">
<page v-for="(page, index) in pages"
:key="index"
:v-if="!loading"
:page="page"
:number="index + 1" />
</div>
</template>
<style>
.pdf-viewer {
background: url('./assets/img/bg.gif');
......
app/assets/javascripts/pdf/page/index.vue
View file @ 02838d5b
<template>
<canvas
class="pdf-page"
ref="canvas"
:data-page="number" />
</template>
<script>
export default {
props: {
......@@ -48,6 +41,13 @@
};
</script>
<template>
<canvas
class="pdf-page"
ref="canvas"
:data-page="number" />
</template>
<style>
.pdf-page {
margin: 8px auto 0 auto;
......
app/assets/javascripts/pipelines/components/pipeline_url.vue
View file @ 02838d5b
......@@ -72,6 +72,13 @@
:title="pipeline.yaml_errors">
yaml invalid
</span>
<span
v-if="pipeline.flags.failure_reason"
v-tooltip
class="js-pipeline-url-failure label label-danger"
:title="pipeline.failure_reason">
error
</span>
<a
v-if="pipeline.flags.auto_devops"
tabindex="0"
......
app/assets/javascripts/profile/account/components/delete_account_modal.vue 0 → 100644
View file @ 02838d5b
<script>
import popupDialog from '../../../vue_shared/components/popup_dialog.vue';
import { __, s__, sprintf } from '../../../locale';
import csrf from '../../../lib/utils/csrf';
export default {
props: {
actionUrl: {
type: String,
required: true,
},
confirmWithPassword: {
type: Boolean,
required: true,
},
username: {
type: String,
required: true,
},
},
data() {
return {
enteredPassword: '',
enteredUsername: '',
isOpen: false,
};
},
components: {
popupDialog,
},
computed: {
csrfToken() {
return csrf.token;
},
inputLabel() {
let confirmationValue;
if (this.confirmWithPassword) {
confirmationValue = __('password');
} else {
confirmationValue = __('username');
}
confirmationValue = `<code>${confirmationValue}</code>`;
return sprintf(
s__('Profiles|Type your %{confirmationValue} to confirm:'),
{ confirmationValue },
false,
);
},
text() {
return sprintf(
s__(`Profiles|
You are about to permanently delete %{yourAccount}, and all of the issues, merge requests, and groups linked to your account.
Once you confirm %{deleteAccount}, it cannot be undone or recovered.`),
{
yourAccount: `<strong>${s__('Profiles|your account')}</strong>`,
deleteAccount: `<strong>${s__('Profiles|Delete Account')}</strong>`,
},
false,
);
},
},
methods: {
canSubmit() {
if (this.confirmWithPassword) {
return this.enteredPassword !== '';
}
return this.enteredUsername === this.username;
},
onSubmit(status) {
if (status) {
if (!this.canSubmit()) {
return;
}
this.$refs.form.submit();
}
this.toggleOpen(false);
},
toggleOpen(isOpen) {
this.isOpen = isOpen;
},
},
};
</script>
<template>
<div>
<popup-dialog
v-if="isOpen"
:title="s__('Profiles|Delete your account?')"
:text="text"
:kind="`danger ${!canSubmit() && 'disabled'}`"
:primary-button-label="s__('Profiles|Delete account')"
@toggle="toggleOpen"
@submit="onSubmit">
<template slot="body" scope="props">
<p v-html="props.text"></p>
<form
ref="form"
:action="actionUrl"
method="post">
<input
type="hidden"
name="_method"
value="delete" />
<input
type="hidden"
name="authenticity_token"
:value="csrfToken" />
<p id="input-label" v-html="inputLabel"></p>
<input
v-if="confirmWithPassword"
name="password"
class="form-control"
type="password"
v-model="enteredPassword"
aria-labelledby="input-label" />
<input
v-else
name="username"
class="form-control"
type="text"
v-model="enteredUsername"
aria-labelledby="input-label" />
</form>
</template>
</popup-dialog>
<button
type="button"
class="btn btn-danger"
@click="toggleOpen(true)">
{{ s__('Profiles|Delete account') }}
</button>
</div>
</template>
app/assets/javascripts/profile/account/index.js 0 → 100644
View file @ 02838d5b
import Vue from 'vue';
import deleteAccountModal from './components/delete_account_modal.vue';
const deleteAccountModalEl = document.getElementById('delete-account-modal');
// eslint-disable-next-line no-new
new Vue({
el: deleteAccountModalEl,
components: {
deleteAccountModal,
},
render(createElement) {
return createElement('delete-account-modal', {
props: {
actionUrl: deleteAccountModalEl.dataset.actionUrl,
confirmWithPassword: !!deleteAccountModalEl.dataset.confirmWithPassword,
username: deleteAccountModalEl.dataset.username,
},
});
},
});
app/assets/javascripts/project_fork.js
View file @ 02838d5b
export default () => {
$('.fork-thumbnail a').on('click', function forkThumbnailClicked() {
$('.js-fork-thumbnail').on('click', function forkThumbnailClicked() {
if ($(this).hasClass('disabled')) return false;
$('.fork-namespaces').hide();
return $('.save-project-loader').show();
return $('.js-fork-content').toggle();
});
};
app/assets/javascripts/protected_branches/protected_branch_create.js
View file @ 02838d5b
import _ from 'underscore';
import ProtectedBranchAccessDropdown from './protected_branch_access_dropdown';
import ProtectedBranchDropdown from './protected_branch_dropdown';
import AccessorUtilities from '../lib/utils/accessor';
const PB_LOCAL_STORAGE_KEY = 'protected-branches-defaults';
export default class ProtectedBranchCreate {
constructor() {
this.$form = $('.js-new-protected-branch');
this.isLocalStorageAvailable = AccessorUtilities.isLocalStorageAccessSafe();
this.currentProjectUserDefaults = {};
this.buildDropdowns();
}
buildDropdowns() {
const $allowedToMergeDropdown = this.$form.find('.js-allowed-to-merge');
const $allowedToPushDropdown = this.$form.find('.js-allowed-to-push');
const $protectedBranchDropdown = this.$form.find('.js-protected-branch-select');
// Cache callback
this.onSelectCallback = this.onSelect.bind(this);
......@@ -28,15 +35,13 @@ export default class ProtectedBranchCreate {
onSelect: this.onSelectCallback,
});
// Select default
$allowedToPushDropdown.data('glDropdown').selectRowAtIndex(0);
$allowedToMergeDropdown.data('glDropdown').selectRowAtIndex(0);
// Protected branch dropdown
this.protectedBranchDropdown = new ProtectedBranchDropdown({
$dropdown: this.$form.find('.js-protected-branch-select'),
$dropdown: $protectedBranchDropdown,
onSelect: this.onSelectCallback,
});
this.loadPreviousSelection($allowedToMergeDropdown.data('glDropdown'), $allowedToPushDropdown.data('glDropdown'));
}
// This will run after clicked callback
......@@ -45,7 +50,41 @@ export default class ProtectedBranchCreate {
const $branchInput = this.$form.find('input[name="protected_branch[name]"]');
const $allowedToMergeInput = this.$form.find('input[name="protected_branch[merge_access_levels_attributes][0][access_level]"]');
const $allowedToPushInput = this.$form.find('input[name="protected_branch[push_access_levels_attributes][0][access_level]"]');
const completedForm = !(
$branchInput.val() &&
$allowedToMergeInput.length &&
$allowedToPushInput.length
);
this.savePreviousSelection($allowedToMergeInput.val(), $allowedToPushInput.val());
this.$form.find('input[type="submit"]').attr('disabled', completedForm);
}
loadPreviousSelection(mergeDropdown, pushDropdown) {
let mergeIndex = 0;
let pushIndex = 0;
if (this.isLocalStorageAvailable) {
const savedDefaults = JSON.parse(window.localStorage.getItem(PB_LOCAL_STORAGE_KEY));
if (savedDefaults != null) {
mergeIndex = _.findLastIndex(mergeDropdown.fullData.roles, {
id: parseInt(savedDefaults.mergeSelection, 0),
});
pushIndex = _.findLastIndex(pushDropdown.fullData.roles, {
id: parseInt(savedDefaults.pushSelection, 0),
});
}
}
mergeDropdown.selectRowAtIndex(mergeIndex);
pushDropdown.selectRowAtIndex(pushIndex);
}
this.$form.find('input[type="submit"]').attr('disabled', !($branchInput.val() && $allowedToMergeInput.length && $allowedToPushInput.length));
savePreviousSelection(mergeSelection, pushSelection) {
if (this.isLocalStorageAvailable) {
const branchDefaults = {
mergeSelection,
pushSelection,
};
window.localStorage.setItem(PB_LOCAL_STORAGE_KEY, JSON.stringify(branchDefaults));
}
}
}
app/assets/javascripts/registry/components/app.vue 0 → 100644
View file @ 02838d5b
<script>
/* globals Flash */
import { mapGetters, mapActions } from 'vuex';
import '../../flash';
import loadingIcon from '../../vue_shared/components/loading_icon.vue';
import store from '../stores';
import collapsibleContainer from './collapsible_container.vue';
import { errorMessages, errorMessagesTypes } from '../constants';
export default {
name: 'registryListApp',
props: {
endpoint: {
type: String,
required: true,
},
},
store,
components: {
collapsibleContainer,
loadingIcon,
},
computed: {
...mapGetters([
'isLoading',
'repos',
]),
},
methods: {
...mapActions([
'setMainEndpoint',
'fetchRepos',
]),
},
created() {
this.setMainEndpoint(this.endpoint);
},
mounted() {
this.fetchRepos()
.catch(() => Flash(errorMessages[errorMessagesTypes.FETCH_REPOS]));
},
};
</script>
<template>
<div>
<loading-icon
v-if="isLoading"
size="3"
/>
<collapsible-container
v-else-if="!isLoading && repos.length"
v-for="(item, index) in repos"
:key="index"
:repo="item"
/>
<p v-else-if="!isLoading && !repos.length">
{{__("No container images stored for this project. Add one by following the instructions above.")}}
</p>
</div>
</template>
app/assets/javascripts/registry/components/collapsible_container.vue 0 → 100644
View file @ 02838d5b
<script>
/* globals Flash */
import { mapActions } from 'vuex';
import '../../flash';
import clipboardButton from '../../vue_shared/components/clipboard_button.vue';
import loadingIcon from '../../vue_shared/components/loading_icon.vue';
import tooltip from '../../vue_shared/directives/tooltip';
import tableRegistry from './table_registry.vue';
import { errorMessages, errorMessagesTypes } from '../constants';
export default {
name: 'collapsibeContainerRegisty',
props: {
repo: {
type: Object,
required: true,
},
},
components: {
clipboardButton,
loadingIcon,
tableRegistry,
},
directives: {
tooltip,
},
data() {
return {
isOpen: false,
};
},
computed: {
clipboardText() {
return `docker pull ${this.repo.location}`;
},
},
methods: {
...mapActions([
'fetchRepos',
'fetchList',
'deleteRepo',
]),
toggleRepo() {
this.isOpen = !this.isOpen;
if (this.isOpen) {
this.fetchList({ repo: this.repo })
.catch(() => this.showError(errorMessagesTypes.FETCH_REGISTRY));
}
},
handleDeleteRepository() {
this.deleteRepo(this.repo)
.then(() => this.fetchRepos())
.catch(() => this.showError(errorMessagesTypes.DELETE_REPO));
},
showError(message) {
Flash((errorMessages[message]));
},
},
};
</script>
<template>
<div class="container-image">
<div
class="container-image-head">
<button
type="button"
@click="toggleRepo"
class="js-toggle-repo btn-link">
<i
class="fa"
:class="{
'fa-chevron-right': !isOpen,
'fa-chevron-up': isOpen,
}"
aria-hidden="true">
</i>
{{repo.name}}
</button>
<clipboard-button
v-if="repo.location"
:text="clipboardText"
:title="repo.location"
/>
<div class="controls hidden-xs pull-right">
<button
v-if="repo.canDelete"
type="button"
class="js-remove-repo btn btn-danger"
:title="s__('ContainerRegistry|Remove repository')"
:aria-label="s__('ContainerRegistry|Remove repository')"
v-tooltip
@click="handleDeleteRepository">
<i
class="fa fa-trash"
aria-hidden="true">
</i>
</button>
</div>
</div>
<loading-icon
v-if="repo.isLoading"
class="append-bottom-20"
size="2"
/>
<div
v-else-if="!repo.isLoading && isOpen"
class="container-image-tags">
<table-registry
v-if="repo.list.length"
:repo="repo"
/>
<div
v-else
class="nothing-here-block">
{{s__("ContainerRegistry|No tags in Container Registry for this container image.")}}
</div>
</div>
</div>
</template>
app/assets/javascripts/registry/components/table_registry.vue 0 → 100644
View file @ 02838d5b
<script>
/* globals Flash */
import { mapActions } from 'vuex';
import { n__ } from '../../locale';
import '../../flash';
import clipboardButton from '../../vue_shared/components/clipboard_button.vue';
import tablePagination from '../../vue_shared/components/table_pagination.vue';
import tooltip from '../../vue_shared/directives/tooltip';
import timeagoMixin from '../../vue_shared/mixins/timeago';
import { errorMessages, errorMessagesTypes } from '../constants';
export default {
props: {
repo: {
type: Object,
required: true,
},
},
components: {
clipboardButton,
tablePagination,
},
mixins: [
timeagoMixin,
],
directives: {
tooltip,
},
computed: {
shouldRenderPagination() {
return this.repo.pagination.total > this.repo.pagination.perPage;
},
},
methods: {
...mapActions([
'fetchList',
'deleteRegistry',
]),
layers(item) {
return item.layers ? n__('%d layer', '%d layers', item.layers) : '';
},
handleDeleteRegistry(registry) {
this.deleteRegistry(registry)
.then(() => this.fetchList({ repo: this.repo }))
.catch(() => this.showError(errorMessagesTypes.DELETE_REGISTRY));
},
onPageChange(pageNumber) {
this.fetchList({ repo: this.repo, page: pageNumber })
.catch(() => this.showError(errorMessagesTypes.FETCH_REGISTRY));
},
clipboardText(text) {
return `docker pull ${text}`;
},
showError(message) {
Flash((errorMessages[message]));
},
},
};
</script>
<template>
<div>
<table class="table tags">
<thead>
<tr>
<th>{{s__('ContainerRegistry|Tag')}}</th>
<th>{{s__('ContainerRegistry|Tag ID')}}</th>
<th>{{s__("ContainerRegistry|Size")}}</th>
<th>{{s__("ContainerRegistry|Created")}}</th>
<th></th>
</tr>
</thead>
<tbody>
<tr
v-for="(item, i) in repo.list"
:key="i">
<td>
{{item.tag}}
<clipboard-button
v-if="item.location"
:title="item.location"
:text="clipboardText(item.location)"
/>
</td>
<td>
<span
v-tooltip
:title="item.revision"
data-placement="bottom">
{{item.shortRevision}}
</span>
</td>
<td>
{{item.size}}
<template v-if="item.size && item.layers">
&middot;
</template>
{{layers(item)}}
</td>
<td>
{{timeFormated(item.createdAt)}}
</td>
<td class="content">
<button
v-if="item.canDelete"
type="button"
class="js-delete-registry btn btn-danger hidden-xs pull-right"
:title="s__('ContainerRegistry|Remove tag')"
:aria-label="s__('ContainerRegistry|Remove tag')"
data-container="body"
v-tooltip
@click="handleDeleteRegistry(item)">
<i
class="fa fa-trash"
aria-hidden="true">
</i>
</button>
</td>
</tr>
</tbody>
</table>
<table-pagination
v-if="shouldRenderPagination"
:change="onPageChange"
:page-info="repo.pagination"
/>
</div>
</template>
app/assets/javascripts/registry/constants.js 0 → 100644
View file @ 02838d5b
import { __ } from '../locale';
export const errorMessagesTypes = {
FETCH_REGISTRY: 'FETCH_REGISTRY',
FETCH_REPOS: 'FETCH_REPOS',
DELETE_REPO: 'DELETE_REPO',
DELETE_REGISTRY: 'DELETE_REGISTRY',
};
export const errorMessages = {
[errorMessagesTypes.FETCH_REGISTRY]: __('Something went wrong while fetching the registry list.'),
[errorMessagesTypes.FETCH_REPOS]: __('Something went wrong while fetching the projects.'),
[errorMessagesTypes.DELETE_REPO]: __('Something went wrong on our end.'),
[errorMessagesTypes.DELETE_REGISTRY]: __('Something went wrong on our end.'),
};
app/assets/javascripts/registry/index.js 0 → 100644
View file @ 02838d5b
import Vue from 'vue';
import registryApp from './components/app.vue';
import Translate from '../vue_shared/translate';
Vue.use(Translate);
document.addEventListener('DOMContentLoaded', () => new Vue({
el: '#js-vue-registry-images',
components: {
registryApp,
},
data() {
const dataset = document.querySelector(this.$options.el).dataset;
return {
endpoint: dataset.endpoint,
};
},
render(createElement) {
return createElement('registry-app', {
props: {
endpoint: this.endpoint,
},
});
},
}));
app/assets/javascripts/registry/stores/actions.js 0 → 100644
View file @ 02838d5b
import Vue from 'vue';
import VueResource from 'vue-resource';
import * as types from './mutation_types';
Vue.use(VueResource);
export const fetchRepos = ({ commit, state }) => {
commit(types.TOGGLE_MAIN_LOADING);
return Vue.http.get(state.endpoint)
.then(res => res.json())
.then((response) => {
commit(types.TOGGLE_MAIN_LOADING);
commit(types.SET_REPOS_LIST, response);
});
};
export const fetchList = ({ commit }, { repo, page }) => {
commit(types.TOGGLE_REGISTRY_LIST_LOADING, repo);
return Vue.http.get(repo.tagsPath, { params: { page } })
.then((response) => {
const headers = response.headers;
return response.json().then((resp) => {
commit(types.TOGGLE_REGISTRY_LIST_LOADING, repo);
commit(types.SET_REGISTRY_LIST, { repo, resp, headers });
});
});
};
export const deleteRepo = ({ commit }, repo) => Vue.http.delete(repo.destroyPath)
.then(res => res.json());
export const deleteRegistry = ({ commit }, image) => Vue.http.delete(image.destroyPath)
.then(res => res.json());
export const setMainEndpoint = ({ commit }, data) => commit(types.SET_MAIN_ENDPOINT, data);
export const toggleLoading = ({ commit }) => commit(types.TOGGLE_MAIN_LOADING);
app/assets/javascripts/registry/stores/getters.js 0 → 100644
View file @ 02838d5b
export const isLoading = state => state.isLoading;
export const repos = state => state.repos;
app/assets/javascripts/registry/stores/index.js 0 → 100644
View file @ 02838d5b
import Vue from 'vue';
import Vuex from 'vuex';
import * as actions from './actions';
import * as getters from './getters';
import mutations from './mutations';
Vue.use(Vuex);
export default new Vuex.Store({
state: {
isLoading: false,
endpoint: '', // initial endpoint to fetch the repos list
/**
* Each object in `repos` has the following strucure:
* {
* name: String,
* isLoading: Boolean,
* tagsPath: String // endpoint to request the list
* destroyPath: String // endpoit to delete the repo
* list: Array // List of the registry images
* }
*
* Each registry image inside `list` has the following structure:
* {
* tag: String,
* revision: String
* shortRevision: String
* size: Number
* layers: Number
* createdAt: String
* destroyPath: String // endpoit to delete each image
* }
*/
repos: [],
},
actions,
getters,
mutations,
});
app/assets/javascripts/registry/stores/mutation_types.js 0 → 100644
View file @ 02838d5b
export const SET_MAIN_ENDPOINT = 'SET_MAIN_ENDPOINT';
export const SET_REPOS_LIST = 'SET_REPOS_LIST';
export const TOGGLE_MAIN_LOADING = 'TOGGLE_MAIN_LOADING';
export const SET_REGISTRY_LIST = 'SET_REGISTRY_LIST';
export const TOGGLE_REGISTRY_LIST_LOADING = 'TOGGLE_REGISTRY_LIST_LOADING';
app/assets/javascripts/registry/stores/mutations.js 0 → 100644
View file @ 02838d5b
import * as types from './mutation_types';
import { parseIntPagination, normalizeHeaders } from '../../lib/utils/common_utils';
export default {
[types.SET_MAIN_ENDPOINT](state, endpoint) {
Object.assign(state, { endpoint });
},
[types.SET_REPOS_LIST](state, list) {
Object.assign(state, {
repos: list.map(el => ({
canDelete: !!el.destroy_path,
destroyPath: el.destroy_path,
id: el.id,
isLoading: false,
list: [],
location: el.location,
name: el.path,
tagsPath: el.tags_path,
})),
});
},
[types.TOGGLE_MAIN_LOADING](state) {
Object.assign(state, { isLoading: !state.isLoading });
},
[types.SET_REGISTRY_LIST](state, { repo, resp, headers }) {
const listToUpdate = state.repos.find(el => el.id === repo.id);
const normalizedHeaders = normalizeHeaders(headers);
const pagination = parseIntPagination(normalizedHeaders);
listToUpdate.pagination = pagination;
listToUpdate.list = resp.map(element => ({
tag: element.name,
revision: element.revision,
shortRevision: element.short_revision,
size: element.size,
layers: element.layers,
location: element.location,
createdAt: element.created_at,
destroyPath: element.destroy_path,
canDelete: !!element.destroy_path,
}));
},
[types.TOGGLE_REGISTRY_LIST_LOADING](state, list) {
const listToUpdate = state.repos.find(el => el.id === list.id);
listToUpdate.isLoading = !listToUpdate.isLoading;
},
};
app/assets/javascripts/repo/components/repo.vue
View file @ 02838d5b
......@@ -62,7 +62,7 @@ export default {
:primary-button-label="__('Discard changes')"
kind="warning"
:title="__('Are you sure?')"
:body="__('Are you sure you want to discard your changes?')"
:text="__('Are you sure you want to discard your changes?')"
@toggle="toggleDialogOpen"
@submit="dialogSubmitted"
/>
......
app/assets/javascripts/repo/components/repo_editor.vue
View file @ 02838d5b
......@@ -63,12 +63,7 @@ const RepoEditor = {
const lineNumber = e.target.position.lineNumber;
if (e.target.element.classList.contains('line-numbers')) {
location.hash = `L${lineNumber}`;
Store.activeLine = lineNumber;
Helper.monacoInstance.setPosition({
lineNumber: this.activeLine,
column: 1,
});
Store.setActiveLine(lineNumber);
}
},
},
......@@ -101,6 +96,15 @@ const RepoEditor = {
this.setupEditor();
}
},
activeLine() {
if (Helper.monacoInstance) {
Helper.monacoInstance.setPosition({
lineNumber: this.activeLine,
column: 1,
});
}
},
},
computed: {
shouldHideEditor() {
......
app/assets/javascripts/repo/components/repo_preview.vue
View file @ 02838d5b
......@@ -14,6 +14,11 @@ export default {
highlightFile() {
$(this.$el).find('.file-content').syntaxHighlight();
},
highlightLine() {
if (Store.activeLine > -1) {
this.lineHighlighter.highlightHash(`#L${Store.activeLine}`);
}
},
},
mounted() {
this.highlightFile();
......@@ -26,8 +31,12 @@ export default {
html() {
this.$nextTick(() => {
this.highlightFile();
this.highlightLine();
});
},
activeLine() {
this.highlightLine();
},
},
};
</script>
......
app/assets/javascripts/repo/components/repo_sidebar.vue
View file @ 02838d5b
......@@ -18,22 +18,40 @@ export default {
},
created() {
this.addPopEventListener();
window.addEventListener('popstate', this.checkHistory);
},
destroyed() {
window.removeEventListener('popstate', this.checkHistory);
},
data: () => Store,
methods: {
addPopEventListener() {
window.addEventListener('popstate', () => {
if (location.href.indexOf('#') > -1) return;
this.linkClicked({
checkHistory() {
let selectedFile = this.files.find(file => location.pathname.indexOf(file.url) > -1);
if (!selectedFile) {
// Maybe it is not in the current tree but in the opened tabs
selectedFile = Helper.getFileFromPath(location.pathname);
}
let lineNumber = null;
if (location.hash.indexOf('#L') > -1) lineNumber = Number(location.hash.substr(2));
if (selectedFile) {
if (selectedFile.url !== this.activeFile.url) {
this.fileClicked(selectedFile, lineNumber);
} else {
Store.setActiveLine(lineNumber);
}
} else {
// Not opened at all lets open new tab
this.fileClicked({
url: location.href,
});
});
}, lineNumber);
}
},
fileClicked(clickedFile) {
fileClicked(clickedFile, lineNumber) {
let file = clickedFile;
if (file.loading) return;
file.loading = true;
......@@ -41,17 +59,20 @@ export default {
if (file.type === 'tree' && file.opened) {
file = Store.removeChildFilesOfTree(file);
file.loading = false;
Store.setActiveLine(lineNumber);
} else {
const openFile = Helper.getFileFromPath(file.url);
if (openFile) {
file.loading = false;
Store.setActiveFiles(openFile);
Store.setActiveLine(lineNumber);
} else {
Service.url = file.url;
Helper.getContent(file)
.then(() => {
file.loading = false;
Helper.scrollTabsRight();
Store.setActiveLine(lineNumber);
})
.catch(Helper.loadingError);
}
......@@ -74,8 +95,8 @@ export default {
<thead v-if="!isMini">
<tr>
<th class="name">Name</th>
<th class="hidden-sm hidden-xs last-commit">Last Commit</th>
<th class="hidden-xs last-update text-right">Last Update</th>
<th class="hidden-sm hidden-xs last-commit">Last commit</th>
<th class="hidden-xs last-update text-right">Last update</th>
</tr>
</thead>
<tbody>
......
app/assets/javascripts/repo/helpers/repo_helper.js
View file @ 02838d5b
......@@ -254,7 +254,9 @@ const RepoHelper = {
RepoHelper.key = RepoHelper.genKey();
history.pushState({ key: RepoHelper.key }, '', url);
if (document.location.pathname !== url) {
history.pushState({ key: RepoHelper.key }, '', url);
}
if (title) {
document.title = title;
......
app/assets/javascripts/repo/stores/repo_store.js
View file @ 02838d5b
......@@ -26,7 +26,7 @@ const RepoStore = {
},
activeFile: Helper.getDefaultActiveFile(),
activeFileIndex: 0,
activeLine: 0,
activeLine: -1,
activeFileLabel: 'Raw',
files: [],
isCommitable: false,
......@@ -85,6 +85,7 @@ const RepoStore = {
if (!file.loading) Helper.updateHistoryEntry(file.url, file.pageTitle || file.name);
RepoStore.binary = file.binary;
RepoStore.setActiveLine(-1);
},
setFileActivity(file, openedFile, i) {
......@@ -101,6 +102,10 @@ const RepoStore = {
RepoStore.activeFileIndex = i;
},
setActiveLine(activeLine) {
if (!isNaN(activeLine)) RepoStore.activeLine = activeLine;
},
setActiveToRaw() {
RepoStore.activeFile.raw = false;
// can't get vue to listen to raw for some reason so RepoStore for now.
......
app/assets/javascripts/sidebar/components/confidential/confidential_issue_sidebar.vue
View file @ 02838d5b
......@@ -47,9 +47,9 @@ export default {
</script>
<template>
<div class="block confidentiality">
<div class="block issuable-sidebar-item confidentiality">
<div class="sidebar-collapsed-icon">
<i class="fa" :class="faEye" aria-hidden="true" data-hidden="true"></i>
<i class="fa" :class="faEye" aria-hidden="true"></i>
</div>
<div class="title hide-collapsed">
Confidentiality
......@@ -62,19 +62,19 @@ export default {
Edit
</a>
</div>
<div class="value confidential-value hide-collapsed">
<div class="value sidebar-item-value hide-collapsed">
<editForm
v-if="edit"
:toggle-form="toggleForm"
:is-confidential="isConfidential"
:update-confidential-attribute="updateConfidentialAttribute"
/>
<div v-if="!isConfidential" class="no-value confidential-value">
<i class="fa fa-eye is-not-confidential"></i>
<div v-if="!isConfidential" class="no-value sidebar-item-value">
<i class="fa fa-eye sidebar-item-icon"></i>
Not confidential
</div>
<div v-else class="value confidential-value hide-collapsed">
<i aria-hidden="true" data-hidden="true" class="fa fa-eye-slash is-confidential"></i>
<div v-else class="value sidebar-item-value hide-collapsed">
<i aria-hidden="true" class="fa fa-eye-slash sidebar-item-icon is-active"></i>
This issue is confidential
</div>
</div>
......
app/assets/javascripts/sidebar/components/confidential/edit_form.vue
View file @ 02838d5b
......@@ -2,9 +2,6 @@
import editFormButtons from './edit_form_buttons.vue';
export default {
components: {
editFormButtons,
},
props: {
isConfidential: {
required: true,
......@@ -19,12 +16,16 @@ export default {
type: Function,
},
},
components: {
editFormButtons,
},
};
</script>
<template>
<div class="dropdown open">
<div class="dropdown-menu confidential-warning-message">
<div class="dropdown-menu sidebar-item-warning-message">
<div>
<p v-if="!isConfidential">
You are going to turn on the confidentiality. This means that only team members with
......
app/assets/javascripts/sidebar/components/confidential/edit_form_buttons.vue
View file @ 02838d5b
......@@ -15,7 +15,7 @@ export default {
},
},
computed: {
onOrOff() {
toggleButtonText() {
return this.isConfidential ? 'Turn Off' : 'Turn On';
},
updateConfidentialBool() {
......@@ -26,7 +26,7 @@ export default {
</script>
<template>
<div class="confidential-warning-message-actions">
<div class="sidebar-item-warning-message-actions">
<button
type="button"
class="btn btn-default append-right-10"
......@@ -39,7 +39,7 @@ export default {
class="btn btn-close"
@click.prevent="updateConfidentialAttribute(updateConfidentialBool)"
>
{{ onOrOff }}
{{ toggleButtonText }}
</button>
</div>
</template>
app/assets/javascripts/sidebar/components/lock/edit_form.vue 0 → 100644
View file @ 02838d5b
<script>
import editFormButtons from './edit_form_buttons.vue';
import issuableMixin from '../../../vue_shared/mixins/issuable';
export default {
props: {
isLocked: {
required: true,
type: Boolean,
},
toggleForm: {
required: true,
type: Function,
},
updateLockedAttribute: {
required: true,
type: Function,
},
issuableType: {
required: true,
type: String,
},
},
mixins: [
issuableMixin,
],
components: {
editFormButtons,
},
};
</script>
<template>
<div class="dropdown open">
<div class="dropdown-menu sidebar-item-warning-message">
<p class="text" v-if="isLocked">
Unlock this {{ issuableDisplayName(issuableType) }}?
<strong>Everyone</strong>
will be able to comment.
</p>
<p class="text" v-else>
Lock this {{ issuableDisplayName(issuableType) }}?
Only
<strong>project members</strong>
will be able to comment.
</p>
<edit-form-buttons
:is-locked="isLocked"
:toggle-form="toggleForm"
:update-locked-attribute="updateLockedAttribute"
/>
</div>
</div>
</template>
app/assets/javascripts/sidebar/components/lock/edit_form_buttons.vue 0 → 100644
View file @ 02838d5b
<script>
export default {
props: {
isLocked: {
required: true,
type: Boolean,
},
toggleForm: {
required: true,
type: Function,
},
updateLockedAttribute: {
required: true,
type: Function,
},
},
computed: {
buttonText() {
return this.isLocked ? this.__('Unlock') : this.__('Lock');
},
toggleLock() {
return !this.isLocked;
},
},
};
</script>
<template>
<div class="sidebar-item-warning-message-actions">
<button
type="button"
class="btn btn-default append-right-10"
@click="toggleForm"
>
{{ __('Cancel') }}
</button>
<button
type="button"
class="btn btn-close"
@click.prevent="updateLockedAttribute(toggleLock)"
>
{{ buttonText }}
</button>
</div>
</template>
app/assets/javascripts/sidebar/components/lock/lock_issue_sidebar.vue 0 → 100644
View file @ 02838d5b
<script>
/* global Flash */
import editForm from './edit_form.vue';
import issuableMixin from '../../../vue_shared/mixins/issuable';
export default {
props: {
isLocked: {
required: true,
type: Boolean,
},
isEditable: {
required: true,
type: Boolean,
},
mediator: {
required: true,
type: Object,
validator(mediatorObject) {
return mediatorObject.service && mediatorObject.service.update && mediatorObject.store;
},
},
issuableType: {
required: true,
type: String,
},
},
mixins: [
issuableMixin,
],
components: {
editForm,
},
computed: {
lockIconClass() {
return this.isLocked ? 'fa-lock' : 'fa-unlock';
},
isLockDialogOpen() {
return this.mediator.store.isLockDialogOpen;
},
},
methods: {
toggleForm() {
this.mediator.store.isLockDialogOpen = !this.mediator.store.isLockDialogOpen;
},
updateLockedAttribute(locked) {
this.mediator.service.update(this.issuableType, {
discussion_locked: locked,
})
.then(() => location.reload())
.catch(() => Flash(this.__(`Something went wrong trying to change the locked state of this ${this.issuableDisplayName(this.issuableType)}`)));
},
},
};
</script>
<template>
<div class="block issuable-sidebar-item lock">
<div class="sidebar-collapsed-icon">
<i
class="fa"
:class="lockIconClass"
aria-hidden="true"
></i>
</div>
<div class="title hide-collapsed">
Lock {{issuableDisplayName(issuableType) }}
<button
v-if="isEditable"
class="pull-right lock-edit btn btn-blank"
type="button"
@click.prevent="toggleForm"
>
{{ __('Edit') }}
</button>
</div>
<div class="value sidebar-item-value hide-collapsed">
<edit-form
v-if="isLockDialogOpen"
:toggle-form="toggleForm"
:is-locked="isLocked"
:update-locked-attribute="updateLockedAttribute"
:issuable-type="issuableType"
/>
<div
v-if="isLocked"
class="value sidebar-item-value"
>
<i
aria-hidden="true"
class="fa fa-lock sidebar-item-icon is-active"
></i>
{{ __('Locked') }}
</div>
<div
v-else
class="no-value sidebar-item-value hide-collapsed"
>
<i
aria-hidden="true"
class="fa fa-unlock sidebar-item-icon"
></i>
{{ __('Unlocked') }}
</div>
</div>
</div>
</template>
app/assets/javascripts/sidebar/sidebar_bundle.js
View file @ 02838d5b
import Vue from 'vue';
import sidebarTimeTracking from './components/time_tracking/sidebar_time_tracking';
import sidebarAssignees from './components/assignees/sidebar_assignees';
import confidential from './components/confidential/confidential_issue_sidebar.vue';
import SidebarTimeTracking from './components/time_tracking/sidebar_time_tracking';
import SidebarAssignees from './components/assignees/sidebar_assignees';
import ConfidentialIssueSidebar from './components/confidential/confidential_issue_sidebar.vue';
import SidebarMoveIssue from './lib/sidebar_move_issue';
import LockIssueSidebar from './components/lock/lock_issue_sidebar.vue';
import Translate from '../vue_shared/translate';
import Mediator from './sidebar_mediator';
Vue.use(Translate);
function mountConfidentialComponent(mediator) {
const el = document.getElementById('js-confidential-entry-point');
if (!el) return;
const dataNode = document.getElementById('js-confidential-issue-data');
const initialData = JSON.parse(dataNode.innerHTML);
const ConfidentialComp = Vue.extend(ConfidentialIssueSidebar);
new ConfidentialComp({
propsData: {
isConfidential: initialData.is_confidential,
isEditable: initialData.is_editable,
service: mediator.service,
},
}).$mount(el);
}
function mountLockComponent(mediator) {
const el = document.getElementById('js-lock-entry-point');
if (!el) return;
const dataNode = document.getElementById('js-lock-issue-data');
const initialData = JSON.parse(dataNode.innerHTML);
const LockComp = Vue.extend(LockIssueSidebar);
new LockComp({
propsData: {
isLocked: initialData.is_locked,
isEditable: initialData.is_editable,
mediator,
issuableType: gl.utils.isInIssuePage() ? 'issue' : 'merge_request',
},
}).$mount(el);
}
function domContentLoaded() {
const sidebarOptions = JSON.parse(document.querySelector('.js-sidebar-options').innerHTML);
const mediator = new Mediator(sidebarOptions);
mediator.fetch();
const sidebarAssigneesEl = document.querySelector('#js-vue-sidebar-assignees');
const confidentialEl = document.querySelector('#js-confidential-entry-point');
const sidebarAssigneesEl = document.getElementById('js-vue-sidebar-assignees');
// Only create the sidebarAssignees vue app if it is found in the DOM
// We currently do not use sidebarAssignees for the MR page
if (sidebarAssigneesEl) {
new Vue(sidebarAssignees).$mount(sidebarAssigneesEl);
new Vue(SidebarAssignees).$mount(sidebarAssigneesEl);
}
if (confidentialEl) {
const dataNode = document.getElementById('js-confidential-issue-data');
const initialData = JSON.parse(dataNode.innerHTML);
mountConfidentialComponent(mediator);
mountLockComponent(mediator);
const ConfidentialComp = Vue.extend(confidential);
new ConfidentialComp({
propsData: {
isConfidential: initialData.is_confidential,
isEditable: initialData.is_editable,
service: mediator.service,
},
}).$mount(confidentialEl);
new SidebarMoveIssue(
mediator,
$('.js-move-issue'),
$('.js-move-issue-confirmation-button'),
).init();
}
new SidebarMoveIssue(
mediator,
$('.js-move-issue'),
$('.js-move-issue-confirmation-button'),
).init();
new Vue(sidebarTimeTracking).$mount('#issuable-time-tracker');
new Vue(SidebarTimeTracking).$mount('#issuable-time-tracker');
}
document.addEventListener('DOMContentLoaded', domContentLoaded);
......
app/assets/javascripts/sidebar/stores/sidebar_store.js
View file @ 02838d5b
......@@ -15,6 +15,7 @@ export default class SidebarStore {
};
this.autocompleteProjects = [];
this.moveToProjectId = 0;
this.isLockDialogOpen = false;
SidebarStore.singleton = this;
}
......
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_checking.js
View file @ 02838d5b
......@@ -7,7 +7,7 @@ export default {
},
template: `
<div class="mr-widget-body media">
<status-icon status="loading" showDisabledButton />
<status-icon status="loading" :show-disabled-button="true" />
<div class="media-body space-children">
<span class="bold">
Checking ability to merge automatically
......
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.js
View file @ 02838d5b
......@@ -12,7 +12,7 @@ export default {
<div class="mr-widget-body media">
<status-icon
status="failed"
showDisabledButton />
:show-disabled-button="true" />
<div class="media-body space-children">
<span
v-if="mr.shouldBeRebased"
......
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_failed_to_merge.js
View file @ 02838d5b
......@@ -51,7 +51,7 @@ export default {
</span>
</template>
<template v-else>
<status-icon status="failed" showDisabledButton />
<status-icon status="failed" :show-disabled-button="true" />
<div class="media-body space-children">
<span class="bold">
<span
......
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_missing_branch.js
View file @ 02838d5b
......@@ -24,7 +24,7 @@ export default {
},
template: `
<div class="mr-widget-body media">
<status-icon status="failed" showDisabledButton />
<status-icon status="failed" :show-disabled-button="true" />
<div class="media-body space-children">
<span class="bold js-branch-text">
<span class="capitalize">
......
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_not_allowed.js
View file @ 02838d5b
......@@ -7,7 +7,7 @@ export default {
},
template: `
<div class="mr-widget-body media">
<status-icon status="success" showDisabledButton />
<status-icon status="success" :show-disabled-button="true" />
<div class="media-body space-children">
<span class="bold">
Ready to be merged automatically.
......
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_blocked.js
View file @ 02838d5b
......@@ -7,7 +7,7 @@ export default {
},
template: `
<div class="mr-widget-body media">
<status-icon status="failed" showDisabledButton />
<status-icon status="failed" :show-disabled-button="true" />
<div class="media-body space-children">
<span class="bold">
Pipeline blocked. The pipeline for this merge request requires a manual action to proceed
......
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_failed.js
View file @ 02838d5b
......@@ -7,7 +7,7 @@ export default {
},
template: `
<div class="mr-widget-body media">
<status-icon status="failed" showDisabledButton />
<status-icon status="failed" :show-disabled-button="true" />
<div class="media-body space-children">
<span class="bold">
The pipeline for this merge request failed. Please retry the job or push a new commit to fix the failure
......
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js
View file @ 02838d5b
......@@ -38,24 +38,40 @@ export default {
return this.useCommitMessageWithDescription ? withoutDesc : withDesc;
},
mergeButtonClass() {
const defaultClass = 'btn btn-sm btn-success accept-merge-request';
const failedClass = `${defaultClass} btn-danger`;
const inActionClass = `${defaultClass} btn-info`;
status() {
const { pipeline, isPipelineActive, isPipelineFailed, hasCI, ciStatus } = this.mr;
if (hasCI && !ciStatus) {
return failedClass;
return 'failed';
} else if (!pipeline) {
return defaultClass;
return 'success';
} else if (isPipelineActive) {
return inActionClass;
return 'pending';
} else if (isPipelineFailed) {
return 'failed';
}
return 'success';
},
mergeButtonClass() {
const defaultClass = 'btn btn-sm btn-success accept-merge-request';
const failedClass = `${defaultClass} btn-danger`;
const inActionClass = `${defaultClass} btn-info`;
if (this.status === 'failed') {
return failedClass;
} else if (this.status === 'pending') {
return inActionClass;
}
return defaultClass;
},
iconClass() {
if (this.status === 'failed' || !this.commitMessage.length || !this.mr.isMergeAllowed || this.mr.preventMerge) {
return 'failed';
}
return 'success';
},
mergeButtonText() {
if (this.isMergingImmediately) {
return 'Merge in progress';
......@@ -84,13 +100,8 @@ export default {
},
},
methods: {
isMergeAllowed() {
return !this.mr.onlyAllowMergeIfPipelineSucceeds ||
this.mr.isPipelinePassing ||
this.mr.isPipelineSkipped;
},
shouldShowMergeControls() {
return this.isMergeAllowed() || this.shouldShowMergeWhenPipelineSucceedsText;
return this.mr.isMergeAllowed || this.shouldShowMergeWhenPipelineSucceedsText;
},
updateCommitMessage() {
const cmwd = this.mr.commitMessageWithDescription;
......@@ -156,6 +167,7 @@ export default {
eventHub.$emit('FetchActionsContent');
if (window.mergeRequest) {
window.mergeRequest.updateStatusText('status-box-open', 'status-box-merged', 'Merged');
window.mergeRequest.hideCloseButton();
window.mergeRequest.decreaseCounter();
}
stopPolling();
......@@ -208,7 +220,7 @@ export default {
},
template: `
<div class="mr-widget-body media">
<status-icon status="success" />
<status-icon :status="iconClass" />
<div class="media-body">
<div class="mr-widget-body-controls media space-children">
<span class="btn-group append-bottom-5">
......
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_sha_mismatch.js
View file @ 02838d5b
......@@ -7,7 +7,7 @@ export default {
},
template: `
<div class="mr-widget-body media">
<status-icon status="failed" showDisabledButton />
<status-icon status="failed" :show-disabled-button="true" />
<div class="media-body space-children">
<span class="bold">
The source branch HEAD has recently changed. Please reload the page and review the changes before merging
......
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_unresolved_discussions.js
View file @ 02838d5b
......@@ -10,7 +10,7 @@ export default {
},
template: `
<div class="mr-widget-body media">
<status-icon status="failed" showDisabledButton />
<status-icon status="failed" :show-disabled-button="true" />
<div class="media-body space-children">
<span class="bold">
There are unresolved discussions. Please resolve these discussions
......
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_wip.js
View file @ 02838d5b
......@@ -38,7 +38,7 @@ export default {
},
template: `
<div class="mr-widget-body media">
<status-icon status="failed" :showDisabledButton="Boolean(mr.removeWIPPath)" />
<status-icon status="failed" :show-disabled-button="Boolean(mr.removeWIPPath)" />
<div class="media-body space-children">
<span class="bold">
This is a Work in Progress
......
app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
View file @ 02838d5b
......@@ -73,6 +73,7 @@ export default class MergeRequestStore {
this.canCancelAutomaticMerge = !!data.cancel_merge_when_pipeline_succeeds_path;
this.hasSHAChanged = this.sha !== data.diff_head_sha;
this.canBeMerged = data.can_be_merged || false;
this.isMergeAllowed = data.mergeable || false;
this.mergeOngoing = data.merge_ongoing;
// Cherry-pick and Revert actions related
......
app/assets/javascripts/vue_shared/components/clipboard_button.vue 0 → 100644
View file @ 02838d5b
<script>
/**
* Falls back to the code used in `copy_to_clipboard.js`
*/
export default {
name: 'clipboardButton',
props: {
text: {
type: String,
required: true,
},
title: {
type: String,
required: true,
},
},
};
</script>
<template>
<button
type="button"
class="btn btn-transparent btn-clipboard"
:data-title="title"
:data-clipboard-text="text">
<i
aria-hidden="true"
class="fa fa-clipboard">
</i>
</button>
</template>
app/assets/javascripts/vue_shared/components/issue/confidential_issue_warning.vue deleted 100644 → 0
View file @ 035bf5d4
<script>
export default {
name: 'confidentialIssueWarning',
};
</script>
<template>
<div class="confidential-issue-warning">
<i
aria-hidden="true"
class="fa fa-eye-slash">
</i>
<span>
This is a confidential issue. Your comment will not be visible to the public.
</span>
</div>
</template>
app/assets/javascripts/vue_shared/components/issue/issue_warning.vue 0 → 100644
View file @ 02838d5b
<script>
export default {
props: {
isLocked: {
type: Boolean,
default: false,
required: false,
},
isConfidential: {
type: Boolean,
default: false,
required: false,
},
},
computed: {
iconClass() {
return {
'fa-eye-slash': this.isConfidential,
'fa-lock': this.isLocked,
};
},
isLockedAndConfidential() {
return this.isConfidential && this.isLocked;
},
},
};
</script>
<template>
<div class="issuable-note-warning">
<i
aria-hidden="true"
class="fa icon"
:class="iconClass"
v-if="!isLockedAndConfidential"
></i>
<span v-if="isLockedAndConfidential">
{{ __('This issue is confidential and locked.') }}
{{ __('People without permission will never get a notification and won\'t be able to comment.') }}
</span>
<span v-else-if="isConfidential">
{{ __('This is a confidential issue.') }}
{{ __('Your comment will not be visible to the public.') }}
</span>
<span v-else-if="isLocked">
{{ __('This issue is locked.') }}
{{ __('Only project members can comment.') }}
</span>
</div>
</template>
app/assets/javascripts/vue_shared/components/popup_dialog.vue
View file @ 02838d5b
......@@ -7,7 +7,7 @@ export default {
type: String,
required: true,
},
body: {
text: {
type: String,
required: true,
},
......@@ -63,7 +63,9 @@ export default {
<h4 class="modal-title">{{this.title}}</h4>
</div>
<div class="modal-body">
<p>{{this.body}}</p>
<slot name="body" :text="text">
<p>{{text}}</p>
</slot>
</div>
<div class="modal-footer">
<button
......
app/assets/javascripts/vue_shared/mixins/issuable.js 0 → 100644
View file @ 02838d5b
export default {
methods: {
issuableDisplayName(issuableType) {
const displayName = issuableType.replace(/_/, ' ');
return this.__ ? this.__(displayName) : displayName;
},
},
};
app/assets/stylesheets/framework.scss
View file @ 02838d5b
......@@ -40,6 +40,7 @@
@import "framework/tables";
@import "framework/notes";
@import "framework/timeline";
@import "framework/tooltips";
@import "framework/typography";
@import "framework/zen";
@import "framework/blank";
......
app/assets/stylesheets/framework/avatar.scss
View file @ 02838d5b
......@@ -23,6 +23,7 @@
&.s60 { @include avatar-size(60px, 12px); }
&.s70 { @include avatar-size(70px, 14px); }
&.s90 { @include avatar-size(90px, 15px); }
&.s100 { @include avatar-size(100px, 15px); }
&.s110 { @include avatar-size(110px, 15px); }
&.s140 { @include avatar-size(140px, 15px); }
&.s160 { @include avatar-size(160px, 20px); }
......@@ -78,6 +79,7 @@
&.s60 { font-size: 32px; line-height: 58px; }
&.s70 { font-size: 34px; line-height: 70px; }
&.s90 { font-size: 36px; line-height: 88px; }
&.s100 { font-size: 36px; line-height: 98px; }
&.s110 { font-size: 40px; line-height: 108px; font-weight: $gl-font-weight-normal; }
&.s140 { font-size: 72px; line-height: 138px; }
&.s160 { font-size: 96px; line-height: 158px; }
......
app/assets/stylesheets/framework/buttons.scss
View file @ 02838d5b
......@@ -381,7 +381,11 @@
background: transparent;
border: 0;
&:hover,
&:active,
&:focus {
outline: 0;
background: transparent;
box-shadow: none;
}
}
app/assets/stylesheets/framework/common.scss
View file @ 02838d5b
......@@ -11,6 +11,7 @@
.prepend-top-10 { margin-top: 10px; }
.prepend-top-default { margin-top: $gl-padding !important; }
.prepend-top-20 { margin-top: 20px; }
.prepend-left-4 { margin-left: 4px; }
.prepend-left-5 { margin-left: 5px; }
.prepend-left-10 { margin-left: 10px; }
.prepend-left-default { margin-left: $gl-padding; }
......@@ -129,11 +130,6 @@ span.update-author {
}
}
.user-mention {
color: $user-mention-color;
font-weight: $gl-font-weight-bold;
}
.field_with_errors {
display: inline;
}
......
app/assets/stylesheets/framework/gfm.scss
View file @ 02838d5b
......@@ -6,3 +6,14 @@
.gfm-commit_range {
@extend .commit-sha;
}
.gfm-project_member {
padding: 0 2px;
border-radius: #{$border-radius-default / 2};
background-color: $user-mention-bg;
&:hover {
background-color: $user-mention-bg-hover;
text-decoration: none;
}
}
app/assets/stylesheets/framework/gitlab-theme.scss
View file @ 02838d5b
......@@ -95,7 +95,7 @@
}
}
.title {
.navbar .title {
> a {
&:hover,
&:focus {
......
app/assets/stylesheets/framework/modal.scss
View file @ 02838d5b
.modal-header {
padding: #{3 * $grid-size} #{2 * $grid-size};
.page-title {
margin-top: 0;
}
}
.modal-body {
position: relative;
padding: 15px;
padding: #{3 * $grid-size} #{2 * $grid-size};
.form-actions {
margin: -$gl-padding + 1;
margin-top: 15px;
margin: #{2 * $grid-size} #{-2 * $grid-size} #{-2 * $grid-size};
}
.text-danger {
......
app/assets/stylesheets/framework/selects.scss
View file @ 02838d5b
......@@ -48,31 +48,24 @@
}
&:hover {
background-color: $white-normal;
border-color: $border-white-normal;
border-color: $gray-darkest;
color: $gl-text-color;
}
}
}
.select2-drop {
box-shadow: $select2-drop-shadow1 0 0 1px 0, $select2-drop-shadow2 0 2px 18px 0;
border-radius: $border-radius-default;
border: none;
.select2-drop,
.select2-drop.select2-drop-above {
box-shadow: 0 2px 4px $dropdown-shadow-color;
border-radius: $border-radius-base;
border: 1px solid $dropdown-border-color;
min-width: 175px;
color: $gl-text-color;
}
.select2-results .select2-result-label,
.select2-more-results {
padding: 10px 15px;
}
.select2-drop {
color: $gl-grayish-blue;
}
.select2-highlighted {
background: $gl-link-color !important;
.select2-drop.select2-drop-above.select2-drop-active {
border-top: 1px solid $dropdown-border-color;
margin-top: -6px;
}
.select2-results li.select2-result-with-children > .select2-result-label {
......@@ -87,13 +80,11 @@
}
}
.select2-dropdown-open {
.select2-dropdown-open,
.select2-dropdown-open.select2-drop-above {
.select2-choice {
border-color: $border-white-normal;
border-color: $gray-darkest;
outline: 0;
background-image: none;
background-color: $white-dark;
box-shadow: $gl-btn-active-gradient;
}
}
......@@ -131,28 +122,14 @@
}
}
}
&.select2-container-active .select2-choices,
&.select2-dropdown-open .select2-choices {
border-color: $border-white-normal;
box-shadow: $gl-btn-active-gradient;
}
}
.select2-drop-active {
margin-top: 6px;
margin-top: $dropdown-vertical-offset;
font-size: 14px;
&.select2-drop-above {
margin-bottom: 8px;
}
.select2-results {
max-height: 350px;
.select2-highlighted {
background: $gl-primary;
}
}
}
......@@ -186,19 +163,35 @@
background-size: 16px 16px !important;
}
.select2-results .select2-no-results,
.select2-results .select2-searching,
.select2-results .select2-ajax-error,
.select2-results .select2-selection-limit {
background: $gray-light;
display: list-item;
padding: 10px 15px;
}
.select2-results {
margin: 0;
padding: 10px 0;
padding: #{$gl-padding / 2} 0;
.select2-no-results,
.select2-searching,
.select2-ajax-error,
.select2-selection-limit {
background: transparent;
padding: #{$gl-padding / 2} $gl-padding;
}
.select2-result-label,
.select2-more-results {
padding: #{$gl-padding / 2} $gl-padding;
}
.select2-highlighted {
background: transparent;
color: $gl-text-color;
.select2-result-label {
background: $dropdown-item-hover-bg;
}
}
.select2-result {
padding: 0 1px;
}
}
.ajax-users-select {
......@@ -265,56 +258,10 @@
min-width: 250px !important;
}
// TODO: change global style
.ajax-project-dropdown,
.ajax-users-dropdown,
body[data-page="projects:edit"] #select2-drop,
body[data-page="projects:new"] #select2-drop,
body[data-page="projects:merge_requests:edit"] #select2-drop,
body[data-page="projects:blob:new"] #select2-drop,
body[data-page="profiles:show"] #select2-drop,
body[data-page="admin:groups:show"] #select2-drop,
body[data-page="projects:issues:show"] #select2-drop,
body[data-page="projects:blob:edit"] #select2-drop {
&.select2-drop {
border: 1px solid $dropdown-border-color;
border-radius: $border-radius-base;
color: $gl-text-color;
}
&.select2-drop-above {
border-top: none;
margin-top: -4px;
}
.select2-results {
.select2-no-results,
.select2-searching,
.select2-ajax-error,
.select2-selection-limit {
background: transparent;
}
.select2-result {
padding: 0 1px;
.select2-match {
font-weight: $gl-font-weight-bold;
text-decoration: none;
}
.select2-result-label {
padding: #{$gl-padding / 2} $gl-padding;
}
&.select2-highlighted {
background-color: transparent !important;
color: $gl-text-color;
.select2-result-label {
background-color: $dropdown-item-hover-bg;
}
}
}
.select2-result-selectable,
.select2-result-unselectable {
.select2-match {
font-weight: $gl-font-weight-bold;
text-decoration: none;
}
}
app/assets/stylesheets/framework/tooltips.scss 0 → 100644
View file @ 02838d5b
.tooltip-inner {
font-size: $tooltip-font-size;
border-radius: $border-radius-default;
line-height: 16px;
font-weight: $gl-font-weight-normal;
padding: $gl-btn-padding;
}
app/assets/stylesheets/framework/variables.scss
View file @ 02838d5b
/*
* Layout
*/
$grid-size: 8px;
$gutter_collapsed_width: 62px;
$gutter_width: 290px;
$gutter_inner_width: 250px;
......@@ -202,6 +203,11 @@ $md-area-border: #ddd;
$code_font_size: 12px;
$code_line_height: 1.6;
/*
* Tooltips
*/
$tooltip-font-size: 12px;
/*
* Padding
*/
......@@ -262,7 +268,8 @@ $well-pre-bg: #eee;
$well-pre-color: #555;
$loading-color: #555;
$update-author-color: #999;
$user-mention-color: #2fa0bb;
$user-mention-bg: rgba($blue-500, 0.044);
$user-mention-bg-hover: rgba($blue-500, 0.15);
$time-color: #999;
$project-member-show-color: #aaa;
$gl-promo-color: #aaa;
......@@ -699,3 +706,9 @@ Project Templates Icons
$rails: #c00;
$node: #353535;
$java: #70ad51;
/*
Issuable warning
*/
$issuable-warning-size: 24px;
$issuable-warning-icon-margin: 4px;
app/assets/stylesheets/pages/clusters.scss 0 → 100644
View file @ 02838d5b
.edit-cluster-form {
.clipboard-addon {
background-color: $white-light;
}
.alert-block {
margin-bottom: 20px;
}
}
app/assets/stylesheets/pages/container_registry.scss
View file @ 02838d5b
......@@ -9,6 +9,14 @@
.container-image-head {
padding: 0 16px;
line-height: 4em;
.btn-link {
padding: 0;
&:focus {
outline: none;
}
}
}
.table.tags {
......
app/assets/stylesheets/pages/issuable.scss
View file @ 02838d5b
This diff is collapsed.
app/assets/stylesheets/pages/note_form.scss
View file @ 02838d5b
This diff is collapsed.
app/assets/stylesheets/pages/notes.scss
View file @ 02838d5b
This diff is collapsed.
app/assets/stylesheets/pages/profile.scss
View file @ 02838d5b
This diff is collapsed.
app/assets/stylesheets/pages/projects.scss
View file @ 02838d5b
This diff is collapsed.
app/assets/stylesheets/pages/tree.scss
View file @ 02838d5b
This diff is collapsed.
app/controllers/admin/users_controller.rb
View file @ 02838d5b
This diff is collapsed.
app/controllers/application_controller.rb
View file @ 02838d5b
This diff is collapsed.
app/controllers/confirmations_controller.rb
View file @ 02838d5b
This diff is collapsed.
app/controllers/google_api/authorizations_controller.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
app/controllers/projects/clusters_controller.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
app/controllers/projects/jobs_controller.rb
View file @ 02838d5b
This diff is collapsed.
app/controllers/registrations_controller.rb
View file @ 02838d5b
This diff is collapsed.
app/controllers/sessions_controller.rb
View file @ 02838d5b
This diff is collapsed.
app/helpers/events_helper.rb
View file @ 02838d5b
This diff is collapsed.
app/helpers/notes_helper.rb
View file @ 02838d5b
This diff is collapsed.
app/helpers/numbers_helper.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
app/helpers/projects_helper.rb
View file @ 02838d5b
This diff is collapsed.
app/helpers/system_note_helper.rb
View file @ 02838d5b
This diff is collapsed.
app/mailers/emails/profile.rb
View file @ 02838d5b
This diff is collapsed.
app/models/ci/artifact_blob.rb
View file @ 02838d5b
This diff is collapsed.
app/models/ci/pipeline.rb
View file @ 02838d5b
This diff is collapsed.
app/models/concerns/has_status.rb
View file @ 02838d5b
This diff is collapsed.
app/models/concerns/noteable.rb
View file @ 02838d5b
This diff is collapsed.
app/models/concerns/repository_mirroring.rb
View file @ 02838d5b
This diff is collapsed.
app/models/concerns/routable.rb
View file @ 02838d5b
This diff is collapsed.
app/models/email.rb
View file @ 02838d5b
This diff is collapsed.
app/models/gcp/cluster.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
app/models/gpg_key.rb
View file @ 02838d5b
This diff is collapsed.
app/models/gpg_key_subkey.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
app/models/gpg_signature.rb
View file @ 02838d5b
This diff is collapsed.
app/models/key.rb
View file @ 02838d5b
This diff is collapsed.
app/models/merge_request.rb
View file @ 02838d5b
This diff is collapsed.
app/models/merge_request_diff.rb
View file @ 02838d5b
This diff is collapsed.
app/models/personal_access_token.rb
View file @ 02838d5b
This diff is collapsed.
app/models/project.rb
View file @ 02838d5b
This diff is collapsed.
app/models/repository.rb
View file @ 02838d5b
This diff is collapsed.
app/models/system_note_metadata.rb
View file @ 02838d5b
This diff is collapsed.
app/models/user.rb
View file @ 02838d5b
This diff is collapsed.
app/policies/gcp/cluster_policy.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
app/policies/issuable_policy.rb
View file @ 02838d5b
This diff is collapsed.
app/policies/note_policy.rb
View file @ 02838d5b
This diff is collapsed.
app/policies/project_policy.rb
View file @ 02838d5b
This diff is collapsed.
app/presenters/ci/pipeline_presenter.rb
View file @ 02838d5b
This diff is collapsed.
app/presenters/gcp/cluster_presenter.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
app/presenters/merge_request_presenter.rb
View file @ 02838d5b
This diff is collapsed.
app/serializers/cluster_entity.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
app/serializers/cluster_serializer.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
app/serializers/commit_entity.rb
View file @ 02838d5b
This diff is collapsed.
app/serializers/container_repositories_serializer.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
app/serializers/container_repository_entity.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
app/serializers/container_tag_entity.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
app/serializers/container_tags_serializer.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
app/serializers/issue_entity.rb
View file @ 02838d5b
This diff is collapsed.
app/serializers/merge_request_entity.rb
View file @ 02838d5b
This diff is collapsed.
app/serializers/pipeline_entity.rb
View file @ 02838d5b
This diff is collapsed.
app/services/ci/create_cluster_service.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
app/services/ci/fetch_gcp_operation_service.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
app/services/ci/fetch_kubernetes_token_service.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
app/services/ci/finalize_cluster_creation_service.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
app/services/ci/integrate_cluster_service.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
app/services/ci/provision_cluster_service.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
app/services/ci/update_cluster_service.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
app/services/emails/base_service.rb
View file @ 02838d5b
This diff is collapsed.
app/services/emails/confirm_service.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
app/services/emails/create_service.rb
View file @ 02838d5b
This diff is collapsed.
app/services/emails/destroy_service.rb
View file @ 02838d5b
This diff is collapsed.
app/services/issuable_base_service.rb
View file @ 02838d5b
This diff is collapsed.
app/services/notification_service.rb
View file @ 02838d5b
This diff is collapsed.
app/services/system_note_service.rb
View file @ 02838d5b
This diff is collapsed.
app/views/admin/jobs/index.html.haml
View file @ 02838d5b
This diff is collapsed.
app/views/admin/projects/index.html.haml
View file @ 02838d5b
This diff is collapsed.
app/views/layouts/_head.html.haml
View file @ 02838d5b
This diff is collapsed.
app/views/notify/new_email_email.html.haml deleted 100644 → 0
View file @ 035bf5d4
This diff is collapsed.
app/views/profiles/accounts/show.html.haml
View file @ 02838d5b
This diff is collapsed.
app/views/profiles/emails/index.html.haml
View file @ 02838d5b
This diff is collapsed.
app/views/profiles/gpg_keys/_key.html.haml
View file @ 02838d5b
This diff is collapsed.
app/views/projects/_md_preview.html.haml
View file @ 02838d5b
This diff is collapsed.
app/views/projects/clusters/_form.html.haml 0 → 100644
View file @ 02838d5b
This diff is collapsed.
app/views/projects/clusters/_header.html.haml 0 → 100644
View file @ 02838d5b
This diff is collapsed.
app/views/projects/clusters/_sidebar.html.haml 0 → 100644
View file @ 02838d5b
This diff is collapsed.
app/views/projects/clusters/login.html.haml 0 → 100644
View file @ 02838d5b
This diff is collapsed.
app/views/projects/clusters/new.html.haml 0 → 100644
View file @ 02838d5b
This diff is collapsed.
app/views/projects/clusters/show.html.haml 0 → 100644
View file @ 02838d5b
This diff is collapsed.
app/views/projects/forks/new.html.haml
View file @ 02838d5b
This diff is collapsed.
app/views/projects/issues/show.html.haml
View file @ 02838d5b
This diff is collapsed.
app/views/projects/jobs/index.html.haml
View file @ 02838d5b
This diff is collapsed.
app/views/projects/services/_form.html.haml
View file @ 02838d5b
This diff is collapsed.
app/views/projects/snippets/show.html.haml
View file @ 02838d5b
This diff is collapsed.
app/views/projects/tags/_tag.html.haml
View file @ 02838d5b
This diff is collapsed.
app/views/shared/builds/_tabs.html.haml
View file @ 02838d5b
This diff is collapsed.
app/workers/cluster_provision_worker.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
app/workers/concerns/cluster_queue.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
app/workers/wait_for_cluster_creation_worker.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
changelogs/unreleased/14553-missing-space-in-log-msg.yml 0 → 100644
View file @ 02838d5b
This diff is collapsed.
changelogs/unreleased/18608-lock-issues.yml 0 → 100644
View file @ 02838d5b
This diff is collapsed.
changelogs/unreleased/26890-fix-default-branches-sorting.yml 0 → 100644
View file @ 02838d5b
This diff is collapsed.
changelogs/unreleased/34102-online-view-of-artifacts-fe.yml 0 → 100644
View file @ 02838d5b
This diff is collapsed.
changelogs/unreleased/36742-hide-close-mr-button-on-merge.yml 0 → 100644
View file @ 02838d5b
This diff is collapsed.
changelogs/unreleased/38389-allow-merge-without-success.yml 0 → 100644
View file @ 02838d5b
This diff is collapsed.
changelogs/unreleased/38775-scrollable-tabs-on-admin.yml 0 → 100644
View file @ 02838d5b
This diff is collapsed.
changelogs/unreleased/adjusting-tooltips.yml 0 → 100644
View file @ 02838d5b
This diff is collapsed.
changelogs/unreleased/bvl-fix-close-issuable-link.yml deleted 100644 → 0
View file @ 035bf5d4
This diff is collapsed.
changelogs/unreleased/content-title-link-hover-bg.yml 0 → 100644
View file @ 02838d5b
This diff is collapsed.
changelogs/unreleased/declarative-policy-optimisations.yml 0 → 100644
View file @ 02838d5b
This diff is collapsed.
changelogs/unreleased/dm-api-unauthorized.yml deleted 100644 → 0
View file @ 035bf5d4
This diff is collapsed.
changelogs/unreleased/dm-pat-revoke.yml 0 → 100644
View file @ 02838d5b
This diff is collapsed.
changelogs/unreleased/docs-openid-connect.yml 0 → 100644
View file @ 02838d5b
This diff is collapsed.
changelogs/unreleased/feature-verify_secondary_emails.yml 0 → 100644
View file @ 02838d5b
This diff is collapsed.
changelogs/unreleased/fix-kubectl-180.yml deleted 100644 → 0
View file @ 035bf5d4
This diff is collapsed.
changelogs/unreleased/fix-update-doorkeeper-openid-connect.yml 0 → 100644
View file @ 02838d5b
This diff is collapsed.
changelogs/unreleased/fl-fix-ca-time-component.yml 0 → 100644
View file @ 02838d5b
This diff is collapsed.
changelogs/unreleased/fork-btn-enabled-user-groups.yml deleted 100644 → 0
View file @ 035bf5d4
This diff is collapsed.
changelogs/unreleased/gitaly_feature_flag_metadata.yml 0 → 100644
View file @ 02838d5b
This diff is collapsed.
changelogs/unreleased/jobs-sort-by-id.yml 0 → 100644
View file @ 02838d5b
This diff is collapsed.
changelogs/unreleased/mentions-in-comments.yml 0 → 100644
View file @ 02838d5b
This diff is collapsed.
changelogs/unreleased/merge-request-notes-performance.yml 0 → 100644
View file @ 02838d5b
This diff is collapsed.
changelogs/unreleased/remove_repo_prefix_from_api.yml 0 → 100644
View file @ 02838d5b
This diff is collapsed.
changelogs/unreleased/sh-fix-issue-38646.yml deleted 100644 → 0
View file @ 035bf5d4
This diff is collapsed.
changelogs/unreleased/sh-restore-all-refs-backup.yml deleted 100644 → 0
View file @ 035bf5d4
This diff is collapsed.
changelogs/unreleased/tag-link-size.yml 0 → 100644
View file @ 02838d5b
This diff is collapsed.
changelogs/unreleased/winh-delete-account-modal.yml 0 → 100644
View file @ 02838d5b
This diff is collapsed.
changelogs/unreleased/zj-repo-gitaly.yml deleted 100644 → 0
View file @ 035bf5d4
This diff is collapsed.
config/application.rb
View file @ 02838d5b
This diff is collapsed.
config/gitlab.yml.example
View file @ 02838d5b
This diff is collapsed.
config/initializers/1_settings.rb
View file @ 02838d5b
This diff is collapsed.
config/initializers/devise.rb
View file @ 02838d5b
This diff is collapsed.
config/initializers/secret_token.rb
View file @ 02838d5b
This diff is collapsed.
config/initializers/sentry.rb
View file @ 02838d5b
This diff is collapsed.
config/routes.rb
View file @ 02838d5b
This diff is collapsed.
config/routes/google_api.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
config/routes/profile.rb
View file @ 02838d5b
This diff is collapsed.
config/routes/project.rb
View file @ 02838d5b
This diff is collapsed.
config/sidekiq_queues.yml
View file @ 02838d5b
This diff is collapsed.
config/webpack.config.js
View file @ 02838d5b
This diff is collapsed.
db/migrate/20170815221154_add_discussion_locked_to_issuable.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
db/migrate/20170904092148_add_email_confirmation.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
db/migrate/20170909090114_add_email_confirmation_index.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
db/migrate/20170924094327_create_gcp_clusters.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
db/migrate/20170927161718_create_gpg_key_subkeys.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
db/migrate/20170929080234_add_failure_reason_to_pipelines.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
db/schema.rb
View file @ 02838d5b
This diff is collapsed.
doc/administration/job_artifacts.md
View file @ 02838d5b
This diff is collapsed.
doc/api/issues.md
View file @ 02838d5b
This diff is collapsed.
doc/api/merge_requests.md
View file @ 02838d5b
This diff is collapsed.
doc/ci/enable_or_disable_ci.md
View file @ 02838d5b
This diff is collapsed.
doc/ci/environments.md
View file @ 02838d5b
This diff is collapsed.
doc/ci/img/builds_tab.png deleted 100644 → 0
View file @ 035bf5d4
This diff is collapsed.
doc/ci/img/deployments_view.png
View file @ 02838d5b
This diff is collapsed.
doc/ci/img/environments_available.png 0 → 100644
View file @ 02838d5b
This diff is collapsed.
doc/ci/img/environments_available_staging.png deleted 100644 → 0
View file @ 035bf5d4
This diff is collapsed.
doc/ci/img/environments_dynamic_groups.png
View file @ 02838d5b
This diff is collapsed.
doc/ci/img/environments_link_url.png deleted 100644 → 0
View file @ 035bf5d4
This diff is collapsed.
doc/ci/img/environments_link_url_deployments.png deleted 100644 → 0
View file @ 035bf5d4
This diff is collapsed.
doc/ci/img/environments_link_url_mr.png
View file @ 02838d5b
This diff is collapsed.
doc/ci/img/environments_manual_action_builds.png deleted 100644 → 0
View file @ 035bf5d4
This diff is collapsed.
doc/ci/img/environments_manual_action_jobs.png 0 → 100644
View file @ 02838d5b
This diff is collapsed.
doc/ci/img/environments_mr_review_app.png
View file @ 02838d5b
This diff is collapsed.
doc/ci/img/environments_view.png deleted 100644 → 0
View file @ 035bf5d4
This diff is collapsed.
doc/ci/img/permissions_settings.png deleted 100644 → 0
View file @ 035bf5d4
This diff is collapsed.
doc/ci/img/prometheus_environment_detail_with_metrics.png deleted 100644 → 0
View file @ 035bf5d4
This diff is collapsed.
doc/ci/variables/README.md
View file @ 02838d5b
This diff is collapsed.
doc/ci/variables/img/secret_variables.png 0 → 100644
View file @ 02838d5b
This diff is collapsed.
doc/development/fe_guide/style_guide_js.md
View file @ 02838d5b
This diff is collapsed.
doc/development/fe_guide/vue.md
View file @ 02838d5b
This diff is collapsed.
doc/development/testing.md
View file @ 02838d5b
This diff is collapsed.
doc/development/ux_guide/components.md
View file @ 02838d5b
This diff is collapsed.
doc/development/ux_guide/img/popover-placement-above.png 0 → 100644
View file @ 02838d5b
This diff is collapsed.
doc/development/ux_guide/img/popover-placement-below.png 0 → 100644
View file @ 02838d5b
This diff is collapsed.
doc/install/installation.md
View file @ 02838d5b
This diff is collapsed.
doc/topics/authentication/index.md
View file @ 02838d5b
This diff is collapsed.
doc/update/10.0-to-10.1.md 0 → 100644
View file @ 02838d5b
This diff is collapsed.
doc/update/mysql_to_postgresql.md
View file @ 02838d5b
This diff is collapsed.
doc/user/discussions/img/discussion_lock_system_notes.png 0 → 100644
View file @ 02838d5b
This diff is collapsed.
doc/user/discussions/img/lock_form_member.png 0 → 100644
View file @ 02838d5b
This diff is collapsed.
doc/user/discussions/img/lock_form_non_member.png 0 → 100644
View file @ 02838d5b
This diff is collapsed.
doc/user/discussions/img/turn_off_lock.png 0 → 100644
View file @ 02838d5b
This diff is collapsed.
doc/user/discussions/img/turn_on_lock.png 0 → 100644
View file @ 02838d5b
This diff is collapsed.
doc/user/discussions/index.md
View file @ 02838d5b
This diff is collapsed.
doc/user/permissions.md
View file @ 02838d5b
This diff is collapsed.
doc/user/project/container_registry.md
View file @ 02838d5b
This diff is collapsed.
doc/user/project/img/container_registry.png 0 → 100644
View file @ 02838d5b
This diff is collapsed.
doc/user/project/img/container_registry_enable.png deleted 100644 → 0
View file @ 035bf5d4
This diff is collapsed.
doc/user/project/img/container_registry_tab.png deleted 100644 → 0
View file @ 035bf5d4
This diff is collapsed.
doc/user/project/img/issue_board.png
View file @ 02838d5b
This diff is collapsed.
doc/user/project/img/labels_assign_label_in_new_issue.png deleted 100644 → 0
View file @ 035bf5d4
This diff is collapsed.
doc/user/project/img/labels_default.png
View file @ 02838d5b
This diff is collapsed.
doc/user/project/img/labels_filter.png
View file @ 02838d5b
This diff is collapsed.
doc/user/project/img/labels_new_label.png
View file @ 02838d5b
This diff is collapsed.
doc/user/project/img/labels_prioritize.png
View file @ 02838d5b
This diff is collapsed.
doc/user/project/import/github.md
View file @ 02838d5b
This diff is collapsed.
doc/user/project/issue_board.md
View file @ 02838d5b
This diff is collapsed.
doc/user/project/issues/deleting_issues.md 0 → 100644
View file @ 02838d5b
This diff is collapsed.
doc/user/project/issues/img/delete_issue.png 0 → 100644
View file @ 02838d5b
This diff is collapsed.
doc/user/project/issues/img/issue_board.png
View file @ 02838d5b
This diff is collapsed.
doc/user/project/issues/img/new_issue.png
View file @ 02838d5b
This diff is collapsed.
doc/user/project/issues/index.md
View file @ 02838d5b
This diff is collapsed.
doc/user/project/labels.md
View file @ 02838d5b
This diff is collapsed.
doc/user/project/merge_requests/img/commit_compare.png deleted 100644 → 0
View file @ 035bf5d4
This diff is collapsed.
doc/user/project/merge_requests/img/merge_request.png 0 → 100644
View file @ 02838d5b
This diff is collapsed.
doc/user/project/merge_requests/index.md
View file @ 02838d5b
This diff is collapsed.
doc/user/project/pipelines/job_artifacts.md
View file @ 02838d5b
This diff is collapsed.
features/project/merge_requests.feature deleted 100644 → 0
View file @ 035bf5d4
This diff is collapsed.
features/steps/project/fork.rb
View file @ 02838d5b
This diff is collapsed.
features/steps/project/merge_requests.rb deleted 100644 → 0
View file @ 035bf5d4
This diff is collapsed.
lib/api/branches.rb
View file @ 02838d5b
This diff is collapsed.
lib/api/commits.rb
View file @ 02838d5b
This diff is collapsed.
lib/api/entities.rb
View file @ 02838d5b
This diff is collapsed.
lib/api/helpers.rb
View file @ 02838d5b
This diff is collapsed.
lib/api/issues.rb
View file @ 02838d5b
This diff is collapsed.
lib/api/merge_requests.rb
View file @ 02838d5b
This diff is collapsed.
lib/api/notes.rb
View file @ 02838d5b
This diff is collapsed.
lib/api/repositories.rb
View file @ 02838d5b
This diff is collapsed.
lib/api/tags.rb
View file @ 02838d5b
This diff is collapsed.
lib/api/templates.rb
View file @ 02838d5b
This diff is collapsed.
lib/api/users.rb
View file @ 02838d5b
This diff is collapsed.
lib/api/v3/branches.rb
View file @ 02838d5b
This diff is collapsed.
lib/api/v3/commits.rb
View file @ 02838d5b
This diff is collapsed.
lib/api/v3/entities.rb
View file @ 02838d5b
This diff is collapsed.
lib/api/v3/merge_requests.rb
View file @ 02838d5b
This diff is collapsed.
lib/api/v3/repositories.rb
View file @ 02838d5b
This diff is collapsed.
lib/api/v3/tags.rb
View file @ 02838d5b
This diff is collapsed.
lib/api/v3/templates.rb
View file @ 02838d5b
This diff is collapsed.
lib/declarative_policy/rule.rb
View file @ 02838d5b
This diff is collapsed.
lib/declarative_policy/runner.rb
View file @ 02838d5b
This diff is collapsed.
lib/github/import.rb
View file @ 02838d5b
This diff is collapsed.
lib/github/representation/branch.rb
View file @ 02838d5b
This diff is collapsed.
lib/github/representation/issuable.rb
View file @ 02838d5b
This diff is collapsed.
lib/github/representation/issue.rb
View file @ 02838d5b
This diff is collapsed.
lib/github/representation/pull_request.rb
View file @ 02838d5b
This diff is collapsed.
lib/gitlab/ci/stage/seed.rb
View file @ 02838d5b
This diff is collapsed.
lib/gitlab/data_builder/push.rb
View file @ 02838d5b
This diff is collapsed.
lib/gitlab/ee_compat_check.rb
View file @ 02838d5b
This diff is collapsed.
lib/gitlab/gcp/model.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
lib/gitlab/git/repository.rb
View file @ 02838d5b
This diff is collapsed.
lib/gitlab/git/rev_list.rb
View file @ 02838d5b
This diff is collapsed.
lib/gitlab/git_ref_validator.rb
View file @ 02838d5b
This diff is collapsed.
lib/gitlab/gitaly_client.rb
View file @ 02838d5b
This diff is collapsed.
lib/gitlab/gitaly_client/namespace_service.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
lib/gitlab/gpg.rb
View file @ 02838d5b
This diff is collapsed.
lib/gitlab/gpg/commit.rb
View file @ 02838d5b
This diff is collapsed.
lib/gitlab/import_export/import_export.yml
View file @ 02838d5b
This diff is collapsed.
lib/gitlab/o_auth/user.rb
View file @ 02838d5b
This diff is collapsed.
lib/gitlab/path_regex.rb
View file @ 02838d5b
This diff is collapsed.
lib/gitlab/shell.rb
View file @ 02838d5b
This diff is collapsed.
lib/gitlab/sql/union.rb
View file @ 02838d5b
This diff is collapsed.
lib/gitlab/usage_data.rb
View file @ 02838d5b
This diff is collapsed.
lib/google_api/auth.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
lib/google_api/cloud_platform/client.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
lib/rspec_flaky/config.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
lib/rspec_flaky/flaky_example.rb
View file @ 02838d5b
This diff is collapsed.
lib/rspec_flaky/flaky_examples_collection.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
lib/rspec_flaky/listener.rb
View file @ 02838d5b
This diff is collapsed.
lib/tasks/gitlab/assets.rake
View file @ 02838d5b
This diff is collapsed.
lib/tasks/gitlab/dev.rake
View file @ 02838d5b
This diff is collapsed.
lib/tasks/gitlab/gitaly.rake
View file @ 02838d5b
This diff is collapsed.
lib/tasks/import.rake
View file @ 02838d5b
This diff is collapsed.
locale/gitlab.pot
View file @ 02838d5b
This diff is collapsed.
qa/Gemfile
View file @ 02838d5b
This diff is collapsed.
qa/Gemfile.lock
View file @ 02838d5b
This diff is collapsed.
qa/README.md
View file @ 02838d5b
This diff is collapsed.
qa/qa/page/admin/menu.rb
View file @ 02838d5b
This diff is collapsed.
qa/qa/runtime/user.rb
View file @ 02838d5b
This diff is collapsed.
qa/qa/specs/config.rb
View file @ 02838d5b
This diff is collapsed.
spec/controllers/google_api/authorizations_controller_spec.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
spec/controllers/profiles/emails_controller_spec.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
spec/controllers/projects/clusters_controller_spec.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
spec/factories/ci/pipelines.rb
View file @ 02838d5b
This diff is collapsed.
spec/factories/deployments.rb
View file @ 02838d5b
This diff is collapsed.
spec/factories/emails.rb
View file @ 02838d5b
This diff is collapsed.
spec/factories/gcp/cluster.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
spec/factories/gpg_key_subkeys.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
spec/factories/gpg_keys.rb
View file @ 02838d5b
This diff is collapsed.
spec/factories/gpg_signature.rb
View file @ 02838d5b
This diff is collapsed.
spec/features/container_registry_spec.rb
View file @ 02838d5b
This diff is collapsed.
spec/features/issuables/discussion_lock_spec.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
spec/features/issues/issue_detail_spec.rb
View file @ 02838d5b
This diff is collapsed.
spec/features/issues_spec.rb
View file @ 02838d5b
This diff is collapsed.
spec/features/merge_requests/discussion_lock_spec.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
spec/features/merge_requests/widget_spec.rb
View file @ 02838d5b
This diff is collapsed.
spec/features/profile_spec.rb
View file @ 02838d5b
This diff is collapsed.
spec/features/profiles/emails_spec.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
spec/features/profiles/gpg_keys_spec.rb
View file @ 02838d5b
This diff is collapsed.
spec/features/projects/branches_spec.rb
View file @ 02838d5b
This diff is collapsed.
spec/features/projects/clusters_spec.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
spec/features/projects/merge_requests/user_views_diffs_spec.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
spec/features/protected_branches_spec.rb
View file @ 02838d5b
This diff is collapsed.
spec/fixtures/api/schemas/cluster_status.json 0 → 100644
View file @ 02838d5b
This diff is collapsed.
spec/fixtures/api/schemas/registry/repositories.json 0 → 100644
View file @ 02838d5b
This diff is collapsed.
spec/fixtures/api/schemas/registry/repository.json 0 → 100644
View file @ 02838d5b
This diff is collapsed.
spec/fixtures/api/schemas/registry/tag.json 0 → 100644
View file @ 02838d5b
This diff is collapsed.
spec/fixtures/api/schemas/registry/tags.json 0 → 100644
View file @ 02838d5b
This diff is collapsed.
spec/initializers/secret_token_spec.rb
View file @ 02838d5b
This diff is collapsed.
spec/javascripts/clusters_spec.js 0 → 100644
View file @ 02838d5b
This diff is collapsed.
spec/javascripts/cycle_analytics/total_time_component_spec.js 0 → 100644
View file @ 02838d5b
This diff is collapsed.
spec/javascripts/fixtures/clusters.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
spec/javascripts/fixtures/merge_requests.rb
View file @ 02838d5b
This diff is collapsed.
spec/javascripts/merge_request_spec.js
View file @ 02838d5b
This diff is collapsed.
spec/javascripts/monitoring/graph_spec.js
View file @ 02838d5b
This diff is collapsed.
spec/javascripts/registry/components/app_spec.js 0 → 100644
View file @ 02838d5b
This diff is collapsed.
spec/javascripts/registry/components/table_registry_spec.js 0 → 100644
View file @ 02838d5b
This diff is collapsed.
spec/javascripts/registry/getters_spec.js 0 → 100644
View file @ 02838d5b
This diff is collapsed.
spec/javascripts/registry/mock_data.js 0 → 100644
View file @ 02838d5b
This diff is collapsed.
spec/javascripts/registry/stores/actions_spec.js 0 → 100644
View file @ 02838d5b
This diff is collapsed.
spec/javascripts/registry/stores/mutations_spec.js 0 → 100644
View file @ 02838d5b
This diff is collapsed.
spec/javascripts/sidebar/lock/edit_form_buttons_spec.js 0 → 100644
View file @ 02838d5b
This diff is collapsed.
spec/javascripts/sidebar/lock/edit_form_spec.js 0 → 100644
View file @ 02838d5b
This diff is collapsed.
spec/javascripts/sidebar/lock/lock_issue_sidebar_spec.js 0 → 100644
View file @ 02838d5b
This diff is collapsed.
spec/lib/gitlab/ci/stage/seed_spec.rb
View file @ 02838d5b
This diff is collapsed.
spec/lib/gitlab/git/repository_spec.rb
View file @ 02838d5b
This diff is collapsed.
spec/lib/gitlab/git_ref_validator_spec.rb
View file @ 02838d5b
This diff is collapsed.
spec/lib/gitlab/gpg/commit_spec.rb
View file @ 02838d5b
This diff is collapsed.
spec/lib/gitlab/gpg_spec.rb
View file @ 02838d5b
This diff is collapsed.
spec/lib/gitlab/shell_spec.rb
View file @ 02838d5b
This diff is collapsed.
spec/lib/gitlab/sql/union_spec.rb
View file @ 02838d5b
This diff is collapsed.
spec/lib/gitlab/usage_data_spec.rb
View file @ 02838d5b
This diff is collapsed.
spec/lib/google_api/auth_spec.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
spec/lib/google_api/cloud_platform/client_spec.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
spec/lib/rspec_flaky/config_spec.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
spec/lib/rspec_flaky/flaky_example_spec.rb
View file @ 02838d5b
This diff is collapsed.
spec/lib/rspec_flaky/flaky_examples_collection_spec.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
spec/lib/rspec_flaky/listener_spec.rb
View file @ 02838d5b
This diff is collapsed.
spec/mailers/emails/profile_spec.rb
View file @ 02838d5b
This diff is collapsed.
spec/models/ci/artifact_blob_spec.rb
View file @ 02838d5b
This diff is collapsed.
spec/models/ci/pipeline_spec.rb
View file @ 02838d5b
This diff is collapsed.
spec/models/concerns/has_status_spec.rb
View file @ 02838d5b
This diff is collapsed.
spec/models/email_spec.rb
View file @ 02838d5b
This diff is collapsed.
spec/models/gcp/cluster_spec.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
spec/models/gpg_key_spec.rb
View file @ 02838d5b
This diff is collapsed.
spec/models/gpg_key_subkey_spec.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
spec/models/gpg_signature_spec.rb
View file @ 02838d5b
This diff is collapsed.
spec/models/key_spec.rb
View file @ 02838d5b
This diff is collapsed.
spec/models/merge_request_spec.rb
View file @ 02838d5b
This diff is collapsed.
spec/models/namespace_spec.rb
View file @ 02838d5b
This diff is collapsed.
spec/models/project_spec.rb
View file @ 02838d5b
This diff is collapsed.
spec/models/repository_spec.rb
View file @ 02838d5b
This diff is collapsed.
spec/models/user_spec.rb
View file @ 02838d5b
This diff is collapsed.
spec/policies/gcp/cluster_policy_spec.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
spec/policies/issuable_policy_spec.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
spec/policies/note_policy_spec.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
spec/presenters/gcp/cluster_presenter_spec.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
spec/requests/api/helpers_spec.rb
View file @ 02838d5b
This diff is collapsed.
spec/requests/api/notes_spec.rb
View file @ 02838d5b
This diff is collapsed.
spec/serializers/cluster_entity_spec.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
spec/serializers/cluster_serializer_spec.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
spec/serializers/container_repository_entity_spec.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
spec/serializers/container_tag_entity_spec.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
spec/serializers/pipeline_entity_spec.rb
View file @ 02838d5b
This diff is collapsed.
spec/services/ci/create_cluster_service_spec.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
spec/services/ci/fetch_gcp_operation_service_spec.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
spec/services/ci/fetch_kubernetes_token_service_spec.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
spec/services/ci/finalize_cluster_creation_service_spec.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
spec/services/ci/integrate_cluster_service_spec.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
spec/services/ci/provision_cluster_service_spec.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
spec/services/ci/update_cluster_service_spec.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
spec/services/emails/confirm_service_spec.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
spec/services/emails/create_service_spec.rb
View file @ 02838d5b
This diff is collapsed.
spec/services/issues/update_service_spec.rb
View file @ 02838d5b
This diff is collapsed.
spec/services/notification_service_spec.rb
View file @ 02838d5b
This diff is collapsed.
spec/spec_helper.rb
View file @ 02838d5b
This diff is collapsed.
spec/support/gpg_helpers.rb
View file @ 02838d5b
This diff is collapsed.
spec/support/helpers/merge_request_diff_helpers.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
spec/support/stub_gitlab_calls.rb
View file @ 02838d5b
This diff is collapsed.
spec/tasks/gitlab/backup_rake_spec.rb
View file @ 02838d5b
This diff is collapsed.
spec/workers/cluster_provision_worker_spec.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
spec/workers/concerns/cluster_queue_spec.rb 0 → 100644
View file @ 02838d5b
This diff is collapsed.
spec/workers/wait_for_cluster_creation_worker_spec.rb 0 → 100644
View file @ 02838d5b
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