Skip to content

G
gitlab-ce
Commit 2bcb19dd authored by Rémy Coutable's avatar Rémy Coutable
Browse files
Options

Merge remote-tracking branch 'upstream/master' into ce-to-ee-2017-05-10 

# Conflicts:
#	app/assets/javascripts/merge_request_widget.js
#	app/assets/javascripts/notes.js
#	app/assets/javascripts/pipelines/components/stage.js
#	app/assets/javascripts/pipelines/components/stage.vue
#	app/assets/javascripts/project_new.js
#	app/assets/javascripts/vue_merge_request_widget/components/mr_widget_deployment.js
#	app/assets/javascripts/vue_merge_request_widget/components/mr_widget_memory_usage.js
#	app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js
#	app/assets/javascripts/vue_merge_request_widget/dependencies.js
#	app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js
#	app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
#	app/assets/javascripts/vue_shared/components/memory_graph.js
#	app/assets/stylesheets/framework/lists.scss
#	app/assets/stylesheets/framework/memory_graph.scss
#	app/assets/stylesheets/pages/merge_requests.scss
#	app/controllers/projects/branches_controller.rb
#	app/controllers/projects/merge_requests_controller.rb
#	app/helpers/merge_requests_helper.rb
#	app/models/project.rb
#	app/models/user.rb
#	app/presenters/merge_request_presenter.rb
#	app/serializers/environment_entity.rb
#	app/serializers/merge_request_basic_entity.rb
#	app/serializers/merge_request_entity.rb
#	app/services/ci/create_pipeline_service.rb
#	app/views/projects/blob/_header.html.haml
#	app/views/projects/merge_requests/_show.html.haml
#	app/views/projects/tree/_tree_content.html.haml
#	app/views/shared/issuable/_sidebar.html.haml
#	app/views/shared/issuable/form/_merge_params.html.haml
#	app/views/shared/issuable/form/_metadata.html.haml
#	config/webpack.config.js
#	db/schema.rb
#	doc/intro/README.md
#	doc/user/project/issues/index.md
#	doc/user/project/issues/issues_functionalities.md
#	features/steps/project/forked_merge_requests.rb
#	features/steps/project/merge_requests.rb
#	features/support/env.rb
#	lib/gitlab/checks/change_access.rb
#	spec/controllers/groups_controller_spec.rb
#	spec/controllers/projects/merge_requests_controller_spec.rb
#	spec/controllers/projects_controller_spec.rb
#	spec/features/merge_requests/closes_issues_spec.rb
#	spec/features/security/project/private_access_spec.rb
#	spec/fixtures/api/schemas/entities/merge_request.json
#	spec/fixtures/api/schemas/entities/merge_request_basic.json
#	spec/helpers/merge_requests_helper_spec.rb
#	spec/javascripts/vue_mr_widget/components/mr_widget_deployment_spec.js
#	spec/presenters/merge_request_presenter_spec.rb
#	spec/serializers/merge_request_entity_spec.rb
#	spec/serializers/pipeline_serializer_spec.rb
[ci skip]
parents 0025fd45 09c2aab4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 8832 additions and 1713 deletions
.gitlab-ci.yml
View file @ 2bcb19dd
......@@ -146,6 +146,7 @@ stages:
# Trigger a package build on omnibus-gitlab repository
build-package:
before_script: []
services: []
variables:
SETUP_DB: "false"
......@@ -153,17 +154,7 @@ build-package:
stage: build
when: manual
script:
# If no branch in omnibus is specified, trigger pipeline against master
- if [ -z "$OMNIBUS_BRANCH" ] ; then export OMNIBUS_BRANCH=master ;fi
- echo "token=${BUILD_TRIGGER_TOKEN}" > version_details
- echo "ref=${OMNIBUS_BRANCH}" >> version_details
- echo "variables[ALTERNATIVE_SOURCES]=true" >> version_details
- echo "variables[GITLAB_VERSION]=${CI_COMMIT_SHA}" >> version_details
# Collect version details of all components
- for f in *_VERSION; do echo "variables[$f]=$(cat $f)" >> version_details; done
# Trigger the API and pass values collected above as parameters to it
- cat version_details | tr '\n' '&' | curl -X POST https://gitlab.com/api/v4/projects/20699/trigger/pipeline --data-binary @-
- rm version_details
- scripts/trigger-build
# Prepare and merge knapsack tests
knapsack:
......
Gemfile
View file @ 2bcb19dd
......@@ -377,6 +377,6 @@ gem 'vmstat', '~> 2.3.0'
gem 'sys-filesystem', '~> 1.1.6'
# Gitaly GRPC client
gem 'gitaly', '~> 0.5.0'
gem 'gitaly', '~> 0.6.0'
gem 'toml-rb', '~> 0.3.15', require: false
Gemfile.lock
View file @ 2bcb19dd
......@@ -287,7 +287,7 @@ GEM
po_to_json (>= 1.0.0)
rails (>= 3.2.0)
gherkin-ruby (0.3.2)
gitaly (0.5.0)
gitaly (0.6.0)
google-protobuf (~> 3.1)
grpc (~> 1.0)
github-linguist (4.7.6)
......@@ -462,7 +462,7 @@ GEM
rugged (~> 0.24)
little-plugger (1.1.4)
locale (2.1.2)
logging (2.1.0)
logging (2.2.2)
little-plugger (~> 1.1)
multi_json (~> 1.10)
loofah (2.0.3)
......@@ -955,7 +955,7 @@ DEPENDENCIES
gettext (~> 3.2.2)
gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.2.0)
gitaly (~> 0.5.0)
gitaly (~> 0.6.0)
github-linguist (~> 4.7.0)
gitlab-flowdock-git-hook (~> 1.0.1)
gitlab-license (~> 1.0)
......
app/assets/javascripts/branches/branches_delete_modal.js 0 → 100644
View file @ 2bcb19dd
const MODAL_SELECTOR = '#modal-delete-branch';
class DeleteModal {
constructor() {
this.$modal = $(MODAL_SELECTOR);
this.$toggleBtns = $(`[data-target="${MODAL_SELECTOR}"]`);
this.$branchName = $('.js-branch-name', this.$modal);
this.$confirmInput = $('.js-delete-branch-input', this.$modal);
this.$deleteBtn = $('.js-delete-branch', this.$modal);
this.bindEvents();
}
bindEvents() {
this.$toggleBtns.on('click', this.setModalData.bind(this));
this.$confirmInput.on('input', this.setDeleteDisabled.bind(this));
}
setModalData(e) {
this.branchName = e.currentTarget.dataset.branchName || '';
this.deletePath = e.currentTarget.dataset.deletePath || '';
this.updateModal();
}
setDeleteDisabled(e) {
this.$deleteBtn.attr('disabled', e.currentTarget.value !== this.branchName);
}
updateModal() {
this.$branchName.text(this.branchName);
this.$confirmInput.val('');
this.$deleteBtn.attr('href', this.deletePath);
this.$deleteBtn.attr('disabled', true);
}
}
export default DeleteModal;
app/assets/javascripts/ci_status_icons.js deleted 100644 → 0
View file @ 0025fd45
import CANCELED_SVG from 'icons/_icon_status_canceled_borderless.svg';
import CREATED_SVG from 'icons/_icon_status_created_borderless.svg';
import FAILED_SVG from 'icons/_icon_status_failed_borderless.svg';
import MANUAL_SVG from 'icons/_icon_status_manual_borderless.svg';
import PENDING_SVG from 'icons/_icon_status_pending_borderless.svg';
import RUNNING_SVG from 'icons/_icon_status_running_borderless.svg';
import SKIPPED_SVG from 'icons/_icon_status_skipped_borderless.svg';
import SUCCESS_SVG from 'icons/_icon_status_success_borderless.svg';
import WARNING_SVG from 'icons/_icon_status_warning_borderless.svg';
const StatusIconEntityMap = {
icon_status_canceled: CANCELED_SVG,
icon_status_created: CREATED_SVG,
icon_status_failed: FAILED_SVG,
icon_status_manual: MANUAL_SVG,
icon_status_pending: PENDING_SVG,
icon_status_running: RUNNING_SVG,
icon_status_skipped: SKIPPED_SVG,
icon_status_success: SUCCESS_SVG,
icon_status_warning: WARNING_SVG,
};
export {
CANCELED_SVG,
CREATED_SVG,
FAILED_SVG,
MANUAL_SVG,
PENDING_SVG,
RUNNING_SVG,
SKIPPED_SVG,
SUCCESS_SVG,
WARNING_SVG,
StatusIconEntityMap as default,
};
app/assets/javascripts/dispatcher.js
View file @ 2bcb19dd
......@@ -39,6 +39,7 @@
import Issue from './issue';
import BindInOut from './behaviors/bind_in_out';
import DeleteModal from './branches/branches_delete_modal';
import Group from './group';
import GroupName from './group_name';
import GroupsList from './groups_list';
......@@ -51,6 +52,7 @@ import BlobForkSuggestion from './blob/blob_fork_suggestion';
import UserCallout from './user_callout';
import { ProtectedTagCreate, ProtectedTagEditList } from './protected_tags';
import ShortcutsWiki from './shortcuts_wiki';
import Pipelines from './pipelines';
import BlobViewer from './blob/viewer/index';
import GeoNodes from './geo_nodes';
import ServiceDeskRoot from './projects/settings_service_desk/service_desk_root';
......@@ -183,6 +185,7 @@ const ShortcutsBlob = require('./shortcuts_blob');
break;
case 'projects:branches:index':
gl.AjaxLoadingSpinner.init();
new DeleteModal();
break;
case 'projects:issues:new':
case 'projects:issues:edit':
......@@ -264,7 +267,7 @@ const ShortcutsBlob = require('./shortcuts_blob');
const { controllerAction } = document.querySelector('.js-pipeline-container').dataset;
const pipelineStatusUrl = `${document.querySelector('.js-pipeline-tab-link a').getAttribute('href')}/status.json`;
new gl.Pipelines({
new Pipelines({
initTabs: true,
pipelineStatusUrl,
tabsOptions: {
......
app/assets/javascripts/environments/components/environment.vue
View file @ 2bcb19dd
<script>
/* global Flash */
import EnvironmentsService from '../services/environments_service';
import EnvironmentTable from './environments_table.vue';
import environmentTable from './environments_table.vue';
import EnvironmentsStore from '../stores/environments_store';
import TablePaginationComponent from '../../vue_shared/components/table_pagination';
import tablePagination from '../../vue_shared/components/table_pagination.vue';
import '../../lib/utils/common_utils';
import eventHub from '../event_hub';
export default {
components: {
'environment-table': EnvironmentTable,
'table-pagination': TablePaginationComponent,
environmentTable,
tablePagination,
},
data() {
......
app/assets/javascripts/environments/folder/environments_folder_view.vue
View file @ 2bcb19dd
<script>
/* global Flash */
import EnvironmentsService from '../services/environments_service';
import EnvironmentTable from '../components/environments_table.vue';
import environmentTable from '../components/environments_table.vue';
import EnvironmentsStore from '../stores/environments_store';
import TablePaginationComponent from '../../vue_shared/components/table_pagination';
import tablePagination from '../../vue_shared/components/table_pagination.vue';
import '../../lib/utils/common_utils';
import '../../vue_shared/vue_resource_interceptor';
export default {
components: {
'environment-table': EnvironmentTable,
'table-pagination': TablePaginationComponent,
environmentTable,
tablePagination,
},
data() {
......
app/assets/javascripts/files_comment_button.js
View file @ 2bcb19dd
......@@ -3,7 +3,6 @@
/* global notes */
let $commentButtonTemplate;
var bind = function(fn, me) { return function() { return fn.apply(me, arguments); }; };
window.FilesCommentButton = (function() {
var COMMENT_BUTTON_CLASS, EMPTY_CELL_CLASS, LINE_COLUMN_CLASSES, LINE_CONTENT_CLASS, LINE_HOLDER_CLASS, LINE_NUMBER_CLASS, OLD_LINE_CLASS, TEXT_FILE_SELECTOR, UNFOLDABLE_LINE_CLASS;
......@@ -27,8 +26,8 @@ window.FilesCommentButton = (function() {
TEXT_FILE_SELECTOR = '.text-file';
function FilesCommentButton(filesContainerElement) {
this.render = bind(this.render, this);
this.hideButton = bind(this.hideButton, this);
this.render = this.render.bind(this);
this.hideButton = this.hideButton.bind(this);
this.isParallelView = notes.isParallelView();
filesContainerElement.on('mouseover', LINE_COLUMN_CLASSES, this.render)
.on('mouseleave', LINE_COLUMN_CLASSES, this.hideButton);
......
app/assets/javascripts/gl_dropdown.js
View file @ 2bcb19dd
/* eslint-disable func-names, space-before-function-paren, no-var, one-var, one-var-declaration-per-line, prefer-rest-params, max-len, vars-on-top, wrap-iife, no-unused-vars, quotes, no-shadow, no-cond-assign, prefer-arrow-callback, no-return-assign, no-else-return, camelcase, comma-dangle, no-lonely-if, guard-for-in, no-restricted-syntax, consistent-return, prefer-template, no-param-reassign, no-loop-func, no-mixed-operators */
/* global fuzzaldrinPlus */
var GitLabDropdown, GitLabDropdownFilter, GitLabDropdownRemote,
bind = function(fn, me) { return function() { return fn.apply(me, arguments); }; },
indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i += 1) { if (i in this && this[i] === item) return i; } return -1; };
var GitLabDropdown, GitLabDropdownFilter, GitLabDropdownRemote;
GitLabDropdownFilter = (function() {
var ARROW_KEY_CODES, BLUR_KEYCODES, HAS_VALUE_CLASS;
......@@ -213,10 +211,10 @@ GitLabDropdown = (function() {
var searchFields, selector, self;
this.el = el1;
this.options = options;
this.updateLabel = bind(this.updateLabel, this);
this.hidden = bind(this.hidden, this);
this.opened = bind(this.opened, this);
this.shouldPropagate = bind(this.shouldPropagate, this);
this.updateLabel = this.updateLabel.bind(this);
this.hidden = this.hidden.bind(this);
this.opened = this.opened.bind(this);
this.shouldPropagate = this.shouldPropagate.bind(this);
self = this;
selector = $(this.el).data("target");
this.dropdown = selector != null ? $(selector) : $(this.el).parent();
......@@ -642,8 +640,8 @@ GitLabDropdown = (function() {
};
GitLabDropdown.prototype.highlightTextMatches = function(text, term) {
var occurrences;
occurrences = fuzzaldrinPlus.match(text, term);
const occurrences = fuzzaldrinPlus.match(text, term);
const indexOf = [].indexOf;
return text.split('').map(function(character, i) {
if (indexOf.call(occurrences, i) !== -1) {
return "<b>" + character + "</b>";
......
app/assets/javascripts/gl_field_error.js
View file @ 2bcb19dd
......@@ -65,6 +65,7 @@ class GlFieldError {
this.state = {
valid: false,
empty: true,
submitted: false,
};
this.initFieldValidation();
......@@ -108,9 +109,10 @@ class GlFieldError {
const currentValue = this.accessCurrentValue();
this.state.valid = false;
this.state.empty = currentValue === '';
this.state.submitted = true;
this.renderValidity();
this.form.focusOnFirstInvalid.apply(this.form);
// For UX, wait til after first invalid submission to check each keyup
this.inputElement.off('keyup.fieldValidator')
.on('keyup.fieldValidator', this.updateValidity.bind(this));
......
app/assets/javascripts/gl_field_errors.js
View file @ 2bcb19dd
......@@ -37,6 +37,15 @@ class GlFieldErrors {
}
}
/* Public method for triggering validity updates manually */
updateFormValidityState() {
this.state.inputs.forEach((field) => {
if (field.state.submitted) {
field.updateValidity();
}
});
}
focusOnFirstInvalid () {
const firstInvalid = this.state.inputs.filter((input) => !input.inputDomElement.validity.valid)[0];
firstInvalid.inputElement.focus();
......
app/assets/javascripts/graphs/stat_graph_contributors_graph.js
View file @ 2bcb19dd
......@@ -2,7 +2,6 @@
import d3 from 'd3';
const bind = function(fn, me) { return function() { return fn.apply(me, arguments); }; };
const extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; };
const hasProp = {}.hasOwnProperty;
......@@ -95,7 +94,7 @@ export const ContributorsMasterGraph = (function(superClass) {
function ContributorsMasterGraph(data1) {
this.data = data1;
this.update_content = bind(this.update_content, this);
this.update_content = this.update_content.bind(this);
this.width = $('.content').width() - 70;
this.height = 200;
this.x = null;
......
app/assets/javascripts/issuable_form.js
View file @ 2bcb19dd
......@@ -8,8 +8,6 @@
/* global Pikaday */
(function() {
var bind = function(fn, me) { return function() { return fn.apply(me, arguments); }; };
this.IssuableForm = (function() {
IssuableForm.prototype.issueMoveConfirmMsg = 'Are you sure you want to move this issue to another project?';
......@@ -18,10 +16,10 @@
function IssuableForm(form) {
var $issuableDueDate, calendar;
this.form = form;
this.toggleWip = bind(this.toggleWip, this);
this.renderWipExplanation = bind(this.renderWipExplanation, this);
this.resetAutosave = bind(this.resetAutosave, this);
this.handleSubmit = bind(this.handleSubmit, this);
this.toggleWip = this.toggleWip.bind(this);
this.renderWipExplanation = this.renderWipExplanation.bind(this);
this.resetAutosave = this.resetAutosave.bind(this);
this.handleSubmit = this.handleSubmit.bind(this);
gl.GfmAutoComplete.setup();
new UsersSelect();
new GroupsSelect();
......
app/assets/javascripts/labels.js
View file @ 2bcb19dd
/* eslint-disable func-names, space-before-function-paren, no-var, prefer-rest-params, wrap-iife, vars-on-top, no-unused-vars, max-len */
(function() {
var bind = function(fn, me) { return function() { return fn.apply(me, arguments); }; };
this.Labels = (function() {
function Labels() {
this.setSuggestedColor = bind(this.setSuggestedColor, this);
this.updateColorPreview = bind(this.updateColorPreview, this);
this.setSuggestedColor = this.setSuggestedColor.bind(this);
this.updateColorPreview = this.updateColorPreview.bind(this);
var form;
form = $('.label-form');
this.cleanBinding();
......
app/assets/javascripts/lib/utils/bootstrap_linked_tabs.js
View file @ 2bcb19dd
......@@ -31,82 +31,78 @@
*
* ### How to use
*
* new window.gl.LinkedTabs({
* new LinkedTabs({
* action: "#{controller.action_name}",
* defaultAction: 'tab1',
* parentEl: '.tab-links'
* });
*/
(() => {
window.gl = window.gl || {};
export default class LinkedTabs {
/**
* Binds the events and activates de default tab.
*
* @param {Object} options
*/
constructor(options = {}) {
this.options = options;
window.gl.LinkedTabs = class LinkedTabs {
/**
* Binds the events and activates de default tab.
*
* @param {Object} options
*/
constructor(options) {
this.options = options || {};
this.defaultAction = this.options.defaultAction;
this.action = this.options.action || this.defaultAction;
this.defaultAction = this.options.defaultAction;
this.action = this.options.action || this.defaultAction;
if (this.action === 'show') {
this.action = this.defaultAction;
}
if (this.action === 'show') {
this.action = this.defaultAction;
}
this.currentLocation = window.location;
this.currentLocation = window.location;
const tabSelector = `${this.options.parentEl} a[data-toggle="tab"]`;
const tabSelector = `${this.options.parentEl} a[data-toggle="tab"]`;
// since this is a custom event we need jQuery :(
$(document)
.off('shown.bs.tab', tabSelector)
.on('shown.bs.tab', tabSelector, e => this.tabShown(e));
// since this is a custom event we need jQuery :(
$(document)
.off('shown.bs.tab', tabSelector)
.on('shown.bs.tab', tabSelector, e => this.tabShown(e));
this.activateTab(this.action);
}
this.activateTab(this.action);
}
/**
* Handles the `shown.bs.tab` event to set the currect url action.
*
* @param {type} evt
* @return {Function}
*/
tabShown(evt) {
const source = evt.target.getAttribute('href');
/**
* Handles the `shown.bs.tab` event to set the currect url action.
*
* @param {type} evt
* @return {Function}
*/
tabShown(evt) {
const source = evt.target.getAttribute('href');
return this.setCurrentAction(source);
}
return this.setCurrentAction(source);
}
/**
* Updates the URL with the path that matched the given action.
*
* @param {String} source
* @return {String}
*/
setCurrentAction(source) {
const copySource = source;
/**
* Updates the URL with the path that matched the given action.
*
* @param {String} source
* @return {String}
*/
setCurrentAction(source) {
const copySource = source;
copySource.replace(/\/+$/, '');
copySource.replace(/\/+$/, '');
const newState = `${copySource}${this.currentLocation.search}${this.currentLocation.hash}`;
const newState = `${copySource}${this.currentLocation.search}${this.currentLocation.hash}`;
history.replaceState({
url: newState,
}, document.title, newState);
return newState;
}
history.replaceState({
url: newState,
}, document.title, newState);
return newState;
}
/**
* Given the current action activates the correct tab.
* http://getbootstrap.com/javascript/#tab-show
* Note: Will trigger `shown.bs.tab`
*/
activateTab() {
return $(`${this.options.parentEl} a[data-action='${this.action}']`).tab('show');
}
};
})();
/**
* Given the current action activates the correct tab.
* http://getbootstrap.com/javascript/#tab-show
* Note: Will trigger `shown.bs.tab`
*/
activateTab() {
return $(`${this.options.parentEl} a[data-action='${this.action}']`).tab('show');
}
}
app/assets/javascripts/line_highlighter.js
View file @ 2bcb19dd
......@@ -31,8 +31,6 @@ require('vendor/jquery.scrollTo');
// </div>
//
(function() {
var bind = function(fn, me) { return function() { return fn.apply(me, arguments); }; };
this.LineHighlighter = (function() {
// CSS class applied to highlighted lines
LineHighlighter.prototype.highlightClass = 'hll';
......@@ -47,9 +45,9 @@ require('vendor/jquery.scrollTo');
// hash - String URL hash for dependency injection in tests
hash = location.hash;
}
this.setHash = bind(this.setHash, this);
this.highlightLine = bind(this.highlightLine, this);
this.clickHandler = bind(this.clickHandler, this);
this.setHash = this.setHash.bind(this);
this.highlightLine = this.highlightLine.bind(this);
this.clickHandler = this.clickHandler.bind(this);
this.highlightHash = this.highlightHash.bind(this);
this._hash = hash;
this.bindEvents();
......
app/assets/javascripts/locale/de/app.js
View file @ 2bcb19dd
This diff is collapsed.
app/assets/javascripts/merge_request.js
View file @ 2bcb19dd
......@@ -6,8 +6,6 @@ require('./task_list');
require('./merge_request_tabs');
(function() {
var bind = function(fn, me) { return function() { return fn.apply(me, arguments); }; };
this.MergeRequest = (function() {
function MergeRequest(opts) {
// Initialize MergeRequest behavior
......@@ -16,7 +14,7 @@ require('./merge_request_tabs');
// action - String, current controller action
//
this.opts = opts != null ? opts : {};
this.submitNoteForm = bind(this.submitNoteForm, this);
this.submitNoteForm = this.submitNoteForm.bind(this);
this.$el = $('.merge-request');
this.$('.show-all-commits').on('click', (function(_this) {
return function() {
......
app/assets/javascripts/merge_request_widget.js 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
app/assets/javascripts/namespace_select.js
View file @ 2bcb19dd
......@@ -2,11 +2,9 @@
/* global Api */
(function() {
var bind = function(fn, me) { return function() { return fn.apply(me, arguments); }; };
window.NamespaceSelect = (function() {
function NamespaceSelect(opts) {
this.onSelectItem = bind(this.onSelectItem, this);
this.onSelectItem = this.onSelectItem.bind(this);
var fieldName, showAny;
this.dropdown = opts.dropdown;
showAny = true;
......
app/assets/javascripts/new_branch_form.js
View file @ 2bcb19dd
/* eslint-disable func-names, space-before-function-paren, no-var, one-var, prefer-rest-params, max-len, vars-on-top, wrap-iife, consistent-return, comma-dangle, one-var-declaration-per-line, quotes, no-return-assign, prefer-arrow-callback, prefer-template, no-shadow, no-else-return, max-len, object-shorthand */
(function() {
var bind = function(fn, me) { return function() { return fn.apply(me, arguments); }; },
indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i += 1) { if (i in this && this[i] === item) return i; } return -1; };
this.NewBranchForm = (function() {
function NewBranchForm(form, availableRefs) {
this.validate = bind(this.validate, this);
this.validate = this.validate.bind(this);
this.branchNameError = form.find('.js-branch-name-error');
this.name = form.find('.js-branch-name');
this.ref = form.find('#ref');
......@@ -95,6 +92,8 @@
NewBranchForm.prototype.validate = function() {
var errorMessage, errors, formatter, unique, validator;
const indexOf = [].indexOf;
this.branchNameError.empty();
unique = function(values, value) {
if (indexOf.call(values, value) === -1) {
......
app/assets/javascripts/new_commit_form.js
View file @ 2bcb19dd
/* eslint-disable func-names, space-before-function-paren, no-var, prefer-rest-params, wrap-iife, no-return-assign, max-len */
(function() {
var bind = function(fn, me) { return function() { return fn.apply(me, arguments); }; };
this.NewCommitForm = (function() {
function NewCommitForm(form, targetBranchName = 'target_branch') {
this.form = form;
this.targetBranchName = targetBranchName;
this.renderDestination = bind(this.renderDestination, this);
this.renderDestination = this.renderDestination.bind(this);
this.targetBranchDropdown = form.find('button.js-target-branch');
this.originalBranch = form.find('.js-original-branch');
this.createMergeRequest = form.find('.js-create-merge-request');
......
app/assets/javascripts/notes.js
View file @ 2bcb19dd
......@@ -22,8 +22,6 @@ const normalizeNewlines = function(str) {
};
(function() {
var bind = function(fn, me) { return function() { return fn.apply(me, arguments); }; };
this.Notes = (function() {
const MAX_VISIBLE_COMMIT_LIST_COUNT = 3;
const REGEX_SLASH_COMMANDS = /\/\w+/g;
......@@ -31,24 +29,24 @@ const normalizeNewlines = function(str) {
Notes.interval = null;
function Notes(notes_url, note_ids, last_fetched_at, view) {
this.updateTargetButtons = bind(this.updateTargetButtons, this);
this.updateComment = bind(this.updateComment, this);
this.visibilityChange = bind(this.visibilityChange, this);
this.cancelDiscussionForm = bind(this.cancelDiscussionForm, this);
this.addDiffNote = bind(this.addDiffNote, this);
this.setupDiscussionNoteForm = bind(this.setupDiscussionNoteForm, this);
this.replyToDiscussionNote = bind(this.replyToDiscussionNote, this);
this.removeNote = bind(this.removeNote, this);
this.cancelEdit = bind(this.cancelEdit, this);
this.updateNote = bind(this.updateNote, this);
this.addDiscussionNote = bind(this.addDiscussionNote, this);
this.addNoteError = bind(this.addNoteError, this);
this.addNote = bind(this.addNote, this);
this.resetMainTargetForm = bind(this.resetMainTargetForm, this);
this.refresh = bind(this.refresh, this);
this.keydownNoteText = bind(this.keydownNoteText, this);
this.toggleCommitList = bind(this.toggleCommitList, this);
this.postComment = bind(this.postComment, this);
this.updateTargetButtons = this.updateTargetButtons.bind(this);
this.updateComment = this.updateComment.bind(this);
this.visibilityChange = this.visibilityChange.bind(this);
this.cancelDiscussionForm = this.cancelDiscussionForm.bind(this);
this.addDiffNote = this.addDiffNote.bind(this);
this.setupDiscussionNoteForm = this.setupDiscussionNoteForm.bind(this);
this.replyToDiscussionNote = this.replyToDiscussionNote.bind(this);
this.removeNote = this.removeNote.bind(this);
this.cancelEdit = this.cancelEdit.bind(this);
this.updateNote = this.updateNote.bind(this);
this.addDiscussionNote = this.addDiscussionNote.bind(this);
this.addNoteError = this.addNoteError.bind(this);
this.addNote = this.addNote.bind(this);
this.resetMainTargetForm = this.resetMainTargetForm.bind(this);
this.refresh = this.refresh.bind(this);
this.keydownNoteText = this.keydownNoteText.bind(this);
this.toggleCommitList = this.toggleCommitList.bind(this);
this.postComment = this.postComment.bind(this);
this.notes_url = notes_url;
this.note_ids = note_ids;
......@@ -175,7 +173,7 @@ const normalizeNewlines = function(str) {
if ($textarea.val() !== '') {
return;
}
myLastNote = $("li.note[data-author-id='" + gon.current_user_id + "'][data-editable]:last");
myLastNote = $(`li.note[data-author-id='${gon.current_user_id}'][data-editable]:last`, $textarea.closest('.note, #notes'));
if (myLastNote.length) {
myLastNoteEditBtn = myLastNote.find('.js-note-edit');
return myLastNoteEditBtn.trigger('click', [true, myLastNote]);
......@@ -1123,8 +1121,13 @@ const normalizeNewlines = function(str) {
}
};
<<<<<<< HEAD
Notes.animateAppendNote = function(noteHTML, $notesList) {
const $note = window.$(noteHTML);
=======
Notes.animateAppendNote = function(noteHtml, $notesList) {
const $note = $(noteHtml);
>>>>>>> upstream/master
$note.addClass('fade-in-full').renderGFM();
$notesList.append($note);
......
app/assets/javascripts/notifications_form.js
View file @ 2bcb19dd
/* eslint-disable func-names, space-before-function-paren, no-var, prefer-rest-params, wrap-iife, one-var, one-var-declaration-per-line, newline-per-chained-call, comma-dangle, consistent-return, prefer-arrow-callback, max-len */
(function() {
var bind = function(fn, me) { return function() { return fn.apply(me, arguments); }; };
this.NotificationsForm = (function() {
function NotificationsForm() {
this.toggleCheckbox = bind(this.toggleCheckbox, this);
this.toggleCheckbox = this.toggleCheckbox.bind(this);
this.removeEventListeners();
this.initEventListeners();
}
......
app/assets/javascripts/pipeline_schedules/components/interval_pattern_input.js 0 → 100644
View file @ 2bcb19dd
import Vue from 'vue';
const inputNameAttribute = 'schedule[cron]';
export default {
props: {
initialCronInterval: {
type: String,
required: false,
default: '',
},
},
data() {
return {
inputNameAttribute,
cronInterval: this.initialCronInterval,
cronIntervalPresets: {
everyDay: '0 4 * * *',
everyWeek: '0 4 * * 0',
everyMonth: '0 4 1 * *',
},
cronSyntaxUrl: 'https://en.wikipedia.org/wiki/Cron',
customInputEnabled: false,
};
},
computed: {
showUnsetWarning() {
return this.cronInterval === '';
},
intervalIsPreset() {
return _.contains(this.cronIntervalPresets, this.cronInterval);
},
// The text input is editable when there's a custom interval, or when it's
// a preset interval and the user clicks the 'custom' radio button
isEditable() {
return !!(this.customInputEnabled || !this.intervalIsPreset);
},
},
methods: {
toggleCustomInput(shouldEnable) {
this.customInputEnabled = shouldEnable;
if (shouldEnable) {
// We need to change the value so other radios don't remain selected
// because the model (cronInterval) hasn't changed. The server trims it.
this.cronInterval = `${this.cronInterval} `;
}
},
},
created() {
if (this.intervalIsPreset) {
this.enableCustomInput = false;
}
},
watch: {
cronInterval() {
// updates field validation state when model changes, as
// glFieldError only updates on input.
Vue.nextTick(() => {
gl.pipelineScheduleFieldErrors.updateFormValidityState();
});
},
},
template: `
<div class="interval-pattern-form-group">
<input
id="custom"
class="label-light"
type="radio"
:name="inputNameAttribute"
:value="cronInterval"
:checked="isEditable"
@click="toggleCustomInput(true)"
/>
<label for="custom">
Custom
</label>
<span class="cron-syntax-link-wrap">
(<a :href="cronSyntaxUrl" target="_blank">Cron syntax</a>)
</span>
<input
id="every-day"
class="label-light"
type="radio"
v-model="cronInterval"
:name="inputNameAttribute"
:value="cronIntervalPresets.everyDay"
@click="toggleCustomInput(false)"
/>
<label class="label-light" for="every-day">
Every day (at 4:00am)
</label>
<input
id="every-week"
class="label-light"
type="radio"
v-model="cronInterval"
:name="inputNameAttribute"
:value="cronIntervalPresets.everyWeek"
@click="toggleCustomInput(false)"
/>
<label class="label-light" for="every-week">
Every week (Sundays at 4:00am)
</label>
<input
id="every-month"
class="label-light"
type="radio"
v-model="cronInterval"
:name="inputNameAttribute"
:value="cronIntervalPresets.everyMonth"
@click="toggleCustomInput(false)"
/>
<label class="label-light" for="every-month">
Every month (on the 1st at 4:00am)
</label>
<div class="cron-interval-input-wrapper col-md-6">
<input
id="schedule_cron"
class="form-control inline cron-interval-input"
type="text"
placeholder="Define a custom pattern with cron syntax"
required="true"
v-model="cronInterval"
:name="inputNameAttribute"
:disabled="!isEditable"
/>
</div>
<span class="cron-unset-status col-md-3" v-if="showUnsetWarning">
Schedule not yet set
</span>
</div>
`,
};
app/assets/javascripts/pipeline_schedules/components/pipeline_schedules_callout.js 0 → 100644
View file @ 2bcb19dd
import Cookies from 'js-cookie';
import illustrationSvg from '../icons/intro_illustration.svg';
const cookieKey = 'pipeline_schedules_callout_dismissed';
export default {
data() {
return {
illustrationSvg,
calloutDismissed: Cookies.get(cookieKey) === 'true',
};
},
methods: {
dismissCallout() {
this.calloutDismissed = true;
Cookies.set(cookieKey, this.calloutDismissed, { expires: 365 });
},
},
template: `
<div v-if="!calloutDismissed" class="pipeline-schedules-user-callout user-callout">
<div class="bordered-box landing content-block">
<button
id="dismiss-callout-btn"
class="btn btn-default close"
@click="dismissCallout">
<i class="fa fa-times"></i>
</button>
<div class="svg-container" v-html="illustrationSvg"></div>
<div class="user-callout-copy">
<h4>Scheduling Pipelines</h4>
<p>
The pipelines schedule runs pipelines in the future, repeatedly, for specific branches or tags.
Those scheduled pipelines will inherit limited project access based on their associated user.
</p>
<p> Learn more in the
<!-- FIXME -->
<a href="random.com">pipeline schedules documentation</a>.
</p>
</div>
</div>
</div>
`,
};
app/assets/javascripts/pipeline_schedules/components/target_branch_dropdown.js 0 → 100644
View file @ 2bcb19dd
export default class TargetBranchDropdown {
constructor() {
this.$dropdown = $('.js-target-branch-dropdown');
this.$dropdownToggle = this.$dropdown.find('.dropdown-toggle-text');
this.$input = $('#schedule_ref');
this.initialValue = this.$input.val();
this.initDropdown();
}
initDropdown() {
this.$dropdown.glDropdown({
data: this.formatBranchesList(),
filterable: true,
selectable: true,
toggleLabel: item => item.name,
search: {
fields: ['name'],
},
clicked: cfg => this.updateInputValue(cfg),
text: item => item.name,
});
this.setDropdownToggle();
}
formatBranchesList() {
return this.$dropdown.data('data')
.map(val => ({ name: val }));
}
setDropdownToggle() {
if (this.initialValue) {
this.$dropdownToggle.text(this.initialValue);
}
}
updateInputValue({ selectedObj, e }) {
e.preventDefault();
this.$input.val(selectedObj.name);
gl.pipelineScheduleFieldErrors.updateFormValidityState();
}
}
app/assets/javascripts/pipeline_schedules/components/timezone_dropdown.js 0 → 100644
View file @ 2bcb19dd
/* eslint-disable class-methods-use-this */
export default class TimezoneDropdown {
constructor() {
this.$dropdown = $('.js-timezone-dropdown');
this.$dropdownToggle = this.$dropdown.find('.dropdown-toggle-text');
this.$input = $('#schedule_cron_timezone');
this.timezoneData = this.$dropdown.data('data');
this.initialValue = this.$input.val();
this.initDropdown();
}
initDropdown() {
this.$dropdown.glDropdown({
data: this.timezoneData,
filterable: true,
selectable: true,
toggleLabel: item => item.name,
search: {
fields: ['name'],
},
clicked: cfg => this.updateInputValue(cfg),
text: item => this.formatTimezone(item),
});
this.setDropdownToggle();
}
formatUtcOffset(offset) {
let prefix = '';
if (offset > 0) {
prefix = '+';
} else if (offset < 0) {
prefix = '-';
}
return `${prefix} ${Math.abs(offset / 3600)}`;
}
formatTimezone(item) {
return `[UTC ${this.formatUtcOffset(item.offset)}] ${item.name}`;
}
setDropdownToggle() {
if (this.initialValue) {
this.$dropdownToggle.text(this.initialValue);
}
}
updateInputValue({ selectedObj, e }) {
e.preventDefault();
this.$input.val(selectedObj.identifier);
gl.pipelineScheduleFieldErrors.updateFormValidityState();
}
}
app/assets/javascripts/pipeline_schedules/icons/intro_illustration.svg 0 → 100644
View file @ 2bcb19dd
<svg width="140" height="102" viewBox="0 0 140 102" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><title>illustration</title><defs><rect id="a" width="12.033" height="40.197" rx="3"/><rect id="b" width="12.033" height="40.197" rx="3"/></defs><g fill="none" fill-rule="evenodd"><g transform="translate(-.446)"><path d="M91.747 35.675v-6.039a2.996 2.996 0 0 0-2.999-3.005H54.635a2.997 2.997 0 0 0-2.999 3.005v6.039H40.092a3.007 3.007 0 0 0-2.996 3.005v34.187a2.995 2.995 0 0 0 2.996 3.005h11.544V79.9a2.996 2.996 0 0 0 2.999 3.005h34.113a2.997 2.997 0 0 0 2.999-3.005v-4.03h11.544a3.007 3.007 0 0 0 2.996-3.004V38.68a2.995 2.995 0 0 0-2.996-3.005H91.747z" stroke="#B5A7DD" stroke-width="2"/><rect stroke="#E5E5E5" stroke-width="2" fill="#FFF" x="21.556" y="38.69" width="98.27" height="34.167" rx="3"/><path d="M121.325 38.19c.55 0 .995.444.995 1.002 0 .554-.453 1.003-.995 1.003h-4.039a1.004 1.004 0 0 1 0-2.006h4.039zm9.044 0c.55 0 .996.444.996 1.002 0 .554-.454 1.003-.996 1.003h-4.038a1.004 1.004 0 0 1 0-2.006h4.038zm9.044 0c.55 0 .996.444.996 1.002 0 .554-.453 1.003-.996 1.003h-4.038a1.004 1.004 0 0 1 0-2.006h4.038zM121.325 71.854a1.004 1.004 0 0 1 0 2.006h-4.039a1.004 1.004 0 0 1 0-2.006h4.039zm9.044 0a1.004 1.004 0 0 1 0 2.006h-4.038a1.004 1.004 0 0 1 0-2.006h4.038zm9.044 0a1.004 1.004 0 0 1 0 2.006h-4.038a1.004 1.004 0 0 1 0-2.006h4.038z" fill="#E5E5E5"/><g transform="translate(110.3 35.675)"><use fill="#FFF" xlink:href="#a"/><rect stroke="#FDE5D8" stroke-width="2" x="1" y="1" width="10.033" height="38.197" rx="3"/><ellipse fill="#FC8A51" cx="6.017" cy="9.547" rx="1.504" ry="1.507"/><ellipse fill="#FC8A51" cx="6.017" cy="20.099" rx="1.504" ry="1.507"/><ellipse fill="#FC8A51" cx="6.017" cy="30.65" rx="1.504" ry="1.507"/></g><path d="M6.008 38.19c.55 0 .996.444.996 1.002 0 .554-.454 1.003-.996 1.003H1.97a1.004 1.004 0 0 1 0-2.006h4.038zm9.044 0c.55 0 .996.444.996 1.002 0 .554-.453 1.003-.996 1.003h-4.038a1.004 1.004 0 0 1 0-2.006h4.038zm9.045 0c.55 0 .995.444.995 1.002 0 .554-.453 1.003-.995 1.003h-4.039a1.004 1.004 0 0 1 0-2.006h4.039zM6.008 71.854a1.004 1.004 0 0 1 0 2.006H1.97a1.004 1.004 0 0 1 0-2.006h4.038zm9.044 0a1.004 1.004 0 0 1 0 2.006h-4.038a1.004 1.004 0 0 1 0-2.006h4.038zm9.045 0a1.004 1.004 0 0 1 0 2.006h-4.039a1.004 1.004 0 0 1 0-2.006h4.039z" fill="#E5E5E5"/><g transform="translate(19.05 35.675)"><use fill="#FFF" xlink:href="#b"/><rect stroke="#FDE5D8" stroke-width="2" x="1" y="1" width="10.033" height="38.197" rx="3"/><ellipse fill="#FC8A51" cx="6.017" cy="10.049" rx="1.504" ry="1.507"/><ellipse fill="#FC8A51" cx="6.017" cy="20.601" rx="1.504" ry="1.507"/><ellipse fill="#FC8A51" cx="6.017" cy="31.153" rx="1.504" ry="1.507"/></g><g transform="translate(47.096)"><g transform="translate(7.05)"><ellipse fill="#FC8A51" cx="17.548" cy="5.025" rx="4.512" ry="4.522"/><rect stroke="#B5A7DD" stroke-width="2" fill="#FFF" x="13.036" y="4.02" width="9.025" height="20.099" rx="1.5"/><rect stroke="#FDE5D8" stroke-width="2" fill="#FFF" y="4.02" width="35.096" height="4.02" rx="2.01"/><rect stroke="#6B4FBB" stroke-width="2" fill="#FFF" x="4.512" y="18.089" width="26.072" height="17.084" rx="1.5"/></g><rect stroke="#6B4FBB" stroke-width="2" fill="#FFF" transform="rotate(-45 43.117 35.117)" x="38.168" y="31.416" width="9.899" height="7.403" rx="3.702"/><ellipse stroke="#6B4FBB" stroke-width="2" fill="#FFF" cx="25" cy="55" rx="25" ry="25"/><ellipse stroke="#6B4FBB" stroke-width="2" fill="#FFF" cx="25" cy="55" rx="21" ry="21"/><rect stroke="#6B4FBB" stroke-width="2" fill="#FFF" x="43.05" y="53.281" width="2.95" height="1.538" rx=".769"/><rect stroke="#6B4FBB" stroke-width="2" fill="#FFF" x="4.305" y="53.281" width="2.95" height="1.538" rx=".769"/><rect stroke="#6B4FBB" stroke-width="2" fill="#FFF" transform="rotate(90 25.153 74.422)" x="23.677" y="73.653" width="2.95" height="1.538" rx=".769"/><rect stroke="#6B4FBB" stroke-width="2" fill="#FFF" transform="rotate(90 25.153 35.51)" x="23.844" y="34.742" width="2.616" height="1.538" rx=".769"/><path d="M13.362 42.502c-.124-.543.198-.854.74-.69l2.321.704c.533.161.643.592.235.972l-.22.206 7.06 7.572a1.002 1.002 0 1 1-1.467 1.368l-7.06-7.573-.118.11c-.402.375-.826.248-.952-.304l-.54-2.365zM21.606 67.576c-.408.38-.84.255-.968-.295l-.551-2.363c-.127-.542.191-.852.725-.69l.288.089 3.027-9.901a1.002 1.002 0 1 1 1.918.586l-3.027 9.901.154.047c.525.16.627.592.213.977l-1.779 1.65z" fill="#FC8A51"/><ellipse stroke="#6B4FBB" stroke-width="2" fill="#FFF" cx="25.099" cy="54.768" rx="2.507" ry="2.512"/></g></g><path d="M52.697 96.966a1.004 1.004 0 0 1 2.006 0v4.038a1.004 1.004 0 0 1-2.006 0v-4.038zm0-9.044a1.004 1.004 0 0 1 2.006 0v4.038a1.004 1.004 0 0 1-2.006 0v-4.038zM86.29 96.966c0-.55.444-.996 1.002-.996.554 0 1.003.454 1.003.996v4.038a1.004 1.004 0 0 1-2.006 0v-4.038zm0-9.044c0-.55.444-.996 1.002-.996.554 0 1.003.453 1.003.996v4.038a1.004 1.004 0 0 1-2.006 0v-4.038z" fill="#E5E5E5"/></g></svg>
\ No newline at end of file
app/assets/javascripts/pipeline_schedules/pipeline_schedule_form_bundle.js 0 → 100644
View file @ 2bcb19dd
import Vue from 'vue';
import IntervalPatternInput from './components/interval_pattern_input';
import TimezoneDropdown from './components/timezone_dropdown';
import TargetBranchDropdown from './components/target_branch_dropdown';
document.addEventListener('DOMContentLoaded', () => {
const IntervalPatternInputComponent = Vue.extend(IntervalPatternInput);
const intervalPatternMount = document.getElementById('interval-pattern-input');
const initialCronInterval = intervalPatternMount ? intervalPatternMount.dataset.initialInterval : '';
new IntervalPatternInputComponent({
propsData: {
initialCronInterval,
},
}).$mount(intervalPatternMount);
const formElement = document.getElementById('new-pipeline-schedule-form');
gl.timezoneDropdown = new TimezoneDropdown();
gl.targetBranchDropdown = new TargetBranchDropdown();
gl.pipelineScheduleFieldErrors = new gl.GlFieldErrors(formElement);
});
app/assets/javascripts/pipeline_schedules/pipeline_schedules_index_bundle.js 0 → 100644
View file @ 2bcb19dd
import Vue from 'vue';
import PipelineSchedulesCallout from './components/pipeline_schedules_callout';
const PipelineSchedulesCalloutComponent = Vue.extend(PipelineSchedulesCallout);
document.addEventListener('DOMContentLoaded', () => {
new PipelineSchedulesCalloutComponent()
.$mount('#scheduling-pipelines-callout');
});
app/assets/javascripts/pipelines.js
View file @ 2bcb19dd
/* eslint-disable no-new, guard-for-in, no-restricted-syntax, no-continue, no-param-reassign, max-len */
import LinkedTabs from './lib/utils/bootstrap_linked_tabs';
require('./lib/utils/bootstrap_linked_tabs');
((global) => {
class Pipelines {
constructor(options = {}) {
if (options.initTabs && options.tabsOptions) {
new global.LinkedTabs(options.tabsOptions);
}
if (options.pipelineStatusUrl) {
gl.utils.setCiStatusFavicon(options.pipelineStatusUrl);
}
this.addMarginToBuildColumns();
export default class Pipelines {
constructor(options = {}) {
if (options.initTabs && options.tabsOptions) {
// eslint-disable-next-line no-new
new LinkedTabs(options.tabsOptions);
}
addMarginToBuildColumns() {
this.pipelineGraph = document.querySelector('.js-pipeline-graph');
const secondChildBuildNodes = this.pipelineGraph.querySelectorAll('.build:nth-child(2)');
for (const buildNodeIndex in secondChildBuildNodes) {
const buildNode = secondChildBuildNodes[buildNodeIndex];
const firstChildBuildNode = buildNode.previousElementSibling;
if (!firstChildBuildNode || !firstChildBuildNode.matches('.build')) continue;
const multiBuildColumn = buildNode.closest('.stage-column');
const previousColumn = multiBuildColumn.previousElementSibling;
if (!previousColumn || !previousColumn.matches('.stage-column')) continue;
multiBuildColumn.classList.add('left-margin');
firstChildBuildNode.classList.add('left-connector');
const columnBuilds = previousColumn.querySelectorAll('.build');
if (columnBuilds.length === 1) previousColumn.classList.add('no-margin');
}
this.pipelineGraph.classList.remove('hidden');
if (options.pipelineStatusUrl) {
gl.utils.setCiStatusFavicon(options.pipelineStatusUrl);
}
}
global.Pipelines = Pipelines;
})(window.gl || (window.gl = {}));
}
app/assets/javascripts/pipelines/components/graph/action_component.vue 0 → 100644
View file @ 2bcb19dd
<script>
import getActionIcon from '../../../vue_shared/ci_action_icons';
import tooltipMixin from '../../../vue_shared/mixins/tooltip';
/**
* Renders either a cancel, retry or play icon pointing to the given path.
* TODO: Remove UJS from here and use an async request instead.
*/
export default {
props: {
tooltipText: {
type: String,
required: true,
},
link: {
type: String,
required: true,
},
actionMethod: {
type: String,
required: true,
},
actionIcon: {
type: String,
required: true,
},
},
mixins: [
tooltipMixin,
],
computed: {
actionIconSvg() {
return getActionIcon(this.actionIcon);
},
cssClass() {
return `js-${gl.text.dasherize(this.actionIcon)}`;
},
},
};
</script>
<template>
<a
:data-method="actionMethod"
:title="tooltipText"
:href="link"
ref="tooltip"
class="ci-action-icon-container"
data-toggle="tooltip"
data-container="body">
<i
class="ci-action-icon-wrapper"
:class="cssClass"
v-html="actionIconSvg"
aria-hidden="true"
/>
</a>
</template>
app/assets/javascripts/pipelines/components/graph/dropdown_action_component.vue 0 → 100644
View file @ 2bcb19dd
<script>
import getActionIcon from '../../../vue_shared/ci_action_icons';
import tooltipMixin from '../../../vue_shared/mixins/tooltip';
/**
* Renders either a cancel, retry or play icon pointing to the given path.
* TODO: Remove UJS from here and use an async request instead.
*/
export default {
props: {
tooltipText: {
type: String,
required: true,
},
link: {
type: String,
required: true,
},
actionMethod: {
type: String,
required: true,
},
actionIcon: {
type: String,
required: true,
},
},
mixins: [
tooltipMixin,
],
computed: {
actionIconSvg() {
return getActionIcon(this.actionIcon);
},
},
};
</script>
<template>
<a
:data-method="actionMethod"
:title="tooltipText"
:href="link"
ref="tooltip"
rel="nofollow"
class="ci-action-icon-wrapper js-ci-status-icon"
data-toggle="tooltip"
data-container="body"
v-html="actionIconSvg"
aria-label="Job's action">
</a>
</template>
app/assets/javascripts/pipelines/components/graph/dropdown_job_component.vue 0 → 100644
View file @ 2bcb19dd
<script>
import jobNameComponent from './job_name_component.vue';
import jobComponent from './job_component.vue';
import tooltipMixin from '../../../vue_shared/mixins/tooltip';
/**
* Renders the dropdown for the pipeline graph.
*
* The following object should be provided as `job`:
*
* {
* "id": 4256,
* "name": "test",
* "status": {
* "icon": "icon_status_success",
* "text": "passed",
* "label": "passed",
* "group": "success",
* "details_path": "/root/ci-mock/builds/4256",
* "action": {
* "icon": "icon_action_retry",
* "title": "Retry",
* "path": "/root/ci-mock/builds/4256/retry",
* "method": "post"
* }
* }
* }
*/
export default {
props: {
job: {
type: Object,
required: true,
},
},
mixins: [
tooltipMixin,
],
components: {
jobComponent,
jobNameComponent,
},
computed: {
tooltipText() {
return `${this.job.name} - ${this.job.status.label}`;
},
},
};
</script>
<template>
<div>
<button
type="button"
data-toggle="dropdown"
data-container="body"
class="dropdown-menu-toggle build-content"
:title="tooltipText"
ref="tooltip">
<job-name-component
:name="job.name"
:status="job.status" />
<span class="dropdown-counter-badge">
{{job.size}}
</span>
</button>
<ul class="dropdown-menu big-pipeline-graph-dropdown-menu js-grouped-pipeline-dropdown">
<li class="scrollable-menu">
<ul>
<li v-for="item in job.jobs">
<job-component
:job="item"
:is-dropdown="true"
css-class-job-name="mini-pipeline-graph-dropdown-item"
/>
</li>
</ul>
</li>
</ul>
</div>
</template>
app/assets/javascripts/pipelines/components/graph/graph_component.vue 0 → 100644
View file @ 2bcb19dd
<script>
/* global Flash */
import Visibility from 'visibilityjs';
import Poll from '../../../lib/utils/poll';
import PipelineService from '../../services/pipeline_service';
import PipelineStore from '../../stores/pipeline_store';
import stageColumnComponent from './stage_column_component.vue';
import '../../../flash';
export default {
components: {
stageColumnComponent,
},
data() {
const DOMdata = document.getElementById('js-pipeline-graph-vue').dataset;
const store = new PipelineStore();
return {
isLoading: false,
endpoint: DOMdata.endpoint,
store,
state: store.state,
};
},
created() {
this.service = new PipelineService(this.endpoint);
const poll = new Poll({
resource: this.service,
method: 'getPipeline',
successCallback: this.successCallback,
errorCallback: this.errorCallback,
});
if (!Visibility.hidden()) {
this.isLoading = true;
poll.makeRequest();
}
Visibility.change(() => {
if (!Visibility.hidden()) {
poll.restart();
} else {
poll.stop();
}
});
},
methods: {
successCallback(response) {
const data = response.json();
this.isLoading = false;
this.store.storeGraph(data.details.stages);
},
errorCallback() {
this.isLoading = false;
return new Flash('An error occurred while fetching the pipeline.');
},
capitalizeStageName(name) {
return name.charAt(0).toUpperCase() + name.slice(1);
},
isFirstColumn(index) {
return index === 0;
},
stageConnectorClass(index, stage) {
let className;
// If it's the first stage column and only has one job
if (index === 0 && stage.groups.length === 1) {
className = 'no-margin';
} else if (index > 0) {
// If it is not the first column
className = 'left-margin';
}
return className;
},
},
};
</script>
<template>
<div class="build-content middle-block js-pipeline-graph">
<div class="pipeline-visualization pipeline-graph">
<div class="text-center">
<i
v-if="isLoading"
class="loading-icon fa fa-spin fa-spinner fa-3x"
aria-label="Loading"
aria-hidden="true" />
</div>
<ul
v-if="!isLoading"
class="stage-column-list">
<stage-column-component
v-for="(stage, index) in state.graph"
:title="capitalizeStageName(stage.name)"
:jobs="stage.groups"
:key="stage.name"
:stage-connector-class="stageConnectorClass(index, stage)"
:is-first-column="isFirstColumn(index)"/>
</ul>
</div>
</div>
</template>
app/assets/javascripts/pipelines/components/graph/job_component.vue 0 → 100644
View file @ 2bcb19dd
<script>
import actionComponent from './action_component.vue';
import dropdownActionComponent from './dropdown_action_component.vue';
import jobNameComponent from './job_name_component.vue';
import tooltipMixin from '../../../vue_shared/mixins/tooltip';
/**
* Renders the badge for the pipeline graph and the job's dropdown.
*
* The following object should be provided as `job`:
*
* {
* "id": 4256,
* "name": "test",
* "status": {
* "icon": "icon_status_success",
* "text": "passed",
* "label": "passed",
* "group": "success",
* "details_path": "/root/ci-mock/builds/4256",
* "action": {
* "icon": "icon_action_retry",
* "title": "Retry",
* "path": "/root/ci-mock/builds/4256/retry",
* "method": "post"
* }
* }
* }
*/
export default {
props: {
job: {
type: Object,
required: true,
},
cssClassJobName: {
type: String,
required: false,
default: '',
},
isDropdown: {
type: Boolean,
required: false,
default: false,
},
},
components: {
actionComponent,
dropdownActionComponent,
jobNameComponent,
},
mixins: [
tooltipMixin,
],
computed: {
tooltipText() {
return `${this.job.name} - ${this.job.status.label}`;
},
/**
* Verifies if the provided job has an action path
*
* @return {Boolean}
*/
hasAction() {
return this.job.status && this.job.status.action && this.job.status.action.path;
},
},
};
</script>
<template>
<div>
<a
v-if="job.status.details_path"
:href="job.status.details_path"
:title="tooltipText"
:class="cssClassJobName"
ref="tooltip"
data-toggle="tooltip"
data-container="body">
<job-name-component
:name="job.name"
:status="job.status"
/>
</a>
<div
v-else
:title="tooltipText"
:class="cssClassJobName"
ref="tooltip"
data-toggle="tooltip"
data-container="body">
<job-name-component
:name="job.name"
:status="job.status"
/>
</div>
<action-component
v-if="hasAction && !isDropdown"
:tooltip-text="job.status.action.title"
:link="job.status.action.path"
:action-icon="job.status.action.icon"
:action-method="job.status.action.method"
/>
<dropdown-action-component
v-if="hasAction && isDropdown"
:tooltip-text="job.status.action.title"
:link="job.status.action.path"
:action-icon="job.status.action.icon"
:action-method="job.status.action.method"
/>
</div>
</template>
app/assets/javascripts/pipelines/components/graph/job_name_component.vue 0 → 100644
View file @ 2bcb19dd
<script>
import ciIcon from '../../../vue_shared/components/ci_icon.vue';
/**
* Component that renders both the CI icon status and the job name.
* Used in
* - Badge component
* - Dropdown badge components
*/
export default {
props: {
name: {
type: String,
required: true,
},
status: {
type: Object,
required: true,
},
},
components: {
ciIcon,
},
};
</script>
<template>
<span>
<ci-icon
:status="status" />
<span class="ci-status-text">
{{name}}
</span>
</span>
</template>
app/assets/javascripts/pipelines/components/graph/stage_column_component.vue 0 → 100644
View file @ 2bcb19dd
<script>
import jobComponent from './job_component.vue';
import dropdownJobComponent from './dropdown_job_component.vue';
export default {
props: {
title: {
type: String,
required: true,
},
jobs: {
type: Array,
required: true,
},
isFirstColumn: {
type: Boolean,
required: false,
default: false,
},
stageConnectorClass: {
type: String,
required: false,
default: '',
},
},
components: {
jobComponent,
dropdownJobComponent,
},
methods: {
firstJob(list) {
return list[0];
},
jobId(job) {
return `ci-badge-${job.name}`;
},
buildConnnectorClass(index) {
return index === 0 && !this.isFirstColumn ? 'left-connector' : '';
},
},
};
</script>
<template>
<li
class="stage-column"
:class="stageConnectorClass">
<div class="stage-name">
{{title}}
</div>
<div class="builds-container">
<ul>
<li
v-for="(job, index) in jobs"
:key="job.id"
class="build"
:class="buildConnnectorClass(index)"
:id="jobId(job)">
<div class="curve"></div>
<job-component
v-if="job.size === 1"
:job="job"
css-class-job-name="build-content"
/>
<dropdown-job-component
v-if="job.size > 1"
:job="job"
/>
</li>
</ul>
</div>
</li>
</template>
app/assets/javascripts/pipelines/components/stage.js
View file @ 2bcb19dd
/* global Flash */
<<<<<<< HEAD
import { statusClassToSvgMap } from '../../vue_shared/pipeline_svg_icons';
export default {
......@@ -9,6 +10,11 @@ export default {
},
},
=======
import { borderlessStatusIconEntityMap } from '../../vue_shared/ci_status_icons';
export default {
>>>>>>> upstream/master
data() {
return {
builds: '',
......@@ -16,6 +22,16 @@ export default {
};
},
<<<<<<< HEAD
=======
props: {
stage: {
type: Object,
required: true,
},
},
>>>>>>> upstream/master
updated() {
if (this.builds) {
this.stopDropdownClickPropagation();
......@@ -31,6 +47,7 @@ export default {
return this.$http.get(this.stage.dropdown_path)
.then((response) => {
this.builds = JSON.parse(response.body).html;
<<<<<<< HEAD
})
.catch(() => {
// If dropdown is opened we'll close it.
......@@ -38,6 +55,9 @@ export default {
$(this.$refs.dropdown).dropdown('toggle');
}
=======
}, () => {
>>>>>>> upstream/master
const flash = new Flash('Something went wrong on our end.');
return flash;
});
......@@ -52,10 +72,16 @@ export default {
* target the click event of this component.
*/
stopDropdownClickPropagation() {
<<<<<<< HEAD
$(this.$el.querySelectorAll('.js-builds-dropdown-list a.mini-pipeline-graph-dropdown-item'))
.on('click', (e) => {
e.stopPropagation();
});
=======
$(this.$el.querySelectorAll('.js-builds-dropdown-list a.mini-pipeline-graph-dropdown-item')).on('click', (e) => {
e.stopPropagation();
});
>>>>>>> upstream/master
},
},
computed: {
......@@ -76,7 +102,11 @@ export default {
return `mini-pipeline-graph-dropdown-toggle has-tooltip js-builds-dropdown-button ci-status-icon-${this.stage.status.group}`;
},
svgHTML() {
<<<<<<< HEAD
return statusClassToSvgMap[this.stage.status.icon];
=======
return borderlessStatusIconEntityMap[this.stage.status.icon];
>>>>>>> upstream/master
},
},
watch: {
......@@ -93,6 +123,7 @@ export default {
data-placement="top"
data-toggle="dropdown"
type="button"
<<<<<<< HEAD
:aria-label="stage.title"
ref="dropdown">
<span
......@@ -109,6 +140,15 @@ export default {
<div
class="arrow-up"
aria-hidden="true"></div>
=======
ref="button"
:aria-label="stage.title">
<span v-html="svgHTML" aria-hidden="true"></span>
<i class="fa fa-caret-down" aria-hidden="true"></i>
</button>
<ul class="dropdown-menu mini-pipeline-graph-dropdown-menu js-builds-dropdown-container">
<div class="arrow-up" aria-hidden="true"></div>
>>>>>>> upstream/master
<div
:class="dropdownClass"
class="js-builds-dropdown-list scrollable-menu"
......
app/assets/javascripts/pipelines/components/stage.vue
View file @ 2bcb19dd
......@@ -14,7 +14,11 @@
*/
/* global Flash */
<<<<<<< HEAD
import { statusClassToSvgMap } from '../../vue_shared/pipeline_svg_icons';
=======
import { borderlessStatusIconEntityMap } from '../../vue_shared/ci_status_icons';
>>>>>>> upstream/master
export default {
props: {
......@@ -113,7 +117,11 @@ export default {
},
svgIcon() {
<<<<<<< HEAD
return statusClassToSvgMap[this.stage.status.icon];
=======
return borderlessStatusIconEntityMap[this.stage.status.icon];
>>>>>>> upstream/master
},
},
};
......
app/assets/javascripts/pipelines/graph_bundle.js 0 → 100644
View file @ 2bcb19dd
import Vue from 'vue';
import pipelineGraph from './components/graph/graph_component.vue';
document.addEventListener('DOMContentLoaded', () => new Vue({
el: '#js-pipeline-graph-vue',
components: {
pipelineGraph,
},
render: createElement => createElement('pipeline-graph'),
}));
app/assets/javascripts/pipelines/pipelines.js
View file @ 2bcb19dd
......@@ -2,7 +2,7 @@ import Visibility from 'visibilityjs';
import PipelinesService from './services/pipelines_service';
import eventHub from './event_hub';
import PipelinesTableComponent from '../vue_shared/components/pipelines_table';
import TablePaginationComponent from '../vue_shared/components/table_pagination';
import tablePagination from '../vue_shared/components/table_pagination.vue';
import EmptyState from './components/empty_state.vue';
import ErrorState from './components/error_state.vue';
import NavigationTabs from './components/navigation_tabs';
......@@ -18,7 +18,7 @@ export default {
},
components: {
'gl-pagination': TablePaginationComponent,
tablePagination,
'pipelines-table-component': PipelinesTableComponent,
'empty-state': EmptyState,
'error-state': ErrorState,
......@@ -275,12 +275,13 @@ export default {
/>
</div>
<gl-pagination
<table-pagination
v-if="shouldRenderPagination"
:pagenum="pagenum"
:change="change"
:count="state.count.all"
:pageInfo="state.pageInfo"/>
:pageInfo="state.pageInfo"
/>
</div>
</div>
`,
......
app/assets/javascripts/pipelines/services/pipeline_service.js 0 → 100644
View file @ 2bcb19dd
import Vue from 'vue';
import VueResource from 'vue-resource';
Vue.use(VueResource);
export default class PipelineService {
constructor(endpoint) {
this.pipeline = Vue.resource(endpoint);
}
getPipeline() {
return this.pipeline.get();
}
}
app/assets/javascripts/pipelines/stores/pipeline_store.js 0 → 100644
View file @ 2bcb19dd
export default class PipelineStore {
constructor() {
this.state = {};
this.state.graph = [];
}
storeGraph(graph = []) {
this.state.graph = graph;
}
}
app/assets/javascripts/project_find_file.js
View file @ 2bcb19dd
......@@ -2,18 +2,16 @@
/* global fuzzaldrinPlus */
(function() {
var bind = function(fn, me) { return function() { return fn.apply(me, arguments); }; };
this.ProjectFindFile = (function() {
var highlighter;
function ProjectFindFile(element1, options) {
this.element = element1;
this.options = options;
this.goToBlob = bind(this.goToBlob, this);
this.goToTree = bind(this.goToTree, this);
this.selectRowDown = bind(this.selectRowDown, this);
this.selectRowUp = bind(this.selectRowUp, this);
this.goToBlob = this.goToBlob.bind(this);
this.goToTree = this.goToTree.bind(this);
this.selectRowDown = this.selectRowDown.bind(this);
this.selectRowUp = this.selectRowUp.bind(this);
this.filePaths = {};
this.inputElement = this.element.find(".file-finder-input");
// init event
......
app/assets/javascripts/project_new.js
View file @ 2bcb19dd
......@@ -3,6 +3,10 @@
(function() {
this.ProjectNew = (function() {
function ProjectNew() {
<<<<<<< HEAD
=======
this.toggleSettings = this.toggleSettings.bind(this);
>>>>>>> upstream/master
this.$selects = $('.features select');
this.$repoSelects = this.$selects.filter('.js-repo-select');
this.$enableApprovers = $('.js-require-approvals-toggle');
......
app/assets/javascripts/right_sidebar.js
View file @ 2bcb19dd
......@@ -3,11 +3,9 @@
import Cookies from 'js-cookie';
(function() {
var bind = function(fn, me) { return function() { return fn.apply(me, arguments); }; };
this.Sidebar = (function() {
function Sidebar(currentUser) {
this.toggleTodo = bind(this.toggleTodo, this);
this.toggleTodo = this.toggleTodo.bind(this);
this.sidebar = $('aside');
this.removeListeners();
this.addEventListeners();
......
app/assets/javascripts/shortcuts.js
View file @ 2bcb19dd
......@@ -4,11 +4,9 @@
import findAndFollowLink from './shortcuts_dashboard_navigation';
(function() {
var bind = function(fn, me) { return function() { return fn.apply(me, arguments); }; };
this.Shortcuts = (function() {
function Shortcuts(skipResetBindings) {
this.onToggleHelp = bind(this.onToggleHelp, this);
this.onToggleHelp = this.onToggleHelp.bind(this);
this.enabledHelp = [];
if (!skipResetBindings) {
Mousetrap.reset();
......
app/assets/javascripts/sidebar/event_hub.js
View file @ 2bcb19dd
import Vue from 'vue';
export default new Vue();
const eventHub = new Vue();
// TODO: remove eventHub hack after code splitting refactor
window.emitSidebarEvent = (...args) => eventHub.$emit(...args);
export default eventHub;
app/assets/javascripts/single_file_diff.js
View file @ 2bcb19dd
/* eslint-disable func-names, prefer-arrow-callback, space-before-function-paren, no-var, prefer-rest-params, wrap-iife, one-var, one-var-declaration-per-line, consistent-return, no-param-reassign, max-len */
(function() {
var bind = function(fn, me) { return function() { return fn.apply(me, arguments); }; };
window.SingleFileDiff = (function() {
var COLLAPSED_HTML, ERROR_HTML, LOADING_HTML, WRAPPER;
......@@ -16,7 +14,7 @@
function SingleFileDiff(file) {
this.file = file;
this.toggleDiff = bind(this.toggleDiff, this);
this.toggleDiff = this.toggleDiff.bind(this);
this.content = $('.diff-content', this.file);
this.$toggleIcon = $('.diff-toggle-caret', this.file);
this.diffForPath = this.content.find('[data-diff-for-path]').data('diff-for-path');
......
app/assets/javascripts/u2f/authenticate.js
View file @ 2bcb19dd
......@@ -10,18 +10,16 @@
(function() {
const global = window.gl || (window.gl = {});
var bind = function(fn, me) { return function() { return fn.apply(me, arguments); }; };
global.U2FAuthenticate = (function() {
function U2FAuthenticate(container, form, u2fParams, fallbackButton, fallbackUI) {
this.container = container;
this.renderNotSupported = bind(this.renderNotSupported, this);
this.renderAuthenticated = bind(this.renderAuthenticated, this);
this.renderError = bind(this.renderError, this);
this.renderInProgress = bind(this.renderInProgress, this);
this.renderTemplate = bind(this.renderTemplate, this);
this.authenticate = bind(this.authenticate, this);
this.start = bind(this.start, this);
this.renderNotSupported = this.renderNotSupported.bind(this);
this.renderAuthenticated = this.renderAuthenticated.bind(this);
this.renderError = this.renderError.bind(this);
this.renderInProgress = this.renderInProgress.bind(this);
this.renderTemplate = this.renderTemplate.bind(this);
this.authenticate = this.authenticate.bind(this);
this.start = this.start.bind(this);
this.appId = u2fParams.app_id;
this.challenge = u2fParams.challenge;
this.form = form;
......
app/assets/javascripts/u2f/error.js
View file @ 2bcb19dd
......@@ -2,12 +2,10 @@
/* global u2f */
(function() {
var bind = function(fn, me) { return function() { return fn.apply(me, arguments); }; };
this.U2FError = (function() {
function U2FError(errorCode, u2fFlowType) {
this.errorCode = errorCode;
this.message = bind(this.message, this);
this.message = this.message.bind(this);
this.httpsDisabled = window.location.protocol !== 'https:';
this.u2fFlowType = u2fFlowType;
}
......
app/assets/javascripts/u2f/register.js
View file @ 2bcb19dd
......@@ -8,19 +8,17 @@
// State Flow #1: setup -> in_progress -> registered -> POST to server
// State Flow #2: setup -> in_progress -> error -> setup
(function() {
var bind = function(fn, me) { return function() { return fn.apply(me, arguments); }; };
this.U2FRegister = (function() {
function U2FRegister(container, u2fParams) {
this.container = container;
this.renderNotSupported = bind(this.renderNotSupported, this);
this.renderRegistered = bind(this.renderRegistered, this);
this.renderError = bind(this.renderError, this);
this.renderInProgress = bind(this.renderInProgress, this);
this.renderSetup = bind(this.renderSetup, this);
this.renderTemplate = bind(this.renderTemplate, this);
this.register = bind(this.register, this);
this.start = bind(this.start, this);
this.renderNotSupported = this.renderNotSupported.bind(this);
this.renderRegistered = this.renderRegistered.bind(this);
this.renderError = this.renderError.bind(this);
this.renderInProgress = this.renderInProgress.bind(this);
this.renderSetup = this.renderSetup.bind(this);
this.renderTemplate = this.renderTemplate.bind(this);
this.register = this.register.bind(this);
this.start = this.start.bind(this);
this.appId = u2fParams.app_id;
this.registerRequests = u2fParams.register_requests;
this.signRequests = u2fParams.sign_requests;
......
app/assets/javascripts/users/calendar.js
View file @ 2bcb19dd
......@@ -3,12 +3,10 @@
import d3 from 'd3';
(function() {
var bind = function(fn, me) { return function() { return fn.apply(me, arguments); }; };
this.Calendar = (function() {
function Calendar(timestamps, calendar_activities_path) {
this.calendar_activities_path = calendar_activities_path;
this.clickDay = bind(this.clickDay, this);
this.clickDay = this.clickDay.bind(this);
this.currentSelectedDate = '';
this.daySpace = 1;
this.daySize = 15;
......@@ -168,15 +166,23 @@ import d3 from 'd3';
};
Calendar.prototype.renderKey = function() {
var keyColors;
keyColors = ['#ededed', this.colorKey(0), this.colorKey(1), this.colorKey(2), this.colorKey(3)];
return this.svg.append('g').attr('transform', "translate(18, " + (this.daySizeWithSpace * 8 + 16) + ")").selectAll('rect').data(keyColors).enter().append('rect').attr('width', this.daySize).attr('height', this.daySize).attr('x', (function(_this) {
return function(color, i) {
return _this.daySizeWithSpace * i;
};
})(this)).attr('y', 0).attr('fill', function(color) {
return color;
});
const keyValues = ['no contributions', '1-9 contributions', '10-19 contributions', '20-29 contributions', '30+ contributions'];
const keyColors = ['#ededed', this.colorKey(0), this.colorKey(1), this.colorKey(2), this.colorKey(3)];
this.svg.append('g')
.attr('transform', `translate(18, ${this.daySizeWithSpace * 8 + 16})`)
.selectAll('rect')
.data(keyColors)
.enter()
.append('rect')
.attr('width', this.daySize)
.attr('height', this.daySize)
.attr('x', (color, i) => this.daySizeWithSpace * i)
.attr('y', 0)
.attr('fill', color => color)
.attr('class', 'js-tooltip')
.attr('title', (color, i) => keyValues[i])
.attr('data-container', 'body');
};
Calendar.prototype.initColor = function() {
......
app/assets/javascripts/users_select.js
View file @ 2bcb19dd
/* eslint-disable func-names, space-before-function-paren, one-var, no-var, prefer-rest-params, wrap-iife, quotes, max-len, one-var-declaration-per-line, vars-on-top, prefer-arrow-callback, consistent-return, comma-dangle, object-shorthand, no-shadow, no-unused-vars, no-else-return, no-self-compare, prefer-template, no-unused-expressions, no-lonely-if, yoda, prefer-spread, no-void, camelcase, no-param-reassign */
/* global Issuable */
/* global emitSidebarEvent */
import eventHub from './sidebar/event_hub';
// TODO: remove eventHub hack after code splitting refactor
window.emitSidebarEvent = window.emitSidebarEvent || $.noop;
(function() {
var bind = function(fn, me) { return function() { return fn.apply(me, arguments); }; },
slice = [].slice;
const slice = [].slice;
this.UsersSelect = (function() {
function UsersSelect(currentUser, els) {
var $els;
this.users = bind(this.users, this);
this.user = bind(this.user, this);
this.users = this.users.bind(this);
this.user = this.user.bind(this);
this.usersPath = "/autocomplete/users.json";
this.userPath = "/autocomplete/users/:id.json";
if (currentUser != null) {
......@@ -110,7 +111,7 @@ import eventHub from './sidebar/event_hub';
.find(`input[name='${$dropdown.data('field-name')}'][value=${firstSelectedId}]`);
firstSelected.remove();
eventHub.$emit('sidebar.removeAssignee', {
emitSidebarEvent('sidebar.removeAssignee', {
id: firstSelectedId,
});
}
......@@ -330,7 +331,7 @@ import eventHub from './sidebar/event_hub';
defaultLabel: defaultLabel,
hidden: function(e) {
if ($dropdown.hasClass('js-multiselect')) {
eventHub.$emit('sidebar.saveAssignees');
emitSidebarEvent('sidebar.saveAssignees');
}
if (!$dropdown.data('always-show-selectbox')) {
......@@ -364,10 +365,10 @@ import eventHub from './sidebar/event_hub';
const id = parseInt(element.value, 10);
element.remove();
});
eventHub.$emit('sidebar.removeAllAssignees');
emitSidebarEvent('sidebar.removeAllAssignees');
} else if (isActive) {
// user selected
eventHub.$emit('sidebar.addAssignee', user);
emitSidebarEvent('sidebar.addAssignee', user);
// Remove unassigned selection (if it was previously selected)
const unassignedSelected = $dropdown.closest('.selectbox')
......@@ -383,7 +384,7 @@ import eventHub from './sidebar/event_hub';
}
// User unselected
eventHub.$emit('sidebar.removeAssignee', user);
emitSidebarEvent('sidebar.removeAssignee', user);
}
if (getSelected().find(u => u === gon.current_user_id)) {
......
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_deployment.js
View file @ 2bcb19dd
......@@ -108,8 +108,11 @@ export default {
</div>
<mr-widget-memory-usage
v-if="deployment.metrics_url"
<<<<<<< HEAD
:mr="mr"
:service="service"
=======
>>>>>>> upstream/master
:metricsUrl="deployment.metrics_url"
/>
</div>
......
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_memory_usage.js
View file @ 2bcb19dd
......@@ -5,8 +5,11 @@ import MRWidgetService from '../services/mr_widget_service';
export default {
name: 'MemoryUsage',
props: {
<<<<<<< HEAD
mr: { type: Object, required: true },
service: { type: Object, required: true },
=======
>>>>>>> upstream/master
metricsUrl: { type: String, required: true },
},
data() {
......@@ -14,6 +17,10 @@ export default {
// memoryFrom: 0,
// memoryTo: 0,
memoryMetrics: [],
<<<<<<< HEAD
=======
deploymentTime: 0,
>>>>>>> upstream/master
hasMetrics: false,
loadFailed: false,
loadingMetrics: true,
......@@ -23,8 +30,27 @@ export default {
components: {
'mr-memory-graph': MemoryGraph,
},
<<<<<<< HEAD
methods: {
computeGraphData(metrics) {
=======
computed: {
shouldShowLoading() {
return this.loadingMetrics && !this.hasMetrics && !this.loadFailed;
},
shouldShowMemoryGraph() {
return !this.loadingMetrics && this.hasMetrics && !this.loadFailed;
},
shouldShowLoadFailure() {
return !this.loadingMetrics && !this.hasMetrics && this.loadFailed;
},
shouldShowMetricsUnavailable() {
return !this.loadingMetrics && !this.hasMetrics && !this.loadFailed;
},
},
methods: {
computeGraphData(metrics, deploymentTime) {
>>>>>>> upstream/master
this.loadingMetrics = false;
const { memory_values } = metrics;
// if (memory_previous.length > 0) {
......@@ -38,6 +64,7 @@ export default {
if (memory_values.length > 0) {
this.hasMetrics = true;
this.memoryMetrics = memory_values[0].values;
<<<<<<< HEAD
}
},
},
......@@ -80,11 +107,58 @@ export default {
<p
v-if="loadingMetrics"
class="usage-info usage-info-loading">
=======
this.deploymentTime = deploymentTime;
}
},
loadMetrics() {
gl.utils.backOff((next, stop) => {
MRWidgetService.fetchMetrics(this.metricsUrl)
.then((res) => {
if (res.status === statusCodes.NO_CONTENT) {
this.backOffRequestCounter = this.backOffRequestCounter += 1;
/* eslint-disable no-unused-expressions */
this.backOffRequestCounter < 3 ? next() : stop(res);
} else {
stop(res);
}
})
.catch(stop);
})
.then((res) => {
if (res.status === statusCodes.NO_CONTENT) {
return res;
}
return res.json();
})
.then((res) => {
this.computeGraphData(res.metrics, res.deployment_time);
return res;
})
.catch(() => {
this.loadFailed = true;
this.loadingMetrics = false;
});
},
},
mounted() {
this.loadingMetrics = true;
this.loadMetrics();
},
template: `
<div class="mr-info-list clearfix mr-memory-usage js-mr-memory-usage">
<div class="legend"></div>
<p
v-if="shouldShowLoading"
class="usage-info js-usage-info usage-info-loading">
>>>>>>> upstream/master
<i
class="fa fa-spinner fa-spin usage-info-load-spinner"
aria-hidden="true" />Loading deployment statistics.
</p>
<p
<<<<<<< HEAD
v-if="!hasMetrics && !loadingMetrics"
class="usage-info usage-info-loading">
Deployment statistics are not available currently.
......@@ -102,6 +176,26 @@ export default {
<mr-memory-graph
v-if="hasMetrics"
:metrics="memoryMetrics"
=======
v-if="shouldShowMemoryGraph"
class="usage-info js-usage-info">
Deployment memory usage:
</p>
<p
v-if="shouldShowLoadFailure"
class="usage-info js-usage-info usage-info-failed">
Failed to load deployment statistics.
</p>
<p
v-if="shouldShowMetricsUnavailable"
class="usage-info js-usage-info usage-info-unavailable">
Deployment statistics are not available currently.
</p>
<mr-memory-graph
v-if="shouldShowMemoryGraph"
:metrics="memoryMetrics"
:deploymentTime="deploymentTime"
>>>>>>> upstream/master
height="25"
width="100" />
</div>
......
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js
View file @ 2bcb19dd
......@@ -67,16 +67,22 @@ export default {
return Boolean(!commitMessage.length
|| !this.isMergeAllowed()
|| this.isMakingRequest
<<<<<<< HEAD
|| this.isApprovalNeeded
=======
>>>>>>> upstream/master
|| this.mr.preventMerge);
},
shouldShowSquashBeforeMerge() {
const { commitsCount, enableSquashBeforeMerge } = this.mr;
return enableSquashBeforeMerge && commitsCount > 1;
},
<<<<<<< HEAD
isApprovalNeeded() {
return this.mr.approvalsRequired ? !this.mr.isApproved : false;
},
=======
>>>>>>> upstream/master
},
methods: {
isMergeAllowed() {
......@@ -267,6 +273,7 @@ export default {
:mr="mr"
:is-merge-button-disabled="isMergeButtonDisabled" />
<<<<<<< HEAD
<span v-if="mr.ffOnlyEnabled">
Fast-forward merge without a merge commit
</span>
......@@ -280,6 +287,15 @@ export default {
</button>
</span>
=======
<button
@click="toggleCommitMessageEditor"
:disabled="isMergeButtonDisabled"
class="btn btn-default btn-xs"
type="button">
Modify commit message
</button>
>>>>>>> upstream/master
<div
v-if="showCommitMessageEditor"
class="prepend-top-default commit-message-editor">
......
app/assets/javascripts/vue_merge_request_widget/dependencies.js
View file @ 2bcb19dd
<<<<<<< HEAD
=======
/**
* This file is the centerpiece of an attempt to reduce potential conflicts
* between the CE and EE versions of the MR widget. EE additions to the MR widget should
* be contained in the ./vue_merge_request_widget/ee directory, and should **extend**
* rather than mutate CE MR Widget code.
*
* This file should be the only source of conflicts between EE and CE. EE-only components should
* imported directly where they are needed, and import paths for EE extensions of CE components
* should overwrite import paths **without** changing the order of dependencies listed here.
*/
>>>>>>> upstream/master
export { default as Vue } from 'vue';
export { default as SmartInterval } from '~/smart_interval';
export { default as WidgetHeader } from './components/mr_widget_header';
......@@ -15,13 +29,18 @@ export { default as ConflictsState } from './components/states/mr_widget_conflic
export { default as NothingToMergeState } from './components/states/mr_widget_nothing_to_merge';
export { default as MissingBranchState } from './components/states/mr_widget_missing_branch';
export { default as NotAllowedState } from './components/states/mr_widget_not_allowed';
<<<<<<< HEAD
export { default as ReadyToMergeState } from './ee/components/states/mr_widget_ready_to_merge';
=======
export { default as ReadyToMergeState } from './components/states/mr_widget_ready_to_merge';
>>>>>>> upstream/master
export { default as UnresolvedDiscussionsState } from './components/states/mr_widget_unresolved_discussions';
export { default as PipelineBlockedState } from './components/states/mr_widget_pipeline_blocked';
export { default as PipelineFailedState } from './components/states/mr_widget_pipeline_failed';
export { default as MergeWhenPipelineSucceedsState } from './components/states/mr_widget_merge_when_pipeline_succeeds';
export { default as AutoMergeFailed } from './components/states/mr_widget_auto_merge_failed';
export { default as CheckingState } from './components/states/mr_widget_checking';
<<<<<<< HEAD
export { default as MRWidgetStore } from './ee/stores/mr_widget_store';
export { default as MRWidgetService } from './ee/services/mr_widget_service';
export { default as eventHub } from './event_hub';
......@@ -29,3 +48,12 @@ export { default as getStateKey } from './ee/stores/get_state_key';
export { default as mrWidgetOptions } from './ee/mr_widget_options';
export { default as stateMaps } from './ee/stores/state_maps';
export { default as SquashBeforeMerge } from './ee/components/states/mr_widget_squash_before_merge';
=======
export { default as MRWidgetStore } from './stores/mr_widget_store';
export { default as MRWidgetService } from './services/mr_widget_service';
export { default as eventHub } from './event_hub';
export { default as getStateKey } from './stores/get_state_key';
export { default as mrWidgetOptions } from './mr_widget_options';
export { default as stateMaps } from './stores/state_maps';
export { default as SquashBeforeMerge } from './components/states/mr_widget_squash_before_merge';
>>>>>>> upstream/master
app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js
View file @ 2bcb19dd
......@@ -69,8 +69,11 @@ export default {
ciEnvironmentsStatusPath: store.ciEnvironmentsStatusPath,
statusPath: store.statusPath,
mergeActionsContentPath: store.mergeActionsContentPath,
<<<<<<< HEAD
rebasePath: store.rebasePath,
approvalsPath: store.approvalsPath,
=======
>>>>>>> upstream/master
};
return new MRWidgetService(endpoints);
},
......
app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
View file @ 2bcb19dd
......@@ -11,9 +11,12 @@ export default class MergeRequestStore {
const currentUser = data.current_user;
const pipelineStatus = data.pipeline ? data.pipeline.details.status : null;
<<<<<<< HEAD
// EE specific
this.squash = data.squash;
=======
>>>>>>> upstream/master
this.title = data.title;
this.targetBranch = data.target_branch;
this.sourceBranch = data.source_branch;
......
app/assets/javascripts/vue_shared/ci_action_icons.js 0 → 100644
View file @ 2bcb19dd
import cancelSVG from 'icons/_icon_action_cancel.svg';
import retrySVG from 'icons/_icon_action_retry.svg';
import playSVG from 'icons/_icon_action_play.svg';
import stopSVG from 'icons/_icon_action_stop.svg';
export default function getActionIcon(action) {
let icon;
switch (action) {
case 'icon_action_cancel':
icon = cancelSVG;
break;
case 'icon_action_retry':
icon = retrySVG;
break;
case 'icon_action_play':
icon = playSVG;
break;
case 'icon_action_stop':
icon = stopSVG;
break;
default:
icon = '';
}
return icon;
}
app/assets/javascripts/vue_shared/ci_status_icons.js 0 → 100644
View file @ 2bcb19dd
import BORDERLESS_CANCELED_SVG from 'icons/_icon_status_canceled_borderless.svg';
import BORDERLESS_CREATED_SVG from 'icons/_icon_status_created_borderless.svg';
import BORDERLESS_FAILED_SVG from 'icons/_icon_status_failed_borderless.svg';
import BORDERLESS_MANUAL_SVG from 'icons/_icon_status_manual_borderless.svg';
import BORDERLESS_PENDING_SVG from 'icons/_icon_status_pending_borderless.svg';
import BORDERLESS_RUNNING_SVG from 'icons/_icon_status_running_borderless.svg';
import BORDERLESS_SKIPPED_SVG from 'icons/_icon_status_skipped_borderless.svg';
import BORDERLESS_SUCCESS_SVG from 'icons/_icon_status_success_borderless.svg';
import BORDERLESS_WARNING_SVG from 'icons/_icon_status_warning_borderless.svg';
import CANCELED_SVG from 'icons/_icon_status_canceled.svg';
import CREATED_SVG from 'icons/_icon_status_created.svg';
import FAILED_SVG from 'icons/_icon_status_failed.svg';
import MANUAL_SVG from 'icons/_icon_status_manual.svg';
import PENDING_SVG from 'icons/_icon_status_pending.svg';
import RUNNING_SVG from 'icons/_icon_status_running.svg';
import SKIPPED_SVG from 'icons/_icon_status_skipped.svg';
import SUCCESS_SVG from 'icons/_icon_status_success.svg';
import WARNING_SVG from 'icons/_icon_status_warning.svg';
export const borderlessStatusIconEntityMap = {
icon_status_canceled: BORDERLESS_CANCELED_SVG,
icon_status_created: BORDERLESS_CREATED_SVG,
icon_status_failed: BORDERLESS_FAILED_SVG,
icon_status_manual: BORDERLESS_MANUAL_SVG,
icon_status_pending: BORDERLESS_PENDING_SVG,
icon_status_running: BORDERLESS_RUNNING_SVG,
icon_status_skipped: BORDERLESS_SKIPPED_SVG,
icon_status_success: BORDERLESS_SUCCESS_SVG,
icon_status_warning: BORDERLESS_WARNING_SVG,
};
export const statusIconEntityMap = {
icon_status_canceled: CANCELED_SVG,
icon_status_created: CREATED_SVG,
icon_status_failed: FAILED_SVG,
icon_status_manual: MANUAL_SVG,
icon_status_pending: PENDING_SVG,
icon_status_running: RUNNING_SVG,
icon_status_skipped: SKIPPED_SVG,
icon_status_success: SUCCESS_SVG,
icon_status_warning: WARNING_SVG,
};
export const statusCssClasses = {
icon_status_canceled: 'canceled',
icon_status_created: 'created',
icon_status_failed: 'failed',
icon_status_manual: 'manual',
icon_status_pending: 'pending',
icon_status_running: 'running',
icon_status_skipped: 'skipped',
icon_status_success: 'success',
icon_status_warning: 'warning',
};
app/assets/javascripts/vue_shared/components/ci_icon.vue 0 → 100644
View file @ 2bcb19dd
<script>
import { statusIconEntityMap, statusCssClasses } from '../../vue_shared/ci_status_icons';
export default {
props: {
status: {
type: Object,
required: true,
},
},
computed: {
statusIconSvg() {
return statusIconEntityMap[this.status.icon];
},
cssClass() {
const status = statusCssClasses[this.status.icon];
return `ci-status-icon ci-status-icon-${status} js-ci-status-icon-${status}`;
},
},
};
</script>
<template>
<span
:class="cssClass"
v-html="statusIconSvg">
</span>
</template>
app/assets/javascripts/vue_shared/components/memory_graph.js
View file @ 2bcb19dd
......@@ -2,6 +2,10 @@ export default {
name: 'MemoryGraph',
props: {
metrics: { type: Array, required: true },
<<<<<<< HEAD
=======
deploymentTime: { type: Number, required: true },
>>>>>>> upstream/master
width: { type: String, required: true },
height: { type: String, required: true },
},
......@@ -9,6 +13,7 @@ export default {
return {
pathD: '',
pathViewBox: '',
<<<<<<< HEAD
// dotX: '',
// dotY: '',
};
......@@ -30,6 +35,107 @@ export default {
<svg :width="width" :height="height" xmlns="http://www.w3.org/2000/svg">
<path :d="pathD" :viewBox="pathViewBox" />
<!--<circle r="0.8" :cx="dotX" :cy="dotY" tranform="translate(0 -1)" /> -->
=======
dotX: '',
dotY: '',
};
},
computed: {
getFormattedMedian() {
const deployedSince = gl.utils.getTimeago().format(this.deploymentTime * 1000);
return `Deployed ${deployedSince}`;
},
},
methods: {
/**
* Returns metric value index in metrics array
* with timestamp closest to matching median
*/
getMedianMetricIndex(median, metrics) {
let matchIndex = 0;
let timestampDiff = 0;
let smallestDiff = 0;
const metricTimestamps = metrics.map(v => v[0]);
// Find metric timestamp which is closest to deploymentTime
timestampDiff = Math.abs(metricTimestamps[0] - median);
metricTimestamps.forEach((timestamp, index) => {
if (index === 0) { // Skip first element
return;
}
smallestDiff = Math.abs(timestamp - median);
if (smallestDiff < timestampDiff) {
matchIndex = index;
timestampDiff = smallestDiff;
}
});
return matchIndex;
},
/**
* Get Graph Plotting values to render Line and Dot
*/
getGraphPlotValues(median, metrics) {
const renderData = metrics.map(v => v[1]);
const medianMetricIndex = this.getMedianMetricIndex(median, metrics);
let cx = 0;
let cy = 0;
// Find Maximum and Minimum values from `renderData` array
const maxMemory = Math.max.apply(null, renderData);
const minMemory = Math.min.apply(null, renderData);
// Find difference between extreme ends
const diff = maxMemory - minMemory;
const lineWidth = renderData.length;
// Iterate over metrics values and perform following
// 1. Find x & y co-ords for deploymentTime's memory value
// 2. Return line path against maxMemory
const linePath = renderData.map((y, x) => {
if (medianMetricIndex === x) {
cx = x;
cy = maxMemory - y;
}
return `${x} ${maxMemory - y}`;
});
return {
pathD: linePath,
pathViewBox: {
lineWidth,
diff,
},
dotX: cx,
dotY: cy,
};
},
/**
* Render Graph based on provided median and metrics values
*/
renderGraph(median, metrics) {
const { pathD, pathViewBox, dotX, dotY } = this.getGraphPlotValues(median, metrics);
// Set props and update graph on UI.
this.pathD = `M ${pathD}`;
this.pathViewBox = `0 0 ${pathViewBox.lineWidth} ${pathViewBox.diff}`;
this.dotX = dotX;
this.dotY = dotY;
},
},
mounted() {
this.renderGraph(this.deploymentTime, this.metrics);
},
template: `
<div class="memory-graph-container">
<svg class="has-tooltip" :title="getFormattedMedian" :width="width" :height="height" xmlns="http://www.w3.org/2000/svg">
<path :d="pathD" :viewBox="pathViewBox" />
<circle r="1.5" :cx="dotX" :cy="dotY" tranform="translate(0 -1)" />
>>>>>>> upstream/master
</svg>
</div>
`,
......
app/assets/javascripts/vue_shared/components/table_pagination.js → app/assets/javascripts/vue_shared/components/table_pagination.vue
View file @ 2bcb19dd
<script>
const PAGINATION_UI_BUTTON_LIMIT = 4;
const UI_LIMIT = 6;
const SPREAD = '...';
......@@ -114,22 +115,23 @@ export default {
return items;
},
},
template: `
<div class="gl-pagination">
<ul class="pagination clearfix">
<li v-for='item in getItems'
:class='{
page: item.page,
prev: item.prev,
next: item.next,
separator: item.separator,
active: item.active,
disabled: item.disabled
}'
>
<a @click="changePage($event)">{{item.title}}</a>
</li>
</ul>
</div>
`,
};
</script>
<template>
<div class="gl-pagination">
<ul class="pagination clearfix">
<li
v-for="item in getItems"
:class="{
page: item.page,
prev: item.prev,
next: item.next,
separator: item.separator,
active: item.active,
disabled: item.disabled
}">
<a @click="changePage($event)">{{item.title}}</a>
</li>
</ul>
</div>
</template>
app/assets/javascripts/vue_shared/mixins/tooltip.js 0 → 100644
View file @ 2bcb19dd
export default {
mounted() {
$(this.$refs.tooltip).tooltip();
},
updated() {
$(this.$refs.tooltip).tooltip('fixTitle');
},
};
app/assets/stylesheets/framework/files.scss
View file @ 2bcb19dd
......@@ -4,13 +4,14 @@
*/
.file-holder {
border: 1px solid $border-color;
border-radius: $border-radius-default;
&.file-holder-no-border {
border: 0;
}
&.readme-holder {
margin: $gl-padding-top 0;
margin: $gl-padding 0;
}
table {
......@@ -25,7 +26,7 @@
text-align: left;
padding: 10px $gl-padding;
word-wrap: break-word;
border-radius: 3px 3px 0 0;
border-radius: $border-radius-default $border-radius-default 0 0;
&.file-title-clear {
padding-left: 0;
......@@ -94,9 +95,16 @@
tr {
border-bottom: 1px solid $blame-border;
&:last-child {
border-bottom: none;
}
}
td {
border-top: none;
border-bottom: none;
&:first-child {
border-left: none;
}
......@@ -107,7 +115,7 @@
}
td.blame-commit {
padding: 0 10px;
padding: 5px 10px;
min-width: 400px;
background: $gray-light;
}
......@@ -246,7 +254,7 @@ span.idiff {
border-bottom: 1px solid $border-color;
padding: 5px $gl-padding;
margin: 0;
border-radius: 3px 3px 0 0;
border-radius: $border-radius-default $border-radius-default 0 0;
.file-header-content {
white-space: nowrap;
......
app/assets/stylesheets/framework/lists.scss
View file @ 2bcb19dd
......@@ -152,12 +152,16 @@ ul.content-list {
margin-top: 3px;
margin-bottom: 4px;
<<<<<<< HEAD
&.btn-ldap-override {
@media (min-width: $screen-sm-min) {
margin-bottom: 0;
}
}
=======
&.has-tooltip,
>>>>>>> upstream/master
&:last-child {
margin-right: 0;
......
app/assets/stylesheets/framework/memory_graph.scss
View file @ 2bcb19dd
.memory-graph-container {
svg {
background: $white-light;
<<<<<<< HEAD
=======
cursor: pointer;
&:hover {
box-shadow: 0 0 4px $gray-darkest inset;
}
>>>>>>> upstream/master
}
path {
fill: none;
stroke: $blue-500;
<<<<<<< HEAD
stroke-width: 1px;
=======
stroke-width: 2px;
>>>>>>> upstream/master
}
circle {
stroke: $blue-700;
fill: $blue-700;
<<<<<<< HEAD
=======
stroke-width: 4px;
>>>>>>> upstream/master
}
}
app/assets/stylesheets/framework/variables.scss
View file @ 2bcb19dd
......@@ -163,7 +163,7 @@ $fixed-layout-width: 1280px;
$limited-layout-width: 990px;
$gl-avatar-size: 40px;
$error-exclamation-point: $red-500;
$border-radius-default: 2px;
$border-radius-default: 3px;
$settings-icon-size: 18px;
$provider-btn-not-active-color: $blue-500;
$link-underline-blue: $blue-500;
......
app/assets/stylesheets/pages/commits.scss
View file @ 2bcb19dd
......@@ -163,7 +163,6 @@
.avatar-cell {
width: 46px;
padding-left: 10px;
img {
margin-right: 0;
......@@ -175,7 +174,6 @@
justify-content: space-between;
align-items: flex-start;
flex-grow: 1;
padding-left: 10px;
.merge-request-branches & {
flex-direction: column;
......
app/assets/stylesheets/pages/diff.scss
View file @ 2bcb19dd
// Common
.diff-file {
border: 1px solid $border-color;
margin-bottom: $gl-padding;
border-radius: 3px;
.commit-short-id {
font-family: $regular_font;
font-weight: 400;
}
.diff-header {
position: relative;
background: $gray-light;
border-bottom: 1px solid $border-color;
padding: 10px 16px;
color: $gl-text-color;
z-index: 10;
border-radius: 3px 3px 0 0;
.diff-title {
font-family: $monospace_font;
word-break: break-all;
display: block;
.file-mode {
color: $file-mode-changed;
}
}
.commit-short-id {
font-family: $monospace_font;
font-size: smaller;
}
}
.file-title,
.file-title-flex-parent {
cursor: pointer;
......
app/assets/stylesheets/pages/merge_requests.scss
View file @ 2bcb19dd
......@@ -131,12 +131,6 @@
line-height: 16px;
}
@media (min-width: $screen-sm-min) {
.stage-cell {
padding: 0 4px;
}
}
@media (max-width: $screen-xs-max) {
order: 1;
margin-top: $gl-padding-top;
......@@ -182,8 +176,12 @@
}
&.mr-memory-usage {
<<<<<<< HEAD
margin-top: 10px;
margin-bottom: 10px;
=======
margin: 5px 0 10px 25px;
>>>>>>> upstream/master
}
}
......@@ -506,14 +504,19 @@
background: $border-color;
position: absolute;
top: -5px;
<<<<<<< HEAD
}
}
.mr-info-list.mr-memory-usage {
.legend {
height: 75%;
=======
>>>>>>> upstream/master
}
}
<<<<<<< HEAD
p {
float: left;
padding-left: 20px;
......@@ -523,6 +526,30 @@
}
}
.memory-graph-container {
float: left;
margin-left: 5px;
=======
.mr-info-list.mr-memory-usage {
.legend {
height: 65%;
top: 0;
@media (max-width: $screen-xs-max) {
height: 20px;
}
}
p {
float: left;
padding-left: 20px;
&::before {
top: 13px;
}
>>>>>>> upstream/master
}
.memory-graph-container {
float: left;
margin-left: 5px;
......@@ -730,6 +757,7 @@
}
}
<<<<<<< HEAD
#merge-request-widget-app .loading {
padding-top: 5px;
border-top: 1px solid $well-inner-border;
......@@ -831,6 +859,18 @@
margin-right: 10px;
font-size: 16px;
}
=======
.mr-memory-usage {
p.usage-info-loading,
p.usage-info-unavailable,
p.usage-info-failed {
margin-bottom: 5px;
}
p.usage-info-loading .usage-info-load-spinner {
margin-right: 10px;
font-size: 16px;
>>>>>>> upstream/master
}
@media (max-width: $screen-md-min) {
......
app/assets/stylesheets/pages/notes.scss
View file @ 2bcb19dd
......@@ -284,10 +284,6 @@ ul.notes {
}
}
.diff-header > span {
margin-right: 10px;
}
.line_content {
white-space: pre-wrap;
}
......
app/assets/stylesheets/pages/pipeline_schedules.scss 0 → 100644
View file @ 2bcb19dd
.js-pipeline-schedule-form {
.dropdown-select,
.dropdown-menu-toggle {
width: 100%!important;
}
.gl-field-error {
margin: 10px 0 0;
}
}
.interval-pattern-form-group {
label {
margin-right: 10px;
font-size: 12px;
&[for='custom'] {
margin-right: 0;
}
}
.cron-interval-input-wrapper {
padding-left: 0;
}
.cron-interval-input {
margin: 10px 10px 0 0;
}
.cron-syntax-link-wrap {
margin-right: 10px;
font-size: 12px;
}
.cron-unset-status {
padding-top: 16px;
margin-left: -16px;
color: $gl-text-color-secondary;
font-size: 12px;
font-weight: 600;
}
}
.pipeline-schedule-table-row {
.branch-name-cell {
max-width: 300px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.next-run-cell {
color: $gl-text-color-secondary;
}
a {
color: $text-color;
}
}
.pipeline-schedules-user-callout {
.bordered-box.content-block {
border: 1px solid $border-color;
background-color: transparent;
padding: 16px;
}
#dismiss-callout-btn {
color: $gl-text-color;
}
}
app/assets/stylesheets/pages/pipelines.scss
View file @ 2bcb19dd
......@@ -261,7 +261,7 @@
.stage-cell {
font-size: 0;
padding: 10px 4px;
padding: 0 4px;
> .stage-container > div > button > span > svg,
> .stage-container > button > svg {
......@@ -490,7 +490,7 @@
color: $gl-text-color-secondary;
// Action Icons in big pipeline-graph nodes
> .ci-action-icon-container .ci-action-icon-wrapper {
> div > .ci-action-icon-container .ci-action-icon-wrapper {
height: 30px;
width: 30px;
background: $white-light;
......@@ -515,7 +515,7 @@
}
}
> .ci-action-icon-container {
> div > .ci-action-icon-container {
position: absolute;
right: 5px;
top: 5px;
......@@ -545,7 +545,7 @@
}
}
> .build-content {
> div > .build-content {
display: inline-block;
padding: 8px 10px 9px;
width: 100%;
......@@ -561,34 +561,6 @@
}
.arrow {
&::before,
&::after {
content: '';
display: inline-block;
position: absolute;
width: 0;
height: 0;
border-color: transparent;
border-style: solid;
top: 18px;
}
&::before {
left: -5px;
margin-top: -6px;
border-width: 7px 5px 7px 0;
border-right-color: $border-color;
}
&::after {
left: -4px;
margin-top: -9px;
border-width: 10px 7px 10px 0;
border-right-color: $white-light;
}
}
// Connect first build in each stage with right horizontal line
&:first-child {
&::after {
......@@ -863,7 +835,8 @@
border-radius: 3px;
// build name
.ci-build-text {
.ci-build-text,
.ci-status-text {
font-weight: 200;
overflow: hidden;
white-space: nowrap;
......@@ -915,6 +888,38 @@
}
}
/**
* Top arrow in the dropdown in the big pipeline graph
*/
.big-pipeline-graph-dropdown-menu {
&::before,
&::after {
content: '';
display: inline-block;
position: absolute;
width: 0;
height: 0;
border-color: transparent;
border-style: solid;
top: 18px;
}
&::before {
left: -5px;
margin-top: -6px;
border-width: 7px 5px 7px 0;
border-right-color: $border-color;
}
&::after {
left: -4px;
margin-top: -9px;
border-width: 10px 7px 10px 0;
border-right-color: $white-light;
}
}
/**
* Top arrow in the dropdown in the mini pipeline graph
*/
......
app/assets/stylesheets/pages/tree.scss
View file @ 2bcb19dd
......@@ -138,11 +138,12 @@
.blob-commit-info {
list-style: none;
background: $gray-light;
padding: 16px 16px 16px 6px;
border: 1px solid $border-color;
border-bottom: none;
margin: 0;
padding: 0;
}
.blob-content-holder {
margin-top: $gl-padding;
}
.blob-upload-dropzone-previews {
......
app/controllers/concerns/issuable_collections.rb
View file @ 2bcb19dd
......@@ -47,7 +47,7 @@ module IssuableCollections
end
def merge_requests_collection
merge_requests_finder.execute.preload(:source_project, :target_project, :author, :assignee, :labels, :milestone, :merge_request_diff, target_project: :namespace)
merge_requests_finder.execute.preload(:source_project, :target_project, :author, :assignee, :labels, :milestone, :merge_request_diff, :head_pipeline, target_project: :namespace)
end
def issues_finder
......
app/controllers/projects/application_controller.rb
View file @ 2bcb19dd
......@@ -40,13 +40,15 @@ class Projects::ApplicationController < ApplicationController
(current_user && current_user.already_forked?(project))
end
def authorize_project!(action)
return access_denied! unless can?(current_user, action, project)
def authorize_action!(action)
unless can?(current_user, action, project)
return access_denied!
end
end
def method_missing(method_sym, *arguments, &block)
if method_sym.to_s =~ /\Aauthorize_(.*)!\z/
authorize_project!($1.to_sym)
authorize_action!($1.to_sym)
else
super
end
......
app/controllers/projects/branches_controller.rb
View file @ 2bcb19dd
......@@ -73,15 +73,23 @@ class Projects::BranchesController < Projects::ApplicationController
def destroy
@branch_name = Addressable::URI.unescape(params[:id])
status = DeleteBranchService.new(project, current_user).execute(@branch_name)
result = DeleteBranchService.new(project, current_user).execute(@branch_name)
respond_to do |format|
format.html do
redirect_to namespace_project_branches_path(@project.namespace,
@project), status: 303
flash_type = result[:status] == :error ? :alert : :notice
flash[flash_type] = result[:message]
redirect_to namespace_project_branches_path(@project.namespace, @project), status: 303
end
<<<<<<< HEAD
format.js { render nothing: true, status: status[:return_code] }
format.json { render json: { message: status[:message] }, status: status[:return_code] }
=======
format.js { render nothing: true, status: result[:return_code] }
format.json { render json: { message: result[:message] }, status: result[:return_code] }
>>>>>>> upstream/master
end
end
......
app/controllers/projects/builds_controller.rb
View file @ 2bcb19dd
class Projects::BuildsController < Projects::ApplicationController
before_action :build, except: [:index, :cancel_all]
before_action :authorize_read_build!, only: [:index, :show, :status, :raw, :trace]
before_action :authorize_update_build!, except: [:index, :show, :status, :raw, :trace]
before_action :authorize_read_build!,
only: [:index, :show, :status, :raw, :trace]
before_action :authorize_update_build!,
except: [:index, :show, :status, :raw, :trace, :cancel_all]
layout 'project'
def index
......@@ -28,7 +32,12 @@ class Projects::BuildsController < Projects::ApplicationController
end
def cancel_all
@project.builds.running_or_pending.each(&:cancel)
return access_denied! unless can?(current_user, :update_build, project)
@project.builds.running_or_pending.each do |build|
build.cancel if can?(current_user, :update_build, build)
end
redirect_to namespace_project_builds_path(project.namespace, project)
end
......@@ -82,7 +91,7 @@ class Projects::BuildsController < Projects::ApplicationController
def status
render json: BuildSerializer
.new(project: @project, user: @current_user)
.new(project: @project, current_user: @current_user)
.represent_status(@build)
end
......@@ -107,8 +116,13 @@ class Projects::BuildsController < Projects::ApplicationController
private
def authorize_update_build!
return access_denied! unless can?(current_user, :update_build, build)
end
def build
@build ||= project.builds.find_by!(id: params[:id]).present(current_user: current_user)
@build ||= project.builds.find(params[:id])
.present(current_user: current_user)
end
def build_path(build)
......
app/controllers/projects/environments_controller.rb
View file @ 2bcb19dd
......@@ -18,7 +18,7 @@ class Projects::EnvironmentsController < Projects::ApplicationController
format.json do
render json: {
environments: EnvironmentSerializer
.new(project: @project, user: @current_user)
.new(project: @project, current_user: @current_user)
.with_pagination(request, response)
.within_folders
.represent(@environments),
......@@ -38,7 +38,7 @@ class Projects::EnvironmentsController < Projects::ApplicationController
format.json do
render json: {
environments: EnvironmentSerializer
.new(project: @project, user: @current_user)
.new(project: @project, current_user: @current_user)
.with_pagination(request, response)
.represent(@environments),
available_count: folder_environments.available.count,
......
app/controllers/projects/issues_controller.rb
View file @ 2bcb19dd
......@@ -235,7 +235,7 @@ class Projects::IssuesController < Projects::ApplicationController
def issue
# The Sortable default scope causes performance issues when used with find_by
@noteable = @issue ||= @project.issues.where(iid: params[:id]).reorder(nil).take || redirect_old
@noteable = @issue ||= @project.issues.where(iid: params[:id]).reorder(nil).take!
end
alias_method :subscribable_resource, :issue
alias_method :issuable, :issue
......@@ -274,21 +274,6 @@ class Projects::IssuesController < Projects::ApplicationController
end
end
# Since iids are implemented only in 6.1
# user may navigate to issue page using old global ids.
#
# To prevent 404 errors we provide a redirect to correct iids until 7.0 release
#
def redirect_old
issue = @project.issues.find_by(id: params[:id])
if issue
redirect_to issue_path(issue)
else
raise ActiveRecord::RecordNotFound.new
end
end
def issue_params
params.require(:issue).permit(
:title, :position, :description, :confidential, :weight,
......
app/controllers/projects/merge_requests_controller.rb
View file @ 2bcb19dd
......@@ -10,10 +10,14 @@ class Projects::MergeRequestsController < Projects::ApplicationController
before_action :module_enabled
before_action :merge_request, only: [
:edit, :update, :show, :diffs, :commits, :conflicts, :conflict_for_path, :pipelines, :merge, :merge_check,
<<<<<<< HEAD
:pipeline_status, :ci_environments_status, :toggle_subscription, :cancel_merge_when_pipeline_succeeds,
:remove_wip, :resolve_conflicts, :assign_related_issues, :commit_change_content,
# EE
:approve, :approvals, :unapprove, :rebase
=======
:pipeline_status, :ci_environments_status, :toggle_subscription, :cancel_merge_when_pipeline_succeeds, :remove_wip, :resolve_conflicts, :assign_related_issues, :commit_change_content
>>>>>>> upstream/master
]
before_action :validates_merge_request, only: [:show, :diffs, :commits, :pipelines]
before_action :define_show_vars, only: [:show, :diffs, :commits, :conflicts, :conflict_for_path, :builds, :pipelines]
......@@ -345,6 +349,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
return access_denied! unless @merge_request.can_be_merged_by?(current_user)
return render_404 unless @merge_request.approved?
<<<<<<< HEAD
RebaseWorker.perform_async(@merge_request.id, current_user.id)
render nothing: true, status: 200
......@@ -356,6 +361,10 @@ class Projects::MergeRequestsController < Projects::ApplicationController
status = merge!
=======
status = merge!
>>>>>>> upstream/master
if @merge_request.merge_error
render json: { status: status, merge_error: @merge_request.merge_error }
else
......@@ -432,10 +441,17 @@ class Projects::MergeRequestsController < Projects::ApplicationController
metrics_url =
if can?(current_user, :read_environment, environment) && environment.has_metrics?
<<<<<<< HEAD
metrics_namespace_project_environment_path(environment.project.namespace,
environment.project,
environment,
deployment)
=======
metrics_namespace_project_environment_deployment_path(environment.project.namespace,
environment.project,
environment,
deployment)
>>>>>>> upstream/master
end
{
......@@ -734,6 +750,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
return :failed
end
<<<<<<< HEAD
merge_request_service = MergeRequests::MergeService.new(@project, current_user, merge_params)
unless merge_request_service.hooks_validation_pass?(@merge_request)
......@@ -743,6 +760,11 @@ class Projects::MergeRequestsController < Projects::ApplicationController
return :sha_mismatch if params[:sha] != @merge_request.diff_head_sha
@merge_request.update(merge_error: nil, squash: merge_params[:squash])
=======
return :sha_mismatch if params[:sha] != @merge_request.diff_head_sha
@merge_request.update(merge_error: nil)
>>>>>>> upstream/master
if params[:merge_when_pipeline_succeeds].present?
return :failed unless @merge_request.head_pipeline
......
app/controllers/projects/pipeline_schedules_controller.rb 0 → 100644
View file @ 2bcb19dd
class Projects::PipelineSchedulesController < Projects::ApplicationController
before_action :authorize_read_pipeline_schedule!
before_action :authorize_create_pipeline_schedule!, only: [:new, :create, :edit, :take_ownership, :update]
before_action :authorize_admin_pipeline_schedule!, only: [:destroy]
before_action :schedule, only: [:edit, :update, :destroy, :take_ownership]
def index
@scope = params[:scope]
@all_schedules = PipelineSchedulesFinder.new(@project).execute
@schedules = PipelineSchedulesFinder.new(@project).execute(scope: params[:scope])
.includes(:last_pipeline)
end
def new
@schedule = project.pipeline_schedules.new
end
def create
@schedule = Ci::CreatePipelineScheduleService
.new(@project, current_user, schedule_params)
.execute
if @schedule.persisted?
redirect_to pipeline_schedules_path(@project)
else
render :new
end
end
def edit
end
def update
if schedule.update(schedule_params)
redirect_to namespace_project_pipeline_schedules_path(@project.namespace.becomes(Namespace), @project)
else
render :edit
end
end
def take_ownership
if schedule.update(owner: current_user)
redirect_to pipeline_schedules_path(@project)
else
redirect_to pipeline_schedules_path(@project), alert: "Failed to change the owner"
end
end
def destroy
if schedule.destroy
redirect_to pipeline_schedules_path(@project)
else
redirect_to pipeline_schedules_path(@project), alert: "Failed to remove the pipeline schedule"
end
end
private
def schedule
@schedule ||= project.pipeline_schedules.find(params[:id])
end
def schedule_params
params.require(:schedule)
.permit(:description, :cron, :cron_timezone, :ref, :active)
end
end
app/controllers/projects/pipelines_controller.rb
View file @ 2bcb19dd
......@@ -8,6 +8,8 @@ class Projects::PipelinesController < Projects::ApplicationController
wrap_parameters Ci::Pipeline
POLLING_INTERVAL = 10_000
def index
@scope = params[:scope]
@pipelines = PipelinesFinder
......@@ -31,7 +33,7 @@ class Projects::PipelinesController < Projects::ApplicationController
respond_to do |format|
format.html
format.json do
Gitlab::PollingInterval.set_header(response, interval: 10_000)
Gitlab::PollingInterval.set_header(response, interval: POLLING_INTERVAL)
render json: {
pipelines: PipelineSerializer
......@@ -57,15 +59,25 @@ class Projects::PipelinesController < Projects::ApplicationController
@pipeline = Ci::CreatePipelineService
.new(project, current_user, create_params)
.execute(ignore_skip_ci: true, save_on_errors: false)
unless @pipeline.persisted?
if @pipeline.persisted?
redirect_to namespace_project_pipeline_path(project.namespace, project, @pipeline)
else
render 'new'
return
end
redirect_to namespace_project_pipeline_path(project.namespace, project, @pipeline)
end
def show
respond_to do |format|
format.html
format.json do
Gitlab::PollingInterval.set_header(response, interval: POLLING_INTERVAL)
render json: PipelineSerializer
.new(project: @project, current_user: @current_user)
.represent(@pipeline, grouped: true)
end
end
end
def builds
......
app/controllers/projects/tags_controller.rb
View file @ 2bcb19dd
......@@ -48,7 +48,7 @@ class Projects::TagsController < Projects::ApplicationController
respond_to do |format|
if result[:status] == :success
format.html do
redirect_to namespace_project_tags_path(@project.namespace, @project)
redirect_to namespace_project_tags_path(@project.namespace, @project), status: 303
end
format.js
......@@ -57,7 +57,7 @@ class Projects::TagsController < Projects::ApplicationController
format.html do
redirect_to namespace_project_tags_path(@project.namespace, @project),
alert: @error
alert: @error, status: 303
end
format.js do
......
app/finders/pipeline_schedules_finder.rb 0 → 100644
View file @ 2bcb19dd
class PipelineSchedulesFinder
attr_reader :project, :pipeline_schedules
def initialize(project)
@project = project
@pipeline_schedules = project.pipeline_schedules
end
def execute(scope: nil)
scoped_schedules =
case scope
when 'active'
pipeline_schedules.active
when 'inactive'
pipeline_schedules.inactive
else
pipeline_schedules
end
scoped_schedules.order(id: :desc)
end
end
app/helpers/blob_helper.rb
View file @ 2bcb19dd
......@@ -18,7 +18,7 @@ module BlobHelper
blob = options.delete(:blob)
blob ||= project.repository.blob_at(ref, path) rescue nil
return unless blob
return unless blob && blob.readable_text?
common_classes = "btn js-edit-blob #{options[:extra_class]}"
......
app/helpers/branches_helper.rb
View file @ 2bcb19dd
module BranchesHelper
def can_remove_branch?(project, branch_name)
if ProtectedBranch.protected?(project, branch_name)
false
elsif branch_name == project.repository.root_ref
false
else
can?(current_user, :push_code, project)
end
end
def filter_branches_path(options = {})
exist_opts = {
search: params[:search],
......
app/helpers/commits_helper.rb
View file @ 2bcb19dd
......@@ -100,17 +100,15 @@ module CommitsHelper
end
def link_to_browse_code(project, commit)
return unless current_controller?(:projects, :commits)
if @path.blank?
return link_to(
"Browse Files",
namespace_project_tree_path(project.namespace, project, commit),
class: "btn btn-default"
)
end
return unless current_controller?(:projects, :commits)
if @repo.blob_at(commit.id, @path)
elsif @repo.blob_at(commit.id, @path)
return link_to(
"Browse File",
namespace_project_blob_path(project.namespace, project,
......
app/helpers/gitlab_routing_helper.rb
View file @ 2bcb19dd
......@@ -221,6 +221,26 @@ module GitlabRoutingHelper
end
end
# Pipeline Schedules
def pipeline_schedules_path(project, *args)
namespace_project_pipeline_schedules_path(project.namespace, project, *args)
end
def pipeline_schedule_path(schedule, *args)
project = schedule.project
namespace_project_pipeline_schedule_path(project.namespace, project, schedule, *args)
end
def edit_pipeline_schedule_path(schedule)
project = schedule.project
edit_namespace_project_pipeline_schedule_path(project.namespace, project, schedule)
end
def take_ownership_pipeline_schedule_path(schedule, *args)
project = schedule.project
take_ownership_namespace_project_pipeline_schedule_path(project.namespace, project, schedule, *args)
end
# Settings
def project_settings_integrations_path(project, *args)
namespace_project_settings_integrations_path(project.namespace, project, *args)
......
app/helpers/merge_requests_helper.rb
View file @ 2bcb19dd
......@@ -60,6 +60,7 @@ module MergeRequestsHelper
)
end
<<<<<<< HEAD
def render_items_list(items, separator = "and")
items_cnt = items.size
......@@ -99,6 +100,8 @@ module MergeRequestsHelper
str
end
=======
>>>>>>> upstream/master
def format_mr_branch_names(merge_request)
source_path = merge_request.source_project_path
target_path = merge_request.target_project_path
......
app/helpers/pipeline_schedules_helper.rb 0 → 100644
View file @ 2bcb19dd
module PipelineSchedulesHelper
def timezone_data
ActiveSupport::TimeZone.all.map do |timezone|
{
name: timezone.name,
offset: timezone.utc_offset,
identifier: timezone.tzinfo.identifier
}
end
end
end
app/models/ci/build.rb
View file @ 2bcb19dd
......@@ -112,14 +112,9 @@ module Ci
end
def play(current_user)
# Try to queue a current build
if self.enqueue
self.update(user: current_user)
self
else
# Otherwise we need to create a duplicate
Ci::Build.retry(self, current_user)
end
Ci::PlayBuildService
.new(project, current_user)
.execute(self)
end
def cancelable?
......
app/models/ci/group.rb 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
app/models/ci/pipeline.rb
View file @ 2bcb19dd
This diff is collapsed.
app/models/ci/stage.rb
View file @ 2bcb19dd
This diff is collapsed.
app/models/ci/trigger.rb
View file @ 2bcb19dd
This diff is collapsed.
app/models/commit.rb
View file @ 2bcb19dd
This diff is collapsed.
app/models/commit_status.rb
View file @ 2bcb19dd
This diff is collapsed.
app/models/concerns/mentionable.rb
View file @ 2bcb19dd
This diff is collapsed.
app/models/concerns/mentionable/reference_regexes.rb 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
app/models/deployment.rb
View file @ 2bcb19dd
This diff is collapsed.
app/models/merge_request.rb
View file @ 2bcb19dd
This diff is collapsed.
app/models/project.rb
View file @ 2bcb19dd
This diff is collapsed.
app/models/user.rb
View file @ 2bcb19dd
This diff is collapsed.
app/policies/base_policy.rb
View file @ 2bcb19dd
This diff is collapsed.
app/policies/ci/build_policy.rb
View file @ 2bcb19dd
This diff is collapsed.
app/policies/ci/pipeline_policy.rb
View file @ 2bcb19dd
This diff is collapsed.
app/policies/ci/pipeline_schedule_policy.rb 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
app/policies/environment_policy.rb
View file @ 2bcb19dd
This diff is collapsed.
app/policies/project_policy.rb
View file @ 2bcb19dd
This diff is collapsed.
app/presenters/merge_request_presenter.rb
View file @ 2bcb19dd
This diff is collapsed.
app/serializers/build_action_entity.rb
View file @ 2bcb19dd
This diff is collapsed.
app/serializers/build_entity.rb
View file @ 2bcb19dd
This diff is collapsed.
app/serializers/environment_entity.rb
View file @ 2bcb19dd
This diff is collapsed.
app/serializers/job_group_entity.rb 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
app/serializers/merge_request_entity.rb
View file @ 2bcb19dd
This diff is collapsed.
app/serializers/pipeline_entity.rb
View file @ 2bcb19dd
This diff is collapsed.
app/serializers/stage_entity.rb
View file @ 2bcb19dd
This diff is collapsed.
app/serializers/status_entity.rb
View file @ 2bcb19dd
This diff is collapsed.
app/services/ci/create_pipeline_schedule_service.rb 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
app/services/ci/create_pipeline_service.rb
View file @ 2bcb19dd
This diff is collapsed.
app/services/ci/play_build_service.rb 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
app/services/ci/process_pipeline_service.rb
View file @ 2bcb19dd
This diff is collapsed.
app/services/ci/retry_pipeline_service.rb
View file @ 2bcb19dd
This diff is collapsed.
app/services/delete_branch_service.rb
View file @ 2bcb19dd
This diff is collapsed.
app/services/git_push_service.rb
View file @ 2bcb19dd
This diff is collapsed.
app/views/ci/status/_graph_badge.html.haml deleted 100644 → 0
View file @ 0025fd45
This diff is collapsed.
app/views/projects/blame/show.html.haml
View file @ 2bcb19dd
This diff is collapsed.
app/views/projects/blob/_blob.html.haml
View file @ 2bcb19dd
This diff is collapsed.
app/views/projects/blob/_breadcrumb.html.haml 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
app/views/projects/blob/_header.html.haml
View file @ 2bcb19dd
This diff is collapsed.
app/views/projects/blob/_markup.html.haml deleted 100644 → 0
View file @ 0025fd45
This diff is collapsed.
app/views/projects/blob/preview.html.haml
View file @ 2bcb19dd
This diff is collapsed.
app/views/projects/branches/_delete_protected_modal.html.haml 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
app/views/projects/branches/index.html.haml
View file @ 2bcb19dd
This diff is collapsed.
app/views/projects/find_file/show.html.haml
View file @ 2bcb19dd
This diff is collapsed.
app/views/projects/pipeline_schedules/_form.html.haml 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
app/views/projects/pipeline_schedules/_table.html.haml 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
app/views/projects/pipeline_schedules/_tabs.html.haml 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
app/views/projects/pipeline_schedules/edit.html.haml 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
app/views/projects/pipeline_schedules/index.html.haml 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
app/views/projects/pipeline_schedules/new.html.haml 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
app/views/projects/pipelines/_graph.html.haml deleted 100644 → 0
View file @ 0025fd45
This diff is collapsed.
app/views/projects/stage/_graph.html.haml deleted 100644 → 0
View file @ 0025fd45
This diff is collapsed.
app/views/projects/stage/_in_stage_group.html.haml deleted 100644 → 0
View file @ 0025fd45
This diff is collapsed.
app/views/projects/tree/show.html.haml
View file @ 2bcb19dd
This diff is collapsed.
app/views/projects/triggers/_form.html.haml
View file @ 2bcb19dd
This diff is collapsed.
app/views/shared/issuable/_sidebar_assignees.html.haml 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
app/workers/irker_worker.rb
View file @ 2bcb19dd
This diff is collapsed.
app/workers/pipeline_schedule_worker.rb 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
app/workers/process_commit_worker.rb
View file @ 2bcb19dd
This diff is collapsed.
app/workers/trigger_schedule_worker.rb deleted 100644 → 0
View file @ 0025fd45
This diff is collapsed.
changelogs/unreleased/25226-realtime-pipelines-fe.yml 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
changelogs/unreleased/document-foreign-keys.yml 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
changelogs/unreleased/fix-gb-fix-skipped-manual-actions.yml 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
changelogs/unreleased/issue_27168_2.yml 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
changelogs/unreleased/mrchrisw-fix-slack-notify.yml 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
changelogs/unreleased/tc-cache-trackable-attributes.yml 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
changelogs/unreleased/up-arrow-focus-discussion-comment.yml 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
changelogs/unreleased/winh-german-cycle-analytics.yml 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
changelogs/unreleased/zj-better-view-pipeline-schedule.yml 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
changelogs/unreleased/zj-real-time-pipelines.yml 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
config/application.rb
View file @ 2bcb19dd
This diff is collapsed.
config/gitlab.yml.example
View file @ 2bcb19dd
This diff is collapsed.
config/initializers/1_settings.rb
View file @ 2bcb19dd
This diff is collapsed.
config/routes/project.rb
View file @ 2bcb19dd
This diff is collapsed.
config/webpack.config.js
View file @ 2bcb19dd
This diff is collapsed.
db/migrate/20170425112128_create_pipeline_schedules_table.rb 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
db/schema.rb
View file @ 2bcb19dd
This diff is collapsed.
doc/ci/img/pipeline_schedules_list.png 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
doc/ci/img/pipeline_schedules_new_form.png 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
doc/ci/pipeline_schedules.md 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
doc/ci/triggers/README.md
View file @ 2bcb19dd
This diff is collapsed.
doc/ci/triggers/img/trigger_schedule_create.png deleted 100644 → 0
View file @ 0025fd45
This diff is collapsed.
doc/ci/triggers/img/trigger_schedule_edit.png deleted 100644 → 0
View file @ 0025fd45
This diff is collapsed.
doc/ci/yaml/README.md
View file @ 2bcb19dd
This diff is collapsed.
doc/development/README.md
View file @ 2bcb19dd
This diff is collapsed.
doc/development/build_test_package.md
View file @ 2bcb19dd
This diff is collapsed.
doc/development/code_review.md
View file @ 2bcb19dd
This diff is collapsed.
doc/development/fe_guide/testing.md
View file @ 2bcb19dd
This diff is collapsed.
doc/development/foreign_keys.md 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
doc/development/img/trigger_ss1.png 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
doc/development/img/trigger_ss2.png 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
doc/install/README.md
View file @ 2bcb19dd
This diff is collapsed.
doc/install/installation.md
View file @ 2bcb19dd
This diff is collapsed.
doc/install/kubernetes/gitlab_chart.md 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
doc/install/kubernetes/gitlab_runner_chart.md 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
doc/install/kubernetes/index.md 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
doc/intro/README.md
View file @ 2bcb19dd
This diff is collapsed.
doc/update/9.1-to-9.2.md 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
doc/user/project/issues/index.md
View file @ 2bcb19dd
This diff is collapsed.
doc/user/project/settings/import_export.md
View file @ 2bcb19dd
This diff is collapsed.
features/steps/project/merge_requests.rb
View file @ 2bcb19dd
This diff is collapsed.
features/support/env.rb
View file @ 2bcb19dd
This diff is collapsed.
lib/api/jobs.rb
View file @ 2bcb19dd
This diff is collapsed.
lib/api/v3/builds.rb
View file @ 2bcb19dd
This diff is collapsed.
lib/gitlab/checks/change_access.rb
View file @ 2bcb19dd
This diff is collapsed.
lib/gitlab/ci/status/build/action.rb 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
lib/gitlab/ci/status/build/cancelable.rb
View file @ 2bcb19dd
This diff is collapsed.
lib/gitlab/ci/status/build/factory.rb
View file @ 2bcb19dd
This diff is collapsed.
lib/gitlab/ci/status/build/play.rb
View file @ 2bcb19dd
This diff is collapsed.
lib/gitlab/ci/status/build/retryable.rb
View file @ 2bcb19dd
This diff is collapsed.
lib/gitlab/ci/status/build/stop.rb
View file @ 2bcb19dd
This diff is collapsed.
lib/gitlab/ci/status/extended.rb
View file @ 2bcb19dd
This diff is collapsed.
lib/gitlab/ci/status/group/common.rb 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
lib/gitlab/ci/status/group/factory.rb 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
lib/gitlab/ci/status/pipeline/blocked.rb
View file @ 2bcb19dd
This diff is collapsed.
lib/gitlab/ci/status/success_warning.rb
View file @ 2bcb19dd
This diff is collapsed.
lib/gitlab/etag_caching/router.rb
View file @ 2bcb19dd
This diff is collapsed.
lib/gitlab/git/commit.rb
View file @ 2bcb19dd
This diff is collapsed.
lib/gitlab/git/repository.rb
View file @ 2bcb19dd
This diff is collapsed.
lib/gitlab/gitaly_client/commit.rb
View file @ 2bcb19dd
This diff is collapsed.
lib/gitlab/import_export.rb
View file @ 2bcb19dd
This diff is collapsed.
lib/gitlab/import_export/import_export.yml
View file @ 2bcb19dd
This diff is collapsed.
lib/gitlab/usage_data.rb
View file @ 2bcb19dd
This diff is collapsed.
lib/gitlab/user_access.rb
View file @ 2bcb19dd
This diff is collapsed.
lib/tasks/migrate/setup_postgresql.rake
View file @ 2bcb19dd
This diff is collapsed.
locale/de/gitlab.po
View file @ 2bcb19dd
This diff is collapsed.
scripts/trigger-build 0 → 100755
View file @ 2bcb19dd
This diff is collapsed.
spec/controllers/groups_controller_spec.rb
View file @ 2bcb19dd
This diff is collapsed.
spec/factories/environments.rb
View file @ 2bcb19dd
This diff is collapsed.
spec/features/cycle_analytics_spec.rb
View file @ 2bcb19dd
This diff is collapsed.
spec/features/login_spec.rb
View file @ 2bcb19dd
This diff is collapsed.
spec/features/merge_requests/widget_spec.rb
View file @ 2bcb19dd
This diff is collapsed.
spec/features/projects/branches_spec.rb
View file @ 2bcb19dd
This diff is collapsed.
spec/features/projects/pipeline_schedules_spec.rb 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
spec/features/triggers_spec.rb
View file @ 2bcb19dd
This diff is collapsed.
spec/finders/pipeline_schedules_finder_spec.rb 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
spec/fixtures/api/schemas/pipeline.json 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
spec/helpers/merge_requests_helper_spec.rb
View file @ 2bcb19dd
This diff is collapsed.
spec/javascripts/ci_status_icon_spec.js deleted 100644 → 0
View file @ 0025fd45
This diff is collapsed.
spec/javascripts/fixtures/graph.html.haml 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
spec/javascripts/fixtures/merge_requests.rb
View file @ 2bcb19dd
This diff is collapsed.
spec/javascripts/gl_form_spec.js
View file @ 2bcb19dd
This diff is collapsed.
spec/javascripts/line_highlighter_spec.js
View file @ 2bcb19dd
This diff is collapsed.
spec/javascripts/merge_request_notes_spec.js 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
spec/javascripts/merge_request_tabs_spec.js
View file @ 2bcb19dd
This diff is collapsed.
spec/javascripts/pipelines/graph/action_component_spec.js 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
spec/javascripts/pipelines/graph/graph_component_spec.js 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
spec/javascripts/pipelines/graph/job_component_spec.js 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
spec/javascripts/pipelines/graph/job_name_component_spec.js 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
spec/javascripts/pipelines/graph/mock_data.js 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
spec/javascripts/pipelines_spec.js
View file @ 2bcb19dd
This diff is collapsed.
spec/javascripts/shortcuts_issuable_spec.js
View file @ 2bcb19dd
This diff is collapsed.
spec/javascripts/test_bundle.js
View file @ 2bcb19dd
This diff is collapsed.
spec/javascripts/u2f/mock_u2f_device.js
View file @ 2bcb19dd
This diff is collapsed.
spec/javascripts/visibility_select_spec.js
View file @ 2bcb19dd
This diff is collapsed.
spec/javascripts/vue_shared/ci_action_icons_spec.js 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
spec/javascripts/vue_shared/ci_status_icon_spec.js 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
spec/javascripts/vue_shared/components/ci_icon_spec.js 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
spec/javascripts/vue_shared/components/memory_graph_spec.js 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
spec/javascripts/vue_shared/components/mock_data.js 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
spec/lib/gitlab/ci/status/build/action_spec.rb 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
spec/lib/gitlab/ci/status/extended_spec.rb
View file @ 2bcb19dd
This diff is collapsed.
spec/lib/gitlab/ci/status/group/common_spec.rb 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
spec/lib/gitlab/ci/status/group/factory_spec.rb 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
spec/lib/gitlab/git_access_spec.rb
View file @ 2bcb19dd
This diff is collapsed.
spec/lib/gitlab/usage_data_spec.rb
View file @ 2bcb19dd
This diff is collapsed.
spec/lib/gitlab/user_access_spec.rb
View file @ 2bcb19dd
This diff is collapsed.
spec/models/ci/build_spec.rb
View file @ 2bcb19dd
This diff is collapsed.
spec/models/ci/group_spec.rb 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
spec/models/ci/pipeline_spec.rb
View file @ 2bcb19dd
This diff is collapsed.
spec/models/ci/stage_spec.rb
View file @ 2bcb19dd
This diff is collapsed.
spec/models/ci/trigger_spec.rb
View file @ 2bcb19dd
This diff is collapsed.
spec/models/commit_spec.rb
View file @ 2bcb19dd
This diff is collapsed.
spec/models/concerns/mentionable_spec.rb
View file @ 2bcb19dd
This diff is collapsed.
spec/models/cycle_analytics/test_spec.rb
View file @ 2bcb19dd
This diff is collapsed.
spec/models/environment_spec.rb
View file @ 2bcb19dd
This diff is collapsed.
spec/models/merge_request_spec.rb
View file @ 2bcb19dd
This diff is collapsed.
spec/models/project_spec.rb
View file @ 2bcb19dd
This diff is collapsed.
spec/models/user_spec.rb
View file @ 2bcb19dd
This diff is collapsed.
spec/policies/ci/build_policy_spec.rb
View file @ 2bcb19dd
This diff is collapsed.
spec/policies/environment_policy_spec.rb 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
spec/policies/project_policy_spec.rb
View file @ 2bcb19dd
This diff is collapsed.
spec/requests/api/branches_spec.rb
View file @ 2bcb19dd
This diff is collapsed.
spec/requests/api/jobs_spec.rb
View file @ 2bcb19dd
This diff is collapsed.
spec/requests/api/v3/branches_spec.rb
View file @ 2bcb19dd
This diff is collapsed.
spec/requests/openid_connect_spec.rb
View file @ 2bcb19dd
This diff is collapsed.
spec/serializers/build_entity_spec.rb
View file @ 2bcb19dd
This diff is collapsed.
spec/serializers/build_serializer_spec.rb
View file @ 2bcb19dd
This diff is collapsed.
spec/serializers/deployment_entity_spec.rb
View file @ 2bcb19dd
This diff is collapsed.
spec/serializers/stage_entity_spec.rb
View file @ 2bcb19dd
This diff is collapsed.
spec/services/ci/play_build_service_spec.rb 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
spec/services/git_push_service_spec.rb
View file @ 2bcb19dd
This diff is collapsed.
spec/support/cycle_analytics_helpers.rb
View file @ 2bcb19dd
This diff is collapsed.
spec/views/projects/environments/terminal.html.haml_spec.rb 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
spec/views/projects/pipelines/show.html.haml_spec.rb deleted 100644 → 0
View file @ 0025fd45
This diff is collapsed.
spec/workers/pipeline_schedule_worker_spec.rb 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
spec/workers/process_commit_worker_spec.rb
View file @ 2bcb19dd
This diff is collapsed.
spec/workers/trigger_schedule_worker_spec.rb deleted 100644 → 0
View file @ 0025fd45
This diff is collapsed.
vendor/Dockerfile/OpenJDK-alpine.Dockerfile 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
vendor/Dockerfile/OpenJDK.Dockerfile 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
vendor/Dockerfile/Python-alpine.Dockerfile 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
vendor/Dockerfile/Python.Dockerfile 0 → 100644
View file @ 2bcb19dd
This diff is collapsed.
vendor/gitignore/Global/Archives.gitignore
View file @ 2bcb19dd
This diff is collapsed.
vendor/gitignore/Global/JetBrains.gitignore
View file @ 2bcb19dd
This diff is collapsed.
vendor/gitignore/Magento.gitignore
View file @ 2bcb19dd
This diff is collapsed.
vendor/gitignore/Python.gitignore
View file @ 2bcb19dd
This diff is collapsed.
vendor/gitignore/Qt.gitignore
View file @ 2bcb19dd
This diff is collapsed.
vendor/gitignore/UnrealEngine.gitignore
View file @ 2bcb19dd
This diff is collapsed.
vendor/licenses.csv
View file @ 2bcb19dd
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