Skip to content

G
gitlab-ce
Commit 25b97e94 authored by Lin Jen-Shin's avatar Lin Jen-Shin
Browse files
Options

Merge remote-tracking branch 'ee/master' into add-api-shared_runners_minutes_limit 

* ee/master: (183 commits)
  Improve has_codeclimate_data? spec in the merge_request_spec.rb
  Refactor Elasticsearch checks to SystemCheck
  Refactor and move things around to improve in YAGNI perspective
  Fix BasicExecutor specs
  Changelog
  Fixed and improved some existing checks and SystemCheck library
  Fix codestyle
  Improve Specs and some fixes
  Add ActiveUsers Check
  Refactor gitlab:app:checks to use SystemCheck
  Added specs for BaseExecutor
  Added specs for SystemCheck and custom matcher
  Fix a few method signature checks
  Move rainbow monkey patch to String to spec_helper
  Some code-style fixes and documentation
  WIP SystemCheck library for executing checks from a rake task
  Persist Clone URL prefix in geo_nodes table to be used by the secondary
  Add small improvements to code climate ci docs
  Changelog
  Refactor codeclimate related code for build and pipeline
  ...
parents 0ed08366 eeb7245f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 9731 additions and 2917 deletions
.gitlab-ci.yml
View file @ 25b97e94
......@@ -473,24 +473,6 @@ lint:javascript:report:
paths:
- eslint-report.html
# Trigger docs build
# https://gitlab.com/gitlab-com/doc-gitlab-com/blob/master/README.md#deployment-process
trigger_docs:
stage: post-test
image: "alpine"
<<: *dedicated-runner
before_script:
- apk update && apk add curl
variables:
GIT_STRATEGY: "none"
cache: {}
artifacts: {}
script:
- "HTTP_STATUS=$(curl -X POST -F token=${DOCS_TRIGGER_TOKEN} -F ref=master -F variables[PROJECT]=${CI_PROJECT_NAME} --silent --output curl.log --write-out '%{http_code}' https://gitlab.com/api/v3/projects/1794617/trigger/builds)"
- if [ "${HTTP_STATUS}" -ne "201" ]; then echo "Error ${HTTP_STATUS}"; cat curl.log; echo; exit 1; fi
only:
- master@gitlab-org/gitlab-ee
pages:
before_script: []
stage: pages
......
.scss-lint.yml
View file @ 25b97e94
......@@ -11,11 +11,11 @@ linters:
# !global, !important, and !optional flags.
BangFormat:
enabled: false
# Whether or not to prefer `border: 0` over `border: none`.
BorderZero:
enabled: false
# Reports when you define a rule set using a selector with chained classes
# (a.k.a. adjoining classes).
ChainedClasses:
......@@ -25,13 +25,13 @@ linters:
# (e.g. `color: green` is a color keyword)
ColorKeyword:
enabled: false
# Prefer color literals (keywords or hexadecimal codes) to be used only in
# variable declarations. They should be referred to via variables everywhere
# else.
ColorVariable:
enabled: true
# Which form of comments to prefer in CSS.
Comment:
enabled: false
......@@ -39,7 +39,7 @@ linters:
# Reports @debug statements (which you probably left behind accidentally).
DebugStatement:
enabled: false
# Rule sets should be ordered as follows:
# - @extend declarations
# - @include declarations without inner @content
......@@ -54,19 +54,19 @@ linters:
# more information.
DisableLinterReason:
enabled: true
# Reports when you define the same property twice in a single rule set.
DuplicateProperty:
enabled: false
enabled: true
# Separate rule, function, and mixin declarations with empty lines.
EmptyLineBetweenBlocks:
enabled: true
# Reports when you have an empty rule set.
EmptyRule:
enabled: true
# Reports when you have an @extend directive.
ExtendDirective:
enabled: false
......@@ -75,49 +75,49 @@ linters:
# when adding lines to the file, since SCM systems such as git won't
# think that you touched the last line.
FinalNewline:
enabled: false
enabled: true
# HEX colors should use three-character values where possible.
HexLength:
enabled: false
# HEX color values should use lower-case colors to differentiate between
# letters and numbers, e.g. `#E3E3E3` vs. `#e3e3e3`.
HexNotation:
enabled: true
# Avoid using ID selectors.
IdSelector:
enabled: false
# The basenames of @imported SCSS partials should not begin with an
# underscore and should not include the filename extension.
ImportPath:
enabled: false
# Avoid using !important in properties. It is usually indicative of a
# misunderstanding of CSS specificity and can lead to brittle code.
ImportantRule:
enabled: false
# Indentation should always be done in increments of 2 spaces.
Indentation:
enabled: true
width: 2
# Don't write leading zeros for numeric values with a decimal point.
LeadingZero:
enabled: false
# Reports when you define the same selector twice in a single sheet.
MergeableSelector:
enabled: false
# Functions, mixins, variables, and placeholders should be declared
# with all lowercase letters and hyphens instead of underscores.
NameFormat:
enabled: false
# Avoid nesting selectors too deeply.
NestingDepth:
enabled: false
......@@ -129,12 +129,12 @@ linters:
# Sort properties in a strict order.
PropertySortOrder:
enabled: false
# Reports when you use an unknown or disabled CSS property
# (ignoring vendor-prefixed properties).
PropertySpelling:
enabled: false
# Configure which units are allowed for property values.
PropertyUnits:
enabled: false
......@@ -144,25 +144,25 @@ linters:
# be declared with one colon.
PseudoElement:
enabled: true
# Avoid qualifying elements in selectors (also known as "tag-qualifying").
QualifyingElement:
enabled: false
# Don't write selectors with a depth of applicability greater than 3.
SelectorDepth:
enabled: false
# Selectors should always use hyphenated-lowercase, rather than camelCase or
# snake_case.
SelectorFormat:
enabled: false
convention: hyphenated_lowercase
# Prefer the shortest shorthand form possible for properties that support it.
Shorthand:
enabled: true
# Each property should have its own line, except in the special case of
# single line rulesets.
SingleLinePerProperty:
......@@ -173,11 +173,11 @@ linters:
# individual selector occupy a single line.
SingleLinePerSelector:
enabled: true
# Commas in lists should be followed by a space.
SpaceAfterComma:
enabled: false
# Properties should be formatted with a single space separating the colon
# from the property's value.
SpaceAfterPropertyColon:
......@@ -197,12 +197,12 @@ linters:
# colon.
SpaceAfterVariableName:
enabled: false
# Operators should be formatted with a single space on both sides of an
# infix operator.
SpaceAroundOperator:
enabled: true
# Opening braces should be preceded by a single space.
SpaceBeforeBrace:
enabled: true
......@@ -210,7 +210,7 @@ linters:
# Parentheses should not be padded with spaces.
SpaceBetweenParens:
enabled: false
# Enforces that string literals should be written with a consistent form
# of quotes (single or double).
StringQuotes:
......@@ -241,7 +241,7 @@ linters:
# be unnecessary.
UnnecessaryParentReference:
enabled: false
# URLs should be valid and not contain protocols or domain names.
UrlFormat:
enabled: true
......
Gemfile.lock
View file @ 25b97e94
......@@ -366,7 +366,7 @@ GEM
grape-entity (0.6.0)
activesupport
multi_json (>= 1.3.2)
grpc (1.2.5)
grpc (1.3.4)
google-protobuf (~> 3.1)
googleauth (~> 0.5.1)
gssapi (1.2.0)
......
app/assets/javascripts/dispatcher.js
View file @ 25b97e94
......@@ -124,12 +124,12 @@ import ApproversSelect from './approvers_select';
shortcut_handler = new ShortcutsNavigation();
new UsersSelect();
break;
case 'projects:builds:show':
case 'projects:jobs:show':
new Build();
break;
case 'projects:merge_requests:index':
case 'projects:issues:index':
if (gl.FilteredSearchManager) {
if (gl.FilteredSearchManager && document.querySelector('.filtered-search')) {
const filteredSearchManager = new gl.FilteredSearchManager(
page === 'projects:issues:index' ? 'issues' : 'merge_requests',
);
......
app/assets/javascripts/dropzone_input.js
View file @ 25b97e94
......@@ -194,6 +194,7 @@ window.DropzoneInput = (function() {
$(child).val(beforeSelection + formattedText + afterSelection);
textarea.setSelectionRange(caretStart + formattedText.length, caretEnd + formattedText.length);
textarea.style.height = `${textarea.scrollHeight}px`;
formTextarea.get(0).dispatchEvent(new Event('input'));
return formTextarea.trigger('input');
};
......
app/assets/javascripts/issue_show/components/app.vue
View file @ 25b97e94
<script>
/* global Flash */
import Visibility from 'visibilityjs';
import Poll from '../../lib/utils/poll';
import eventHub from '../event_hub';
import Service from '../services/index';
import Store from '../stores';
import titleComponent from './title.vue';
import descriptionComponent from './description.vue';
import formComponent from './form.vue';
import '../../lib/utils/url_utility';
export default {
props: {
......@@ -12,15 +16,27 @@ export default {
required: true,
type: String,
},
canMove: {
required: true,
type: Boolean,
},
canUpdate: {
required: true,
type: Boolean,
},
canDestroy: {
required: true,
type: Boolean,
},
issuableRef: {
type: String,
required: true,
},
initialTitle: {
initialTitleHtml: {
type: String,
required: true,
},
initialTitleText: {
type: String,
required: true,
},
......@@ -34,10 +50,40 @@ export default {
required: false,
default: '',
},
issuableTemplates: {
type: Array,
required: false,
default: () => [],
},
isConfidential: {
type: Boolean,
required: true,
},
markdownPreviewUrl: {
type: String,
required: true,
},
markdownDocs: {
type: String,
required: true,
},
projectPath: {
type: String,
required: true,
},
projectNamespace: {
type: String,
required: true,
},
projectsAutocompleteUrl: {
type: String,
required: true,
},
},
data() {
const store = new Store({
titleHtml: this.initialTitle,
titleHtml: this.initialTitleHtml,
titleText: this.initialTitleText,
descriptionHtml: this.initialDescriptionHtml,
descriptionText: this.initialDescriptionText,
});
......@@ -45,19 +91,97 @@ export default {
return {
store,
state: store.state,
showForm: false,
};
},
computed: {
formState() {
return this.store.formState;
},
},
components: {
descriptionComponent,
titleComponent,
formComponent,
},
methods: {
openForm() {
if (!this.showForm) {
this.showForm = true;
this.store.setFormState({
title: this.state.titleText,
confidential: this.isConfidential,
description: this.state.descriptionText,
lockedWarningVisible: false,
move_to_project_id: 0,
updateLoading: false,
});
}
},
closeForm() {
this.showForm = false;
},
updateIssuable() {
const canPostUpdate = this.store.formState.move_to_project_id !== 0 ?
confirm('Are you sure you want to move this issue to another project?') : true; // eslint-disable-line no-alert
if (!canPostUpdate) {
this.store.setFormState({
updateLoading: false,
});
return;
}
this.service.updateIssuable(this.store.formState)
.then(res => res.json())
.then((data) => {
if (location.pathname !== data.web_url) {
gl.utils.visitUrl(data.web_url);
} else if (data.confidential !== this.isConfidential) {
gl.utils.visitUrl(location.pathname);
}
return this.service.getData();
})
.then(res => res.json())
.then((data) => {
this.store.updateState(data);
eventHub.$emit('close.form');
})
.catch(() => {
eventHub.$emit('close.form');
return new Flash('Error updating issue');
});
},
deleteIssuable() {
this.service.deleteIssuable()
.then(res => res.json())
.then((data) => {
// Stop the poll so we don't get 404's with the issue not existing
this.poll.stop();
gl.utils.visitUrl(data.web_url);
})
.catch(() => {
eventHub.$emit('close.form');
return new Flash('Error deleting issue');
});
},
},
created() {
const resource = new Service(this.endpoint);
const poll = new Poll({
resource,
this.service = new Service(this.endpoint);
this.poll = new Poll({
resource: this.service,
method: 'getData',
successCallback: (res) => {
this.store.updateState(res.json());
const data = res.json();
const shouldUpdate = this.store.stateShouldUpdate(data);
this.store.updateState(data);
if (this.showForm && (shouldUpdate.title || shouldUpdate.description)) {
this.store.formState.lockedWarningVisible = true;
}
},
errorCallback(err) {
throw new Error(err);
......@@ -65,32 +189,57 @@ export default {
});
if (!Visibility.hidden()) {
poll.makeRequest();
this.poll.makeRequest();
}
Visibility.change(() => {
if (!Visibility.hidden()) {
poll.restart();
this.poll.restart();
} else {
poll.stop();
this.poll.stop();
}
});
eventHub.$on('delete.issuable', this.deleteIssuable);
eventHub.$on('update.issuable', this.updateIssuable);
eventHub.$on('close.form', this.closeForm);
eventHub.$on('open.form', this.openForm);
},
beforeDestroy() {
eventHub.$off('delete.issuable', this.deleteIssuable);
eventHub.$off('update.issuable', this.updateIssuable);
eventHub.$off('close.form', this.closeForm);
eventHub.$off('open.form', this.openForm);
},
};
</script>
<template>
<div>
<title-component
:issuable-ref="issuableRef"
:title-html="state.titleHtml"
:title-text="state.titleText" />
<description-component
v-if="state.descriptionHtml"
:can-update="canUpdate"
:description-html="state.descriptionHtml"
:description-text="state.descriptionText"
:updated-at="state.updatedAt"
:task-status="state.taskStatus" />
<form-component
v-if="canUpdate && showForm"
:form-state="formState"
:can-move="canMove"
:can-destroy="canDestroy"
:issuable-templates="issuableTemplates"
:markdown-docs="markdownDocs"
:markdown-preview-url="markdownPreviewUrl"
:project-path="projectPath"
:project-namespace="projectNamespace"
:projects-autocomplete-url="projectsAutocompleteUrl"
/>
<div v-else>
<title-component
:issuable-ref="issuableRef"
:title-html="state.titleHtml"
:title-text="state.titleText" />
<description-component
v-if="state.descriptionHtml"
:can-update="canUpdate"
:description-html="state.descriptionHtml"
:description-text="state.descriptionText"
:updated-at="state.updatedAt"
:task-status="state.taskStatus" />
</div>
</div>
</template>
app/assets/javascripts/issue_show/components/description.vue
View file @ 25b97e94
......@@ -18,11 +18,13 @@
},
updatedAt: {
type: String,
required: true,
required: false,
default: '',
},
taskStatus: {
type: String,
required: true,
required: false,
default: '',
},
},
data() {
......@@ -83,6 +85,7 @@
<template>
<div
v-if="descriptionHtml"
class="description"
:class="{
'js-task-list-container': canUpdate
......
app/assets/javascripts/issue_show/components/edit_actions.vue 0 → 100644
View file @ 25b97e94
<script>
import updateMixin from '../mixins/update';
import eventHub from '../event_hub';
export default {
mixins: [updateMixin],
props: {
canDestroy: {
type: Boolean,
required: true,
},
formState: {
type: Object,
required: true,
},
},
data() {
return {
deleteLoading: false,
};
},
computed: {
isSubmitEnabled() {
return this.formState.title.trim() !== '';
},
},
methods: {
closeForm() {
eventHub.$emit('close.form');
},
deleteIssuable() {
// eslint-disable-next-line no-alert
if (confirm('Issue will be removed! Are you sure?')) {
this.deleteLoading = true;
eventHub.$emit('delete.issuable');
}
},
},
};
</script>
<template>
<div class="prepend-top-default append-bottom-default clearfix">
<button
class="btn btn-save pull-left"
:class="{ disabled: formState.updateLoading || !isSubmitEnabled }"
type="submit"
:disabled="formState.updateLoading || !isSubmitEnabled"
@click.prevent="updateIssuable">
Save changes
<i
class="fa fa-spinner fa-spin"
aria-hidden="true"
v-if="formState.updateLoading">
</i>
</button>
<button
class="btn btn-default pull-right"
type="button"
@click="closeForm">
Cancel
</button>
<button
v-if="canDestroy"
class="btn btn-danger pull-right append-right-default"
:class="{ disabled: deleteLoading }"
type="button"
:disabled="deleteLoading"
@click="deleteIssuable">
Delete
<i
class="fa fa-spinner fa-spin"
aria-hidden="true"
v-if="deleteLoading">
</i>
</button>
</div>
</template>
app/assets/javascripts/issue_show/components/fields/confidential_checkbox.vue 0 → 100644
View file @ 25b97e94
<script>
export default {
props: {
formState: {
type: Object,
required: true,
},
},
};
</script>
<template>
<fieldset class="checkbox">
<label for="issue-confidential">
<input
type="checkbox"
value="1"
id="issue-confidential"
v-model="formState.confidential" />
This issue is confidential and should only be visible to team members with at least Reporter access.
</label>
</fieldset>
</template>
app/assets/javascripts/issue_show/components/fields/description.vue 0 → 100644
View file @ 25b97e94
<script>
/* global Flash */
import updateMixin from '../../mixins/update';
import markdownField from '../../../vue_shared/components/markdown/field.vue';
export default {
mixins: [updateMixin],
props: {
formState: {
type: Object,
required: true,
},
markdownPreviewUrl: {
type: String,
required: true,
},
markdownDocs: {
type: String,
required: true,
},
},
components: {
markdownField,
},
mounted() {
this.$refs.textarea.focus();
},
};
</script>
<template>
<div class="common-note-form">
<label
class="sr-only"
for="issue-description">
Description
</label>
<markdown-field
:markdown-preview-url="markdownPreviewUrl"
:markdown-docs="markdownDocs">
<textarea
id="issue-description"
class="note-textarea js-gfm-input js-autosize markdown-area"
data-supports-slash-commands="false"
aria-label="Description"
v-model="formState.description"
ref="textarea"
slot="textarea"
placeholder="Write a comment or drag your files here..."
@keydown.meta.enter="updateIssuable">
</textarea>
</markdown-field>
</div>
</template>
app/assets/javascripts/issue_show/components/fields/description_template.vue 0 → 100644
View file @ 25b97e94
<script>
export default {
props: {
formState: {
type: Object,
required: true,
},
issuableTemplates: {
type: Array,
required: false,
default: () => [],
},
projectPath: {
type: String,
required: true,
},
projectNamespace: {
type: String,
required: true,
},
},
computed: {
issuableTemplatesJson() {
return JSON.stringify(this.issuableTemplates);
},
},
mounted() {
// Create the editor for the template
const editor = document.querySelector('.detail-page-description .note-textarea') || {};
editor.setValue = (val) => {
this.formState.description = val;
};
editor.getValue = () => this.formState.description;
this.issuableTemplate = new gl.IssuableTemplateSelectors({
$dropdowns: $(this.$refs.toggle),
editor,
});
},
};
</script>
<template>
<div
class="dropdown js-issuable-selector-wrap"
data-issuable-type="issue">
<button
class="dropdown-menu-toggle js-issuable-selector"
type="button"
ref="toggle"
data-field-name="issuable_template"
data-selected="null"
data-toggle="dropdown"
:data-namespace-path="projectNamespace"
:data-project-path="projectPath"
:data-data="issuableTemplatesJson">
<span class="dropdown-toggle-text">
Choose a template
</span>
<i
aria-hidden="true"
class="fa fa-chevron-down">
</i>
</button>
<div class="dropdown-menu dropdown-select">
<div class="dropdown-title">
Choose a template
<button
class="dropdown-title-button dropdown-menu-close"
aria-label="Close"
type="button">
<i
aria-hidden="true"
class="fa fa-times dropdown-menu-close-icon">
</i>
</button>
</div>
<div class="dropdown-input">
<input
type="search"
class="dropdown-input-field"
placeholder="Filter"
autocomplete="off" />
<i
aria-hidden="true"
class="fa fa-search dropdown-input-search">
</i>
<i
role="button"
aria-label="Clear templates search input"
class="fa fa-times dropdown-input-clear js-dropdown-input-clear">
</i>
</div>
<div class="dropdown-content"></div>
<div class="dropdown-footer">
<ul class="dropdown-footer-list">
<li>
<a class="no-template">
No template
</a>
</li>
<li>
<a class="reset-template">
Reset template
</a>
</li>
</ul>
</div>
</div>
</div>
</template>
app/assets/javascripts/issue_show/components/fields/project_move.vue 0 → 100644
View file @ 25b97e94
<script>
import tooltipMixin from '../../../vue_shared/mixins/tooltip';
export default {
mixins: [
tooltipMixin,
],
props: {
formState: {
type: Object,
required: true,
},
projectsAutocompleteUrl: {
type: String,
required: true,
},
},
mounted() {
const $moveDropdown = $(this.$refs['move-dropdown']);
$moveDropdown.select2({
ajax: {
url: this.projectsAutocompleteUrl,
quietMillis: 125,
data(term, page, context) {
return {
search: term,
offset_id: context,
};
},
results(data) {
const more = data.length >= 50;
const context = data[data.length - 1] ? data[data.length - 1].id : null;
return {
results: data,
more,
context,
};
},
},
formatResult(project) {
return project.name_with_namespace;
},
formatSelection(project) {
return project.name_with_namespace;
},
})
.on('change', (e) => {
this.formState.move_to_project_id = parseInt(e.target.value, 10);
});
},
beforeDestroy() {
$(this.$refs['move-dropdown']).select2('destroy');
},
};
</script>
<template>
<fieldset>
<label
for="issuable-move"
class="sr-only">
Move
</label>
<div class="issuable-form-select-holder append-right-5">
<input
ref="move-dropdown"
type="hidden"
id="issuable-move"
data-placeholder="Move to a different project" />
</div>
<span
data-placement="auto top"
title="Moving an issue will copy the discussion to a different project and close it here. All participants will be notified of the new location."
ref="tooltip">
<i
class="fa fa-question-circle"
aria-hidden="true">
</i>
</span>
</fieldset>
</template>
app/assets/javascripts/issue_show/components/fields/title.vue 0 → 100644
View file @ 25b97e94
<script>
import updateMixin from '../../mixins/update';
export default {
mixins: [updateMixin],
props: {
formState: {
type: Object,
required: true,
},
},
};
</script>
<template>
<fieldset>
<label
class="sr-only"
for="issue-title">
Title
</label>
<input
id="issue-title"
class="form-control"
type="text"
placeholder="Issue title"
aria-label="Issue title"
v-model="formState.title"
@keydown.meta.enter="updateIssuable" />
</fieldset>
</template>
app/assets/javascripts/issue_show/components/form.vue 0 → 100644
View file @ 25b97e94
<script>
import lockedWarning from './locked_warning.vue';
import titleField from './fields/title.vue';
import descriptionField from './fields/description.vue';
import editActions from './edit_actions.vue';
import descriptionTemplate from './fields/description_template.vue';
import projectMove from './fields/project_move.vue';
import confidentialCheckbox from './fields/confidential_checkbox.vue';
export default {
props: {
canMove: {
type: Boolean,
required: true,
},
canDestroy: {
type: Boolean,
required: true,
},
formState: {
type: Object,
required: true,
},
issuableTemplates: {
type: Array,
required: false,
default: () => [],
},
markdownPreviewUrl: {
type: String,
required: true,
},
markdownDocs: {
type: String,
required: true,
},
projectPath: {
type: String,
required: true,
},
projectNamespace: {
type: String,
required: true,
},
projectsAutocompleteUrl: {
type: String,
required: true,
},
},
components: {
lockedWarning,
titleField,
descriptionField,
descriptionTemplate,
editActions,
projectMove,
confidentialCheckbox,
},
computed: {
hasIssuableTemplates() {
return this.issuableTemplates.length;
},
},
};
</script>
<template>
<form>
<locked-warning v-if="formState.lockedWarningVisible" />
<div class="row">
<div
class="col-sm-4 col-lg-3"
v-if="hasIssuableTemplates">
<description-template
:form-state="formState"
:issuable-templates="issuableTemplates"
:project-path="projectPath"
:project-namespace="projectNamespace" />
</div>
<div
:class="{
'col-sm-8 col-lg-9': hasIssuableTemplates,
'col-xs-12': !hasIssuableTemplates,
}">
<title-field
:form-state="formState"
:issuable-templates="issuableTemplates" />
</div>
</div>
<description-field
:form-state="formState"
:markdown-preview-url="markdownPreviewUrl"
:markdown-docs="markdownDocs" />
<confidential-checkbox
:form-state="formState" />
<project-move
v-if="canMove"
:form-state="formState"
:projects-autocomplete-url="projectsAutocompleteUrl" />
<edit-actions
:form-state="formState"
:can-destroy="canDestroy" />
</form>
</template>
app/assets/javascripts/issue_show/components/locked_warning.vue 0 → 100644
View file @ 25b97e94
<script>
export default {
computed: {
currentPath() {
return location.pathname;
},
},
};
</script>
<template>
<div class="alert alert-danger">
Someone edited the issue at the same time you did. Please check out
<a
:href="currentPath"
target="_blank"
rel="nofollow">the issue</a>
and make sure your changes will not unintentionally remove theirs.
</div>
</template>
app/assets/javascripts/issue_show/event_hub.js 0 → 100644
View file @ 25b97e94
import Vue from 'vue';
export default new Vue();
app/assets/javascripts/issue_show/index.js
View file @ 25b97e94
import Vue from 'vue';
import eventHub from './event_hub';
import issuableApp from './components/app.vue';
import '../vue_shared/vue_resource_interceptor';
document.addEventListener('DOMContentLoaded', () => new Vue({
el: document.getElementById('js-issuable-app'),
components: {
issuableApp,
},
data() {
const issuableElement = this.$options.el;
const issuableTitleElement = issuableElement.querySelector('.title');
const issuableDescriptionElement = issuableElement.querySelector('.wiki');
const issuableDescriptionTextarea = issuableElement.querySelector('.js-task-list-field');
const {
canUpdate,
endpoint,
issuableRef,
} = issuableElement.dataset;
document.addEventListener('DOMContentLoaded', () => {
const initialDataEl = document.getElementById('js-issuable-app-initial-data');
const initialData = JSON.parse(initialDataEl.innerHTML.replace(/&quot;/g, '"'));
return {
canUpdate: gl.utils.convertPermissionToBoolean(canUpdate),
endpoint,
issuableRef,
initialTitle: issuableTitleElement.innerHTML,
initialDescriptionHtml: issuableDescriptionElement ? issuableDescriptionElement.innerHTML : '',
initialDescriptionText: issuableDescriptionTextarea ? issuableDescriptionTextarea.textContent : '',
};
},
render(createElement) {
return createElement('issuable-app', {
props: {
canUpdate: this.canUpdate,
endpoint: this.endpoint,
issuableRef: this.issuableRef,
initialTitle: this.initialTitle,
initialDescriptionHtml: this.initialDescriptionHtml,
initialDescriptionText: this.initialDescriptionText,
},
});
},
}));
$('.issuable-edit').on('click', (e) => {
e.preventDefault();
eventHub.$emit('open.form');
});
return new Vue({
el: document.getElementById('js-issuable-app'),
components: {
issuableApp,
},
data() {
return {
...initialData,
};
},
render(createElement) {
return createElement('issuable-app', {
props: {
canUpdate: this.canUpdate,
canDestroy: this.canDestroy,
canMove: this.canMove,
endpoint: this.endpoint,
issuableRef: this.issuableRef,
initialTitleHtml: this.initialTitleHtml,
initialTitleText: this.initialTitleText,
initialDescriptionHtml: this.initialDescriptionHtml,
initialDescriptionText: this.initialDescriptionText,
issuableTemplates: this.issuableTemplates,
isConfidential: this.isConfidential,
markdownPreviewUrl: this.markdownPreviewUrl,
markdownDocs: this.markdownDocs,
projectPath: this.projectPath,
projectNamespace: this.projectNamespace,
projectsAutocompleteUrl: this.projectsAutocompleteUrl,
},
});
},
});
});
app/assets/javascripts/issue_show/mixins/animate.js
View file @ 25b97e94
......@@ -4,7 +4,7 @@ export default {
this.preAnimation = true;
this.pulseAnimation = false;
this.$nextTick(() => {
setTimeout(() => {
this.preAnimation = false;
this.pulseAnimation = true;
});
......
app/assets/javascripts/issue_show/mixins/update.js 0 → 100644
View file @ 25b97e94
import eventHub from '../event_hub';
export default {
methods: {
updateIssuable() {
this.formState.updateLoading = true;
eventHub.$emit('update.issuable');
},
},
};
app/assets/javascripts/issue_show/services/index.js
View file @ 25b97e94
......@@ -7,10 +7,23 @@ export default class Service {
constructor(endpoint) {
this.endpoint = endpoint;
this.resource = Vue.resource(this.endpoint);
this.resource = Vue.resource(`${this.endpoint}.json`, {}, {
realtimeChanges: {
method: 'GET',
url: `${this.endpoint}/realtime_changes`,
},
});
}
getData() {
return this.resource.get();
return this.resource.realtimeChanges();
}
deleteIssuable() {
return this.resource.delete();
}
updateIssuable(data) {
return this.resource.update(data);
}
}
app/assets/javascripts/issue_show/stores/index.js
View file @ 25b97e94
export default class Store {
constructor({
titleHtml,
titleText,
descriptionHtml,
descriptionText,
}) {
this.state = {
titleHtml,
titleText: '',
titleText,
descriptionHtml,
descriptionText,
taskStatus: '',
updatedAt: '',
};
this.formState = {
title: '',
confidential: false,
description: '',
lockedWarningVisible: false,
move_to_project_id: 0,
updateLoading: false,
};
}
updateState(data) {
......@@ -22,4 +31,15 @@ export default class Store {
this.state.taskStatus = data.task_status;
this.state.updatedAt = data.updated_at;
}
stateShouldUpdate(data) {
return {
title: this.state.titleText !== data.title_text,
description: this.state.descriptionText !== data.description_text,
};
}
setFormState(state) {
this.formState = Object.assign(this.formState, state);
}
}
app/assets/javascripts/lib/utils/text_utility.js
View file @ 25b97e94
......@@ -170,7 +170,7 @@ gl.text.init = function(form) {
});
};
gl.text.removeListeners = function(form) {
return $('.js-md', form).off();
return $('.js-md', form).off('click');
};
gl.text.humanize = function(string) {
return string.charAt(0).toUpperCase() + string.replace(/_/g, ' ').slice(1);
......
app/assets/javascripts/merge_request_tabs.js
View file @ 25b97e94
......@@ -285,7 +285,7 @@ import BlobForkSuggestion from './blob/blob_fork_suggestion';
// Similar to `toggler_behavior` in the discussion tab
const hash = window.gl.utils.getLocationHash();
const anchor = hash && $container.find(`[id="${hash}"]`);
if (anchor) {
if (anchor && anchor.length > 0) {
const notesContent = anchor.closest('.notes_content');
const lineType = notesContent.hasClass('new') ? 'new' : 'old';
notes.toggleDiffNote({
......
app/assets/javascripts/notes.js
View file @ 25b97e94
......@@ -1219,7 +1219,7 @@ const normalizeNewlines = function(str) {
`<li id="${uniqueId}" class="note being-posted fade-in-half timeline-entry">
<div class="timeline-entry-inner">
<div class="timeline-icon">
<a href="/${currentUsername}"><span class="dummy-avatar"></span></a>
<a href="/${currentUsername}"><span class="avatar dummy-avatar"></span></a>
</div>
<div class="timeline-content ${discussionClass}">
<div class="note-header">
......
app/assets/javascripts/shortcuts_issuable.js
View file @ 25b97e94
......@@ -77,7 +77,9 @@ import './shortcuts_navigation';
ShortcutsIssuable.prototype.editIssue = function() {
var $editBtn;
$editBtn = $('.issuable-edit');
return gl.utils.visitUrl($editBtn.attr('href'));
// Need to click the element as on issues, editing is inline
// on merge request, editing is on a different page
$editBtn.get(0).click();
};
ShortcutsIssuable.prototype.openSidebarDropdown = function(name) {
......
app/assets/javascripts/single_file_diff.js
View file @ 25b97e94
......@@ -4,7 +4,7 @@
window.SingleFileDiff = (function() {
var COLLAPSED_HTML, ERROR_HTML, LOADING_HTML, WRAPPER;
WRAPPER = '<div class="diff-content diff-wrap-lines"></div>';
WRAPPER = '<div class="diff-content"></div>';
LOADING_HTML = '<i class="fa fa-spinner fa-spin"></i>';
......
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js
View file @ 25b97e94
......@@ -13,7 +13,7 @@ export default {
},
data() {
return {
removeSourceBranch: true,
removeSourceBranch: this.mr.shouldRemoveSourceBranch,
mergeWhenBuildSucceeds: false,
useCommitMessageWithDescription: false,
setToMergeWhenPipelineSucceeds: false,
......@@ -70,6 +70,9 @@ export default {
|| this.isApprovalNeeded
|| this.mr.preventMerge);
},
isRemoveSourceBranchButtonDisabled() {
return this.isMergeButtonDisabled || !this.mr.canRemoveSourceBranch;
},
shouldShowSquashBeforeMerge() {
const { commitsCount, enableSquashBeforeMerge } = this.mr;
return enableSquashBeforeMerge && commitsCount > 1;
......@@ -256,8 +259,9 @@ export default {
<template v-if="isMergeAllowed()">
<label class="spacing">
<input
id="remove-source-branch-input"
v-model="removeSourceBranch"
:disabled="isMergeButtonDisabled"
:disabled="isRemoveSourceBranchButtonDisabled"
type="checkbox"/> Remove source branch
</label>
......
app/assets/javascripts/vue_merge_request_widget/ee/components/approvals/approvals_footer.js
View file @ 25b97e94
/* global Flash */
import pendingAvatarSvg from 'icons/_icon_dotted_circle.svg';
import LinkToMemberAvatar from '~/vue_shared/components/link_to_member_avatar';
import eventHub from '../../../event_hub';
......@@ -38,7 +37,6 @@ export default {
data() {
return {
unapproving: false,
pendingAvatarSvg,
};
},
components: {
......@@ -68,23 +66,22 @@ export default {
template: `
<div v-if="approvedBy.length" class="approved-by-users approvals-footer clearfix mr-info-list">
<div class="legend"></div>
<div>
<p class="approvers-prefix">Approved by</p>
<div class="approvers-prefix">
<p>Approved by</p>
<div class="approvers-list">
<span v-for="approver in approvedBy">
<link-to-member-avatar
:avatarSize="20"
extra-link-class="approver-avatar"
:avatar-url="approver.user.avatar_url"
:display-name="approver.user.name"
:profile-url="approver.user.web_url"
:show-tooltip="true" />
</span>
<span class="potential-approvers-list" v-for="n in approvalsLeft">
<link-to-member-avatar
:avatarSize="20"
:clickable="false"
:avatar-html="pendingAvatarSvg"
:show-tooltip="false"
extra-link-class="hide-asset" />
:show-tooltip="false" />
</span>
</div>
<span class="unapprove-btn-wrap" v-if="showUnapproveButton">
......
app/assets/javascripts/vue_merge_request_widget/ee/components/mr_widget_code_quality.vue 0 → 100644
View file @ 25b97e94
<script>
import successIcon from 'icons/_icon_status_success.svg';
import errorIcon from 'icons/_icon_status_failed.svg';
import issuesBlock from './mr_widget_code_quality_issues.vue';
import loadingIcon from '../../../vue_shared/components/loading_icon.vue';
import '../../../lib/utils/text_utility';
export default {
name: 'MRWidgetCodeQuality',
props: {
mr: {
type: Object,
required: true,
},
service: {
type: Object,
required: true,
},
},
components: {
issuesBlock,
loadingIcon,
},
data() {
return {
collapseText: 'Expand',
isCollapsed: true,
isLoading: false,
loadingFailed: false,
};
},
computed: {
stateIcon() {
return this.mr.codeclimateMetrics.newIssues.length ? errorIcon : successIcon;
},
hasNoneIssues() {
const { newIssues, resolvedIssues } = this.mr.codeclimateMetrics;
return !newIssues.length && !resolvedIssues.length;
},
hasIssues() {
const { newIssues, resolvedIssues } = this.mr.codeclimateMetrics;
return newIssues.length || resolvedIssues.length;
},
codeText() {
const { newIssues, resolvedIssues } = this.mr.codeclimateMetrics;
let newIssuesText = '';
let resolvedIssuesText = '';
let text = '';
if (this.hasNoneIssues) {
text = 'No changes to code quality so far.';
} else if (this.hasIssues) {
if (newIssues.length) {
newIssuesText = `degraded on ${newIssues.length} ${this.pointsText(newIssues)}`;
}
if (resolvedIssues.length) {
resolvedIssuesText = `improved on ${resolvedIssues.length} ${this.pointsText(resolvedIssues)}`;
}
const connector = this.hasIssues ? 'and' : '';
text = `Code quality ${resolvedIssuesText} ${connector} ${newIssuesText}.`;
}
return text;
},
},
methods: {
pointsText(issues) {
return gl.text.pluralize('point', issues.length);
},
toggleCollapsed() {
this.isCollapsed = !this.isCollapsed;
const text = this.isCollapsed ? 'Expand' : 'Collapse';
this.collapseText = text;
},
handleError() {
this.isLoading = false;
this.loadingFailed = true;
},
},
created() {
const { head_path, base_path } = this.mr.codeclimate;
this.isLoading = true;
this.service.fetchCodeclimate(head_path)
.then(resp => resp.json())
.then((data) => {
this.mr.setCodeclimateHeadMetrics(data);
this.service.fetchCodeclimate(base_path)
.then(response => response.json())
.then(baseData => this.mr.setCodeclimateBaseMetrics(baseData))
.then(() => this.mr.compareCodeclimateMetrics())
.then(() => {
this.isLoading = false;
})
.catch(() => this.handleError());
})
.catch(() => this.handleError());
},
};
</script>
<template>
<section class="mr-widget-code-quality">
<div
v-if="isLoading"
class="padding-left">
<i
class="fa fa-spinner fa-spin"
aria-hidden="true">
</i>
Loading codeclimate report.
</div>
<div v-else-if="!isLoading && !loadingFailed">
<span
class="padding-left ci-status-icon"
:class="{
'ci-status-icon-failed': mr.codeclimateMetrics.newIssues.length,
'ci-status-icon-passed': mr.codeclimateMetrics.newIssues.length === 0
}"
v-html="stateIcon">
</span>
<span>
{{codeText}}
</span>
<button
type="button"
class="btn-link btn-blank"
v-if="hasIssues"
@click="toggleCollapsed">
{{collapseText}}
</button>
<div
class="code-quality-container"
v-if="hasIssues"
v-show="!isCollapsed">
<issues-block
class="js-mr-code-resolved-issues"
v-if="mr.codeclimateMetrics.resolvedIssues.length"
type="success"
:issues="mr.codeclimateMetrics.resolvedIssues"
/>
<issues-block
class="js-mr-code-new-issues"
v-if="mr.codeclimateMetrics.newIssues.length"
type="failed"
:issues="mr.codeclimateMetrics.newIssues"
/>
</div>
</div>
<div
v-else-if="loadingFailed"
class="padding-left">
Failed to load codeclimate report.
</div>
</section>
</template>
app/assets/javascripts/vue_merge_request_widget/ee/components/mr_widget_code_quality_issues.vue 0 → 100644
View file @ 25b97e94
<script>
export default {
name: 'MRWidgetCodeQualityIssues',
props: {
issues: {
type: Array,
required: true,
},
type: {
type: String,
required: true,
},
},
};
</script>
<template>
<ul class="mr-widget-code-quality-list">
<li
class="commit-sha"
:class="{
failed: type === 'failed',
success: type === 'success'
}
"v-for="issue in issues">
<i
class="fa"
:class="{
'fa-minus': type === 'failed',
'fa-plus': type === 'success'
}"
aria-hidden="true">
</i>
<span>
<span v-if="type === 'success'">Fixed:</span>
{{issue.check_name}}
{{issue.location.path}}
{{issue.location.positions}}
{{issue.location.lines}}
</span>
</li>
</ul>
</template>
app/assets/javascripts/vue_merge_request_widget/ee/mr_widget_options.js
View file @ 25b97e94
......@@ -2,6 +2,7 @@ import CEWidgetOptions from '../mr_widget_options';
import WidgetApprovals from './components/approvals/mr_widget_approvals';
import GeoSecondaryNode from './components/states/mr_widget_secondary_geo_node';
import RebaseState from './components/states/mr_widget_rebase';
import WidgetCodeQuality from './components/mr_widget_code_quality.vue';
export default {
extends: CEWidgetOptions,
......@@ -9,11 +10,16 @@ export default {
'mr-widget-approvals': WidgetApprovals,
'mr-widget-geo-secondary-node': GeoSecondaryNode,
'mr-widget-rebase': RebaseState,
'mr-widget-code-quality': WidgetCodeQuality,
},
computed: {
shouldRenderApprovals() {
return this.mr.approvalsRequired;
},
shouldRenderCodeQuality() {
const { codeclimate } = this.mr;
return codeclimate && codeclimate.head_path && codeclimate.base_path;
},
},
template: `
<div class="mr-state-widget prepend-top-default">
......@@ -29,6 +35,11 @@ export default {
v-if="mr.approvalsRequired"
:mr="mr"
:service="service" />
<mr-widget-code-quality
v-if="shouldRenderCodeQuality"
:mr="mr"
:service="service"
/>
<component
:is="componentName"
:mr="mr"
......
app/assets/javascripts/vue_merge_request_widget/ee/services/mr_widget_service.js
View file @ 25b97e94
......@@ -28,4 +28,8 @@ export default class MRWidgetService extends CEWidgetService {
rebase() {
return this.rebaseResource.save();
}
fetchCodeclimate(endpoint) { // eslint-disable-line
return Vue.http.get(endpoint);
}
}
app/assets/javascripts/vue_merge_request_widget/ee/stores/mr_widget_store.js
View file @ 25b97e94
import CEMergeRequestStore from '../../stores/mr_widget_store';
export default class MergeRequestStore extends CEMergeRequestStore {
constructor(data) {
super(data);
this.initCodeclimate(data);
}
setData(data) {
this.initGeo(data);
this.initSquashBeforeMerge(data);
......@@ -43,4 +48,33 @@ export default class MergeRequestStore extends CEMergeRequestStore {
this.isApproved = !this.approvalsLeft || false;
this.preventMerge = this.approvalsRequired && this.approvalsLeft;
}
initCodeclimate(data) {
this.codeclimate = data.codeclimate;
this.codeclimateMetrics = {
headIssues: [],
baseIssues: [],
newIssues: [],
resolvedIssues: [],
};
}
setCodeclimateHeadMetrics(data) {
this.codeclimateMetrics.headIssues = data;
}
setCodeclimateBaseMetrics(data) {
this.codeclimateMetrics.baseIssues = data;
}
compareCodeclimateMetrics() {
const { headIssues, baseIssues } = this.codeclimateMetrics;
this.codeclimateMetrics.newIssues = this.filterByFingerprint(headIssues, baseIssues);
this.codeclimateMetrics.resolvedIssues = this.filterByFingerprint(baseIssues, headIssues);
}
filterByFingerprint(firstArray, secondArray) { // eslint-disable-line
return firstArray.filter(item => !secondArray.find(el => el.fingerprint === item.fingerprint));
}
}
app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js
View file @ 25b97e94
......@@ -81,13 +81,12 @@ export default {
.then((res) => {
this.mr.setData(res);
this.setFavicon();
if (cb) {
cb.call(null, res);
}
})
.catch(() => {
new Flash('Something went wrong. Please try again.'); // eslint-disable-line
});
.catch(() => new Flash('Something went wrong. Please try again.'));
},
initPolling() {
this.pollingInterval = new gl.SmartInterval({
......@@ -134,9 +133,7 @@ export default {
document.body.appendChild(el);
}
})
.catch(() => {
new Flash('Something went wrong. Please try again.'); // eslint-disable-line
});
.catch(() => new Flash('Something went wrong. Please try again.'));
},
resumePolling() {
this.pollingInterval.resume();
......
app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
View file @ 25b97e94
......@@ -2,9 +2,9 @@ import Timeago from 'timeago.js';
import { getStateKey } from '../dependencies';
export default class MergeRequestStore {
constructor(data) {
this.sha = data.diff_head_sha;
this.setData(data);
}
......@@ -53,7 +53,7 @@ export default class MergeRequestStore {
this.cancelAutoMergePath = data.cancel_merge_when_pipeline_succeeds_path;
this.removeWIPPath = data.remove_wip_path;
this.sourceBranchRemoved = !data.source_branch_exists;
this.shouldRemoveSourceBranch = (data.merge_params || {}).should_remove_source_branch || false;
this.shouldRemoveSourceBranch = data.remove_source_branch || false;
this.onlyAllowMergeIfPipelineSucceeds = data.only_allow_merge_if_pipeline_succeeds || false;
this.mergeWhenPipelineSucceeds = data.merge_when_pipeline_succeeds || false;
this.mergePath = data.merge_path;
......@@ -135,5 +135,4 @@ export default class MergeRequestStore {
return timeagoInstance.format(event.updated_at);
}
}
app/assets/javascripts/vue_shared/components/header_ci_component.vue 0 → 100644
View file @ 25b97e94
<script>
import ciIconBadge from './ci_badge_link.vue';
import timeagoTooltip from './time_ago_tooltip.vue';
import tooltipMixin from '../mixins/tooltip';
import userAvatarLink from './user_avatar/user_avatar_link.vue';
/**
* Renders header component for job and pipeline page based on UI mockups
*
* Used in:
* - job show page
* - pipeline show page
*/
export default {
props: {
status: {
type: Object,
required: true,
},
itemName: {
type: String,
required: true,
},
itemId: {
type: Number,
required: true,
},
time: {
type: String,
required: true,
},
user: {
type: Object,
required: true,
},
actions: {
type: Array,
required: false,
default: () => [],
},
},
mixins: [
tooltipMixin,
],
components: {
ciIconBadge,
timeagoTooltip,
userAvatarLink,
},
computed: {
userAvatarAltText() {
return `${this.user.name}'s avatar`;
},
},
methods: {
onClickAction(action) {
this.$emit('postAction', action);
},
},
};
</script>
<template>
<header class="page-content-header top-area">
<section class="header-main-content">
<ci-icon-badge :status="status" />
<strong>
{{itemName}} #{{itemId}}
</strong>
triggered
<timeago-tooltip :time="time" />
by
<user-avatar-link
:link-href="user.web_url"
:img-src="user.avatar_url"
:img-alt="userAvatarAltText"
:tooltip-text="user.name"
:img-size="24"
/>
<a
:href="user.web_url"
:title="user.email"
class="js-user-link commit-committer-link"
ref="tooltip">
{{user.name}}
</a>
</section>
<section
class="header-action-button nav-controls"
v-if="actions.length">
<template
v-for="action in actions">
<a
v-if="action.type === 'link'"
:href="action.path"
:class="action.cssClass">
{{action.label}}
</a>
<button
v-else="action.type === 'button'"
@click="onClickAction(action)"
:class="action.cssClass"
type="button">
{{action.label}}
</button>
</template>
</section>
</header>
</template>
app/assets/javascripts/vue_shared/components/link_to_member_avatar.js
View file @ 25b97e94
// Analogue of link_to_member_avatar in app/helpers/projects_helper.rb
import pendingAvatarSvg from 'icons/_icon_dotted_circle.svg';
export default {
props: {
......@@ -52,6 +53,7 @@ export default {
data() {
return {
avatarBaseClass: 'avatar avatar-inline',
pendingAvatarSvg,
};
},
computed: {
......@@ -59,7 +61,7 @@ export default {
return `s${this.avatarSize}`;
},
avatarHtmlClass() {
return `${this.avatarSizeClass} ${this.avatarBaseClass}`;
return `${this.avatarSizeClass} ${this.avatarBaseClass} avatar-placeholder`;
},
tooltipClass() {
return this.showTooltip ? 'has-tooltip' : '';
......@@ -84,21 +86,23 @@ export default {
:class="linkClass"
:title="displayName"
:data-container="tooltipContainerAttr">
<img
v-if="avatarUrl"
:class="avatarClass"
:src="avatarUrl"
:width="avatarSize"
:height="avatarSize"
:alt="displayName"/>
<svg
v-if="avatarHtml"
v-html="avatarHtml"
v-else
v-html="pendingAvatarSvg"
:class="avatarHtmlClass"
:width="avatarSize"
:height="avatarSize"
:alt="displayName">
</svg>
<img
:class="avatarClass"
:src="avatarUrl"
:width="avatarSize"
:height="avatarSize"
:alt="displayName"/>
</a>
</div>
`,
......
app/assets/javascripts/vue_shared/components/markdown/field.vue 0 → 100644
View file @ 25b97e94
<script>
/* global Flash */
import markdownHeader from './header.vue';
import markdownToolbar from './toolbar.vue';
export default {
props: {
markdownPreviewUrl: {
type: String,
required: false,
default: '',
},
markdownDocs: {
type: String,
required: true,
},
},
data() {
return {
markdownPreview: '',
markdownPreviewLoading: false,
previewMarkdown: false,
};
},
components: {
markdownHeader,
markdownToolbar,
},
methods: {
toggleMarkdownPreview() {
this.previewMarkdown = !this.previewMarkdown;
if (!this.previewMarkdown) {
this.markdownPreview = '';
} else {
this.markdownPreviewLoading = true;
this.$http.post(
this.markdownPreviewUrl,
{
/*
Can't use `$refs` as the component is technically in the parent component
so we access the VNode & then get the element
*/
text: this.$slots.textarea[0].elm.value,
},
)
.then((res) => {
const data = res.json();
this.markdownPreviewLoading = false;
this.markdownPreview = data.body;
this.$nextTick(() => {
$(this.$refs['markdown-preview']).renderGFM();
});
})
.catch(() => new Flash('Error loading markdown preview'));
}
},
},
mounted() {
/*
GLForm class handles all the toolbar buttons
*/
return new gl.GLForm($(this.$refs['gl-form']), true);
},
};
</script>
<template>
<div
class="md-area prepend-top-default append-bottom-default js-vue-markdown-field"
ref="gl-form">
<markdown-header
:preview-markdown="previewMarkdown"
@toggle-markdown="toggleMarkdownPreview" />
<div
class="md-write-holder"
v-show="!previewMarkdown">
<div class="zen-backdrop">
<slot name="textarea"></slot>
<a
class="zen-control zen-control-leave js-zen-leave"
href="#"
aria-label="Enter zen mode">
<i
class="fa fa-compress"
aria-hidden="true">
</i>
</a>
<markdown-toolbar
:markdown-docs="markdownDocs" />
</div>
</div>
<div
class="md md-preview-holder md-preview"
v-show="previewMarkdown">
<div
ref="markdown-preview"
v-html="markdownPreview">
</div>
<span v-if="markdownPreviewLoading">
Loading...
</span>
</div>
</div>
</template>
app/assets/javascripts/vue_shared/components/markdown/header.vue 0 → 100644
View file @ 25b97e94
<script>
import tooltipMixin from '../../mixins/tooltip';
import toolbarButton from './toolbar_button.vue';
export default {
mixins: [
tooltipMixin,
],
props: {
previewMarkdown: {
type: Boolean,
required: true,
},
},
components: {
toolbarButton,
},
methods: {
toggleMarkdownPreview(e, form) {
if (form && !form.find('.js-vue-markdown-field').length) {
return;
} else if (e.target.blur) {
e.target.blur();
}
this.$emit('toggle-markdown');
},
},
mounted() {
$(document).on('markdown-preview:show.vue', this.toggleMarkdownPreview);
$(document).on('markdown-preview:hide.vue', this.toggleMarkdownPreview);
},
beforeDestroy() {
$(document).on('markdown-preview:show.vue', this.toggleMarkdownPreview);
$(document).off('markdown-preview:hide.vue', this.toggleMarkdownPreview);
},
};
</script>
<template>
<div class="md-header">
<ul class="nav-links clearfix">
<li :class="{ active: !previewMarkdown }">
<a
href="#md-write-holder"
tabindex="-1"
@click.prevent="toggleMarkdownPreview($event)">
Write
</a>
</li>
<li :class="{ active: previewMarkdown }">
<a
href="#md-preview-holder"
tabindex="-1"
@click.prevent="toggleMarkdownPreview($event)">
Preview
</a>
</li>
<li class="pull-right">
<div class="toolbar-group">
<toolbar-button
tag="**"
button-title="Add bold text"
icon="bold" />
<toolbar-button
tag="*"
button-title="Add italic text"
icon="italic" />
<toolbar-button
tag="> "
:prepend="true"
button-title="Insert a quote"
icon="quote-right" />
<toolbar-button
tag="`"
tag-block="```"
button-title="Insert code"
icon="code" />
<toolbar-button
tag="* "
:prepend="true"
button-title="Add a bullet list"
icon="list-ul" />
<toolbar-button
tag="1. "
:prepend="true"
button-title="Add a numbered list"
icon="list-ol" />
<toolbar-button
tag="* [ ] "
:prepend="true"
button-title="Add a task list"
icon="check-square-o" />
</div>
<div class="toolbar-group">
<button
aria-label="Go full screen"
class="toolbar-btn js-zen-enter"
data-container="body"
tabindex="-1"
title="Go full screen"
type="button"
ref="tooltip">
<i
aria-hidden="true"
class="fa fa-arrows-alt fa-fw">
</i>
</button>
</div>
</li>
</ul>
</div>
</template>
app/assets/javascripts/vue_shared/components/markdown/toolbar.vue 0 → 100644
View file @ 25b97e94
<script>
export default {
props: {
markdownDocs: {
type: String,
required: true,
},
},
};
</script>
<template>
<div class="comment-toolbar clearfix">
<div class="toolbar-text">
<a
:href="markdownDocs"
target="_blank"
tabindex="-1">
Markdown is supported
</a>
</div>
<button
class="toolbar-button markdown-selector"
type="button"
tabindex="-1">
<i
class="fa fa-file-image-o toolbar-button-icon"
aria-hidden="true">
</i>
Attach a file
</button>
</div>
</template>
app/assets/javascripts/vue_shared/components/markdown/toolbar_button.vue 0 → 100644
View file @ 25b97e94
<script>
import tooltipMixin from '../../mixins/tooltip';
export default {
mixins: [
tooltipMixin,
],
props: {
buttonTitle: {
type: String,
required: true,
},
icon: {
type: String,
required: true,
},
tag: {
type: String,
required: true,
},
tagBlock: {
type: String,
required: false,
default: '',
},
prepend: {
type: Boolean,
required: false,
default: false,
},
},
computed: {
iconClass() {
return `fa-${this.icon}`;
},
},
};
</script>
<template>
<button
type="button"
class="toolbar-btn js-md hidden-xs"
tabindex="-1"
ref="tooltip"
data-container="body"
:data-md-tag="tag"
:data-md-block="tagBlock"
:data-md-prepend="prepend"
:title="buttonTitle"
:aria-label="buttonTitle">
<i
aria-hidden="true"
class="fa fa-fw"
:class="iconClass">
</i>
</button>
</template>
app/assets/javascripts/vue_shared/components/time_ago_tooltip.vue 0 → 100644
View file @ 25b97e94
<script>
import tooltipMixin from '../mixins/tooltip';
import timeagoMixin from '../mixins/timeago';
import '../../lib/utils/datetime_utility';
/**
* Port of ruby helper time_ago_with_tooltip
*/
export default {
props: {
time: {
type: String,
required: true,
},
tooltipPlacement: {
type: String,
required: false,
default: 'top',
},
shortFormat: {
type: Boolean,
required: false,
default: false,
},
cssClass: {
type: String,
required: false,
default: '',
},
},
mixins: [
tooltipMixin,
timeagoMixin,
],
computed: {
timeagoCssClass() {
return this.shortFormat ? 'js-short-timeago' : 'js-timeago';
},
},
};
</script>
<template>
<time
:class="[timeagoCssClass, cssClass]"
class="js-timeago js-timeago-render"
:title="tooltipTitle(time)"
:data-placement="tooltipPlacement"
data-container="body"
ref="tooltip">
{{timeFormated(time)}}
</time>
</template>
app/assets/javascripts/vue_shared/mixins/timeago.js 0 → 100644
View file @ 25b97e94
import '../../lib/utils/datetime_utility';
/**
* Mixin with time ago methods used in some vue components
*/
export default {
methods: {
timeFormated(time) {
const timeago = gl.utils.getTimeago();
return timeago.format(time);
},
tooltipTitle(time) {
return gl.utils.formatDate(time);
},
},
};
app/assets/javascripts/vue_shared/mixins/tooltip.js
View file @ 25b97e94
......@@ -6,4 +6,8 @@ export default {
updated() {
$(this.$refs.tooltip).tooltip('fixTitle');
},
beforeDestroy() {
$(this.$refs.tooltip).tooltip('destroy');
},
};
app/assets/stylesheets/framework.scss
View file @ 25b97e94
......@@ -34,6 +34,7 @@
@import "framework/selects.scss";
@import "framework/sidebar.scss";
@import "framework/tables.scss";
@import "framework/notes.scss";
@import "framework/timeline.scss";
@import "framework/typography.scss";
@import "framework/zen.scss";
......
app/assets/stylesheets/framework/avatar.scss
View file @ 25b97e94
......@@ -59,6 +59,10 @@
border: none;
}
&.avatar-placeholder {
border: none;
}
&:not([href]):hover {
border-color: rgba($avatar-border, .2);
}
......
app/assets/stylesheets/framework/awards.scss
View file @ 25b97e94
......@@ -10,7 +10,7 @@
top: 0;
margin-top: 3px;
padding: $gl-padding;
z-index: 9;
z-index: 300;
width: 300px;
font-size: 14px;
background-color: $white-light;
......
app/assets/stylesheets/framework/blocks.scss
View file @ 25b97e94
......@@ -23,7 +23,6 @@
.row-content-block {
margin-top: 0;
margin-bottom: -$gl-padding;
background-color: $gray-light;
padding: $gl-padding;
margin-bottom: 0;
......
app/assets/stylesheets/framework/emojis.scss
View file @ 25b97e94
gl-emoji {
display: inline-block;
display: inline-flex;
vertical-align: middle;
font-family: "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
......
app/assets/stylesheets/framework/files.scss
View file @ 25b97e94
......@@ -66,10 +66,10 @@
&.video {
background: $file-image-bg;
text-align: center;
padding: 30px;
img,
video {
padding: 20px;
max-width: 80%;
}
}
......
app/assets/stylesheets/framework/flash.scss
View file @ 25b97e94
......@@ -36,6 +36,10 @@
border-radius: 0;
}
}
&:empty {
margin: 0;
}
}
@media (max-width: $screen-sm-max) {
......
app/assets/stylesheets/framework/lists.scss
View file @ 25b97e94
......@@ -11,7 +11,6 @@
> li {
padding: 10px 15px;
min-height: 20px;
border-bottom: 1px solid $list-border-light;
border-bottom: 1px solid $list-border;
&::after {
......
app/assets/stylesheets/framework/notes.scss 0 → 100644
View file @ 25b97e94
@mixin notes-media($condition, $breakpoint-width) {
@media (#{$condition}-width: ($breakpoint-width)) {
@content;
}
// Diff is side by side
.notes_content.parallel & {
// We hide at double what we normally hide at because
// there are two columns of notes
@media (#{$condition}-width: (2 * $breakpoint-width)) {
@content;
}
}
}
app/assets/stylesheets/framework/selects.scss
View file @ 25b97e94
......@@ -97,7 +97,6 @@
.select2-search-field input {
padding: 5px $gl-padding / 2;
font-size: 13px;
height: auto;
font-family: inherit;
font-size: inherit;
......
app/assets/stylesheets/framework/timeline.scss
View file @ 25b97e94
......@@ -3,9 +3,9 @@
margin: 0;
padding: 0;
.note-text {
p:last-child {
margin-bottom: 0 !important;
&::before {
@include notes-media('max', $screen-xs-max) {
background: none;
}
}
......@@ -29,6 +29,16 @@
.timeline-entry-inner {
position: relative;
@include notes-media('max', $screen-xs-max) {
.timeline-icon {
display: none;
}
.timeline-content {
margin-left: 0;
}
}
}
&:target,
......@@ -46,24 +56,6 @@
}
}
@media (max-width: $screen-xs-max) {
.timeline {
&::before {
background: none;
}
}
.timeline-entry .timeline-entry-inner {
.timeline-icon {
display: none;
}
.timeline-content {
margin-left: 0;
}
}
}
.discussion .timeline-entry {
margin: 0;
border-right: none;
......
app/assets/stylesheets/framework/typography.scss
View file @ 25b97e94
......@@ -21,6 +21,10 @@
margin-top: 0;
}
> :last-child {
margin-bottom: 0;
}
// Single code lines should wrap
code {
font-family: $monospace_font;
......@@ -157,7 +161,7 @@
ul,
ol {
padding: 0;
margin: 0 0 16px !important;
margin: 0 0 16px;
}
ul:dir(rtl),
......
app/assets/stylesheets/framework/variables.scss
View file @ 25b97e94
......@@ -250,7 +250,6 @@ $dark-diff-match-bg: rgba(255, 255, 255, 0.3);
$dark-diff-match-color: rgba(255, 255, 255, 0.1);
$file-mode-changed: #777;
$file-mode-changed: #777;
$diff-image-bg: #ddd;
$diff-image-info-color: grey;
$diff-swipe-border: #999;
$diff-view-modes-color: grey;
......
app/assets/stylesheets/pages/boards.scss
View file @ 25b97e94
......@@ -101,7 +101,9 @@
@media (min-width: $screen-sm-min) {
height: 475px; // Needed for PhantomJS
// scss-lint:disable DuplicateProperty
height: calc(100vh - 222px);
// scss-lint:enable DuplicateProperty
min-height: 475px;
transition: width .2s;
......
app/assets/stylesheets/pages/ci_projects.scss
View file @ 25b97e94
......@@ -36,7 +36,6 @@
pre.commit-message {
background: none;
padding: 0;
margin: 0;
border: none;
margin: 20px 0;
border-radius: 0;
......
app/assets/stylesheets/pages/diff.scss
View file @ 25b97e94
......@@ -94,7 +94,6 @@
.old_line,
.new_line {
margin: 0;
padding: 0;
border: none;
padding: 0 5px;
border-right: 1px solid;
......@@ -151,14 +150,10 @@
}
}
}
.text-file.diff-wrap-lines table .line_holder td span {
white-space: pre-wrap;
}
}
.image {
background: $diff-image-bg;
background: $file-image-bg;
text-align: center;
padding: 30px;
......
app/assets/stylesheets/pages/issuable.scss
View file @ 25b97e94
......@@ -430,7 +430,7 @@
}
.detail-page-description {
padding: 16px 0 0;
padding: 16px 0;
small {
color: $gray-darkest;
......@@ -440,7 +440,7 @@
.edited-text {
color: $gray-darkest;
display: block;
margin: 0 0 16px;
margin: 16px 0 0;
.author_link {
color: $gray-darkest;
......
app/assets/stylesheets/pages/issues.scss
View file @ 25b97e94
......@@ -219,7 +219,6 @@ ul.related-merge-requests > li {
.dropdown-toggle {
.fa-caret-down {
pointer-events: none;
margin-left: 0;
color: inherit;
margin-left: 0;
}
......
app/assets/stylesheets/pages/merge_requests.scss
View file @ 25b97e94
......@@ -817,32 +817,11 @@
top: 10px;
}
// vertically centers all children
> span {
align-self: center;
}
.hide-asset {
img {
display: none;
}
svg {
margin-bottom: -7px; // makes up for border removed
border: none;
}
}
.approvers-prefix,
.approvers-list {
display: flex;
align-items: center;
margin-right: 5px;
float: left;
}
.approvers-list img {
width: 18px;
height: 18px;
margin-top: 3px;
}
.unapprove-btn {
......@@ -860,18 +839,8 @@
}
}
// styles for approver avatar checkmark
.approver-avatar {
position: relative;
display: inline-block;
svg.avatar {
position: absolute;
top: 12%;
right: 4%;
height: 45%;
width: 45%;
}
}
}
......@@ -882,8 +851,9 @@
}
.avatar {
margin-bottom: -2px;
margin-right: 3px;
margin-bottom: 0;
margin-left: 7px;
display: block;
}
}
......@@ -905,3 +875,42 @@
}
}
}
.mr-widget-code-quality {
padding-top: $gl-padding-top;
.padding-left {
padding-left: $gl-padding;
}
.ci-status-icon {
vertical-align: sub;
svg {
width: 22px;
height: 22px;
margin-right: 4px;
}
}
.code-quality-container {
border-top: 1px solid $gray-darker;
border-bottom: 1px solid $gray-darker;
padding: $gl-padding-top;
background-color: $gray-light;
.mr-widget-code-quality-list {
list-style: none;
padding: 0 36px;
margin: 0;
li.success {
color: $green-500;
}
li.failed {
color: $red-500;
}
}
}
}
app/assets/stylesheets/pages/note_form.scss
View file @ 25b97e94
......@@ -28,7 +28,7 @@
.note-edit-form {
.note-form-actions {
position: relative;
margin: $gl-padding 0;
margin: $gl-padding 0 0;
}
.note-preview-holder {
......@@ -124,10 +124,18 @@
}
.discussion-form {
padding: $gl-padding-top $gl-padding;
padding: $gl-padding-top $gl-padding $gl-padding;
background-color: $white-light;
}
.discussion-notes .disabled-comment {
padding: 6px 0;
}
.notes-form > li {
border: 0;
}
.note-edit-form {
display: none;
font-size: 14px;
......
app/assets/stylesheets/pages/notes.scss
View file @ 25b97e94
......@@ -14,24 +14,11 @@ ul.notes {
margin: 0;
padding: 0;
.timeline-icon {
float: left;
svg {
width: 16px;
height: 16px;
fill: $gray-darkest;
position: absolute;
left: 0;
top: 16px;
}
}
.timeline-content {
margin-left: 55px;
&.timeline-content-form {
@media (max-width: $screen-sm-max) {
@include notes-media('max', $screen-sm-max) {
margin-left: 0;
}
}
......@@ -56,21 +43,22 @@ ul.notes {
position: relative;
}
.note {
padding: $gl-padding $gl-btn-padding 0;
> li {
padding: $gl-padding $gl-btn-padding;
display: block;
position: relative;
border-bottom: 1px solid $white-normal;
&:last-child {
// Override `.timeline > li:last-child { border-bottom: none; }`
border-bottom: 1px solid $white-normal;
}
&.being-posted {
pointer-events: none;
opacity: 0.5;
.dummy-avatar {
display: inline-block;
height: 40px;
width: 40px;
border-radius: 50%;
background-color: $kdb-border;
border: 1px solid darken($kdb-border, 25%);
}
......@@ -126,13 +114,13 @@ ul.notes {
.note-awards {
.js-awards-block {
margin-bottom: 16px;
margin-top: 16px;
}
}
.note-header {
@media (max-width: $screen-xs-min) {
@include notes-media('max', $screen-xs-min) {
.inline {
display: block;
}
......@@ -161,10 +149,10 @@ ul.notes {
.system-note {
font-size: 14px;
padding: 0;
padding-left: 0;
clear: both;
@media (min-width: $screen-sm-min) {
@include notes-media('min', $screen-sm-min) {
margin-left: 65px;
}
......@@ -198,11 +186,22 @@ ul.notes {
}
}
.timeline-content {
padding: 14px 10px;
.timeline-icon {
float: left;
@media (min-width: $screen-sm-min) {
margin-left: 20px;
svg {
width: 16px;
height: 16px;
fill: $gray-darkest;
position: absolute;
left: 0;
top: 2px;
}
}
.timeline-content {
@include notes-media('min', $screen-sm-min) {
margin-left: 30px;
}
}
......@@ -371,7 +370,7 @@ ul.notes {
display: flex;
justify-content: space-between;
@media (max-width: $screen-xs-max) {
@include notes-media('max', $screen-xs-max) {
flex-flow: row wrap;
}
}
......@@ -385,10 +384,16 @@ ul.notes {
padding-bottom: 0;
}
.note-header-author-name {
@include notes-media('max', $screen-xs-max) {
display: none;
}
}
.note-headline-light {
display: inline;
@media (max-width: $screen-xs-min) {
@include notes-media('max', $screen-xs-min) {
display: block;
}
}
......@@ -430,7 +435,7 @@ ul.notes {
margin-left: 10px;
color: $gray-darkest;
@media (max-width: $screen-xs-max) {
@include notes-media('max', $screen-xs-max) {
float: none;
margin-left: 0;
}
......@@ -441,7 +446,7 @@ ul.notes {
}
.discussion-actions {
@media (max-width: $screen-md-max) {
@include notes-media('max', $screen-md-max) {
float: none;
margin-left: 0;
......@@ -455,7 +460,7 @@ ul.notes {
display: inline;
line-height: 20px;
@media (min-width: $screen-sm-min) {
@include notes-media('min', $screen-sm-min) {
margin-left: 10px;
line-height: 24px;
}
......@@ -590,10 +595,15 @@ ul.notes {
.discussion-body,
.diff-file {
.notes .note {
padding: 10px 15px;
padding-left: $gl-padding;
padding-right: $gl-padding;
&.system-note {
padding: 0;
padding-left: 0;
@media (min-width: $screen-sm-min) {
margin-left: 70px;
}
}
}
}
......@@ -607,17 +617,11 @@ ul.notes {
}
.disabled-comment {
margin-left: -$gl-padding-top;
margin-right: -$gl-padding-top;
background-color: $gray-light;
border-radius: $border-radius-base;
border: 1px solid $border-gray-normal;
color: $note-disabled-comment-color;
line-height: 200px;
.disabled-comment-text {
line-height: normal;
}
padding: 90px 0;
a {
color: $gl-link-color;
......@@ -625,7 +629,7 @@ ul.notes {
}
.line-resolve-all-container {
@media (min-width: $screen-sm-min) {
@include notes-media('min', $screen-sm-min) {
margin-right: 0;
padding-left: $gl-padding;
}
......@@ -667,7 +671,7 @@ ul.notes {
.line-resolve-all {
vertical-align: middle;
display: inline-block;
padding: 6px 10px;
padding: 5px 10px 6px;
background-color: $gray-light;
border: 1px solid $border-color;
border-radius: $border-radius-default;
......@@ -680,6 +684,10 @@ ul.notes {
.line-resolve-btn {
margin-right: 5px;
svg {
vertical-align: middle;
}
}
}
......@@ -716,6 +724,10 @@ ul.notes {
}
}
.line-resolve-text {
vertical-align: middle;
}
.discussion-next-btn {
svg {
margin: 0;
......@@ -732,11 +744,6 @@ ul.notes {
// Merge request notes in diffs
.diff-file {
// Diff is side by side
.notes_content.parallel .note-header .note-headline-light {
display: block;
position: relative;
}
// Diff is inline
.notes_content .note-header .note-headline-light {
display: inline-block;
......
app/assets/stylesheets/pages/projects.scss
View file @ 25b97e94
......@@ -255,7 +255,6 @@
font-size: 13px;
font-weight: 600;
line-height: 13px;
padding: $gl-vert-padding $gl-padding;
letter-spacing: .4px;
padding: 6px 14px;
text-align: center;
......@@ -392,10 +391,6 @@ a.deploy-project-label {
}
}
.last-push-widget {
margin-top: -1px;
}
.fork-namespaces {
.row {
-webkit-flex-wrap: wrap;
......@@ -698,7 +693,6 @@ pre.light-well {
a.allowed-to-merge,
a.allowed-to-push {
cursor: pointer;
cursor: hand;
}
.protected-branch-push-access-list,
......
app/controllers/admin/hook_logs_controller.rb 0 → 100644
View file @ 25b97e94
class Admin::HookLogsController < Admin::ApplicationController
include HooksExecution
before_action :hook, only: [:show, :retry]
before_action :hook_log, only: [:show, :retry]
respond_to :html
def show
end
def retry
status, message = hook.execute(hook_log.request_data, hook_log.trigger)
set_hook_execution_notice(status, message)
redirect_to edit_admin_hook_path(@hook)
end
private
def hook
@hook ||= SystemHook.find(params[:hook_id])
end
def hook_log
@hook_log ||= hook.web_hook_logs.find(params[:id])
end
end
app/controllers/admin/hooks_controller.rb
View file @ 25b97e94
class Admin::HooksController < Admin::ApplicationController
before_action :hook, only: :edit
include HooksExecution
before_action :hook_logs, only: :edit
def index
@hooks = SystemHook.all
......@@ -36,15 +38,9 @@ class Admin::HooksController < Admin::ApplicationController
end
def test
data = {
event_name: "project_create",
name: "Ruby",
path: "ruby",
project_id: 1,
owner_name: "Someone",
owner_email: "example@gitlabhq.com"
}
hook.execute(data, 'system_hooks')
status, message = hook.execute(sample_hook_data, 'system_hooks')
set_hook_execution_notice(status, message)
redirect_back_or_default
end
......@@ -55,6 +51,11 @@ class Admin::HooksController < Admin::ApplicationController
@hook ||= SystemHook.find(params[:id])
end
def hook_logs
@hook_logs ||=
Kaminari.paginate_array(hook.web_hook_logs.order(created_at: :desc)).page(params[:page])
end
def hook_params
params.require(:hook).permit(
:enable_ssl_verification,
......@@ -65,4 +66,15 @@ class Admin::HooksController < Admin::ApplicationController
:url
)
end
def sample_hook_data
{
event_name: "project_create",
name: "Ruby",
path: "ruby",
project_id: 1,
owner_name: "Someone",
owner_email: "example@gitlabhq.com"
}
end
end
app/controllers/admin/builds_controller.rb → app/controllers/admin/jobs_controller.rb
View file @ 25b97e94
class Admin::BuildsController < Admin::ApplicationController
class Admin::JobsController < Admin::ApplicationController
def index
@scope = params[:scope]
@all_builds = Ci::Build
......@@ -20,6 +20,6 @@ class Admin::BuildsController < Admin::ApplicationController
def cancel_all
Ci::Build.running_or_pending.each(&:cancel)
redirect_to admin_builds_path
redirect_to admin_jobs_path
end
end
app/controllers/application_controller.rb
View file @ 25b97e94
......@@ -287,12 +287,8 @@ class ApplicationController < ActionController::Base
request.base_url
end
def set_locale
Gitlab::I18n.set_locale(current_user)
yield
ensure
Gitlab::I18n.reset_locale
def set_locale(&block)
Gitlab::I18n.with_user_locale(current_user, &block)
end
def sessionless_sign_in(user)
......
app/controllers/concerns/diff_for_path.rb
View file @ 25b97e94
......@@ -8,17 +8,6 @@ module DiffForPath
return render_404 unless diff_file
diff_commit = commit_for_diff(diff_file)
blob = diff_file.blob(diff_commit)
locals = {
diff_file: diff_file,
diff_commit: diff_commit,
diff_refs: diffs.diff_refs,
blob: blob,
project: project
}
render json: { html: view_to_html_string('projects/diffs/_content', locals) }
render json: { html: view_to_html_string('projects/diffs/_content', diff_file: diff_file) }
end
end
app/controllers/concerns/hooks_execution.rb 0 → 100644
View file @ 25b97e94
module HooksExecution
extend ActiveSupport::Concern
private
def set_hook_execution_notice(status, message)
if status && status >= 200 && status < 400
flash[:notice] = "Hook executed successfully: HTTP #{status}"
elsif status
flash[:alert] = "Hook executed successfully but returned HTTP #{status} #{message}"
else
flash[:alert] = "Hook execution failed: #{message}"
end
end
end
app/controllers/concerns/issuable_actions.rb
View file @ 25b97e94
......@@ -14,7 +14,16 @@ module IssuableActions
name = issuable.human_class_name
flash[:notice] = "The #{name} was successfully deleted."
redirect_to polymorphic_path([@project.namespace.becomes(Namespace), @project, issuable.class])
index_path = polymorphic_path([@project.namespace.becomes(Namespace), @project, issuable.class])
respond_to do |format|
format.html { redirect_to index_path }
format.json do
render json: {
web_url: index_path
}
end
end
end
def bulk_update
......
app/controllers/dashboard/projects_controller.rb
View file @ 25b97e94
......@@ -8,7 +8,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
@projects = load_projects(params.merge(non_public: true)).page(params[:page])
respond_to do |format|
format.html { @last_push = current_user.recent_push }
format.html
format.atom do
load_events
render layout: false
......@@ -25,7 +25,6 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
@projects = load_projects(params.merge(starred: true)).
includes(:forked_from_project, :tags).page(params[:page])
@last_push = current_user.recent_push
@groups = []
respond_to do |format|
......
app/controllers/dashboard_controller.rb
View file @ 25b97e94
......@@ -9,8 +9,6 @@ class DashboardController < Dashboard::ApplicationController
respond_to :html
def activity
@last_push = current_user.recent_push
respond_to do |format|
format.html
......
app/controllers/groups_controller.rb
View file @ 25b97e94
......@@ -172,7 +172,6 @@ class GroupsController < Groups::ApplicationController
def user_actions
if current_user
@last_push = current_user.recent_push
@notification_setting = current_user.notification_settings_for(group)
end
end
......
app/controllers/projects/artifacts_controller.rb
View file @ 25b97e94
......@@ -46,7 +46,7 @@ class Projects::ArtifactsController < Projects::ApplicationController
def keep
build.keep_artifacts!
redirect_to namespace_project_build_path(project.namespace, project, build)
redirect_to namespace_project_job_path(project.namespace, project, build)
end
def latest_succeeded
......@@ -79,7 +79,7 @@ class Projects::ArtifactsController < Projects::ApplicationController
end
def build_from_id
project.builds.find_by(id: params[:build_id]) if params[:build_id]
project.builds.find_by(id: params[:job_id]) if params[:job_id]
end
def build_from_ref
......
app/controllers/projects/build_artifacts_controller.rb 0 → 100644
View file @ 25b97e94
class Projects::BuildArtifactsController < Projects::ApplicationController
include ExtractsPath
include RendersBlob
before_action :authorize_read_build!
before_action :extract_ref_name_and_path
before_action :validate_artifacts!
def download
redirect_to download_namespace_project_job_artifacts_path(project.namespace, project, job)
end
def browse
redirect_to browse_namespace_project_job_artifacts_path(project.namespace, project, job, path: params[:path])
end
def file
redirect_to file_namespace_project_job_artifacts_path(project.namespace, project, job, path: params[:path])
end
def raw
redirect_to raw_namespace_project_job_artifacts_path(project.namespace, project, job, path: params[:path])
end
def latest_succeeded
redirect_to latest_succeeded_namespace_project_artifacts_path(project.namespace, project, job, ref_name_and_path: params[:ref_name_and_path], job: params[:job])
end
private
def validate_artifacts!
render_404 unless job && job.artifacts?
end
def extract_ref_name_and_path
return unless params[:ref_name_and_path]
@ref_name, @path = extract_ref(params[:ref_name_and_path])
end
def job
@job ||= job_from_id || job_from_ref
end
def job_from_id
project.builds.find_by(id: params[:build_id]) if params[:build_id]
end
def job_from_ref
return unless @ref_name
jobs = project.latest_successful_builds_for(@ref_name)
jobs.find_by(name: params[:job])
end
end
app/controllers/projects/builds_controller.rb
View file @ 25b97e94
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, :cancel_all]
layout 'project'
before_action :authorize_read_build!
def index
@scope = params[:scope]
@all_builds = project.builds.relevant
@builds = @all_builds.order('created_at DESC')
@builds =
case @scope
when 'pending'
@builds.pending.reverse_order
when 'running'
@builds.running.reverse_order
when 'finished'
@builds.finished
else
@builds
end
@builds = @builds.includes([
{ pipeline: :project },
:project,
:tags
])
@builds = @builds.page(params[:page]).per(30)
end
def cancel_all
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)
redirect_to namespace_project_jobs_path(project.namespace, project)
end
def show
@builds = @project.pipelines.find_by_sha(@build.sha).builds.order('id DESC')
@builds = @builds.where("id not in (?)", @build.id)
@pipeline = @build.pipeline
end
def trace
build.trace.read do |stream|
respond_to do |format|
format.json do
result = {
id: @build.id, status: @build.status, complete: @build.complete?
}
if stream.valid?
stream.limit
state = params[:state].presence
trace = stream.html_with_state(state)
result.merge!(trace.to_h)
end
render json: result
end
end
end
end
def retry
return respond_422 unless @build.retryable?
build = Ci::Build.retry(@build, current_user)
redirect_to build_path(build)
end
def play
return respond_422 unless @build.playable?
build = @build.play(current_user)
redirect_to build_path(build)
end
def cancel
return respond_422 unless @build.cancelable?
@build.cancel
redirect_to build_path(@build)
end
def status
render json: BuildSerializer
.new(project: @project, current_user: @current_user)
.represent_status(@build)
end
def erase
if @build.erase(erased_by: current_user)
redirect_to namespace_project_build_path(project.namespace, project, @build),
notice: "Build has been successfully erased!"
else
respond_422
end
redirect_to namespace_project_job_path(project.namespace, project, job)
end
def raw
build.trace.read do |stream|
if stream.file?
send_file stream.path, type: 'text/plain; charset=utf-8', disposition: 'inline'
else
render_404
end
end
redirect_to raw_namespace_project_job_path(project.namespace, project, job)
end
private
def authorize_update_build!
return access_denied! unless can?(current_user, :update_build, build)
end
def build
@build ||= project.builds.find(params[:id])
.present(current_user: current_user)
end
def build_path(build)
namespace_project_build_path(build.project.namespace, build.project, build)
def job
@job ||= project.builds.find(params[:id])
end
end
app/controllers/projects/compare_controller.rb
View file @ 25b97e94
......@@ -51,13 +51,9 @@ class Projects::CompareController < Projects::ApplicationController
if @compare
@commits = @compare.commits
@start_commit = @compare.start_commit
@commit = @compare.commit
@base_commit = @compare.base_commit
@diffs = @compare.diffs(diff_options)
environment_params = @repository.branch_exists?(@head_ref) ? { ref: @head_ref } : { commit: @commit }
environment_params = @repository.branch_exists?(@head_ref) ? { ref: @head_ref } : { commit: @compare.commit }
@environment = EnvironmentsFinder.new(@project, current_user, environment_params).execute.last
@diff_notes_disabled = true
......
app/controllers/projects/hook_logs_controller.rb 0 → 100644
View file @ 25b97e94
class Projects::HookLogsController < Projects::ApplicationController
include HooksExecution
before_action :authorize_admin_project!
before_action :hook, only: [:show, :retry]
before_action :hook_log, only: [:show, :retry]
respond_to :html
layout 'project_settings'
def show
end
def retry
status, message = hook.execute(hook_log.request_data, hook_log.trigger)
set_hook_execution_notice(status, message)
redirect_to edit_namespace_project_hook_path(@project.namespace, @project, @hook)
end
private
def hook
@hook ||= @project.hooks.find(params[:hook_id])
end
def hook_log
@hook_log ||= hook.web_hook_logs.find(params[:id])
end
end
app/controllers/projects/hooks_controller.rb
View file @ 25b97e94
class Projects::HooksController < Projects::ApplicationController
include HooksExecution
# Authorize
before_action :authorize_admin_project!
before_action :hook, only: :edit
before_action :hook_logs, only: :edit
respond_to :html
......@@ -34,13 +36,7 @@ class Projects::HooksController < Projects::ApplicationController
if !@project.empty_repo?
status, message = TestHookService.new.execute(hook, current_user)
if status && status >= 200 && status < 400
flash[:notice] = "Hook executed successfully: HTTP #{status}"
elsif status
flash[:alert] = "Hook executed successfully but returned HTTP #{status} #{message}"
else
flash[:alert] = "Hook execution failed: #{message}"
end
set_hook_execution_notice(status, message)
else
flash[:alert] = 'Hook execution failed. Ensure the project has commits.'
end
......@@ -60,6 +56,11 @@ class Projects::HooksController < Projects::ApplicationController
@hook ||= @project.hooks.find(params[:id])
end
def hook_logs
@hook_logs ||=
Kaminari.paginate_array(hook.web_hook_logs.order(created_at: :desc)).page(params[:page])
end
def hook_params
params.require(:hook).permit(
:job_events,
......
app/controllers/projects/issues_controller.rb
View file @ 25b97e94
......@@ -149,10 +149,7 @@ class Projects::IssuesController < Projects::ApplicationController
format.json do
if @issue.valid?
render json: @issue.to_json(methods: [:task_status, :task_status_short],
include: { milestone: {},
assignees: { only: [:id, :name, :username], methods: [:avatar_url] },
labels: { methods: :text_color } })
render json: IssueSerializer.new.represent(@issue)
else
render json: { errors: @issue.errors.full_messages }, status: :unprocessable_entity
end
......
app/controllers/projects/jobs_controller.rb 0 → 100644
View file @ 25b97e94
class Projects::JobsController < 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, :cancel_all]
layout 'project'
def index
@scope = params[:scope]
@all_builds = project.builds.relevant
@builds = @all_builds.order('created_at DESC')
@builds =
case @scope
when 'pending'
@builds.pending.reverse_order
when 'running'
@builds.running.reverse_order
when 'finished'
@builds.finished
else
@builds
end
@builds = @builds.includes([
{ pipeline: :project },
:project,
:tags
])
@builds = @builds.page(params[:page]).per(30)
end
def cancel_all
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_jobs_path(project.namespace, project)
end
def show
@builds = @project.pipelines.find_by_sha(@build.sha).builds.order('id DESC')
@builds = @builds.where("id not in (?)", @build.id)
@pipeline = @build.pipeline
end
def trace
build.trace.read do |stream|
respond_to do |format|
format.json do
result = {
id: @build.id, status: @build.status, complete: @build.complete?
}
if stream.valid?
stream.limit
state = params[:state].presence
trace = stream.html_with_state(state)
result.merge!(trace.to_h)
end
render json: result
end
end
end
end
def retry
return respond_422 unless @build.retryable?
build = Ci::Build.retry(@build, current_user)
redirect_to build_path(build)
end
def play
return respond_422 unless @build.playable?
build = @build.play(current_user)
redirect_to build_path(build)
end
def cancel
return respond_422 unless @build.cancelable?
@build.cancel
redirect_to build_path(@build)
end
def status
render json: BuildSerializer
.new(project: @project, current_user: @current_user)
.represent_status(@build)
end
def erase
if @build.erase(erased_by: current_user)
redirect_to namespace_project_job_path(project.namespace, project, @build),
notice: "Build has been successfully erased!"
else
respond_422
end
end
def raw
build.trace.read do |stream|
if stream.file?
send_file stream.path, type: 'text/plain; charset=utf-8', disposition: 'inline'
else
render_404
end
end
end
private
def authorize_update_build!
return access_denied! unless can?(current_user, :update_build, build)
end
def build
@build ||= project.builds.find(params[:id])
.present(current_user: current_user)
end
def build_path(build)
namespace_project_job_path(build.project.namespace, build.project, build)
end
end
app/controllers/projects/merge_requests_controller.rb
View file @ 25b97e94
......@@ -17,7 +17,6 @@ class Projects::MergeRequestsController < Projects::ApplicationController
]
before_action :validates_merge_request, only: [:show, :diffs, :commits, :pipelines]
before_action :define_show_vars, only: [:diffs, :commits, :conflicts, :conflict_for_path, :builds, :pipelines]
before_action :define_commit_vars, only: [:diffs]
before_action :ensure_ref_fetched, only: [:show, :diffs, :commits, :builds, :conflicts, :conflict_for_path, :pipelines]
before_action :close_merge_request_without_source_project, only: [:show, :diffs, :commits, :builds, :pipelines]
before_action :check_if_can_be_merged, only: :show
......@@ -134,8 +133,6 @@ class Projects::MergeRequestsController < Projects::ApplicationController
@diff_notes_disabled = true
end
define_commit_vars
render_diff_for_path(@diffs)
end
......@@ -557,11 +554,6 @@ class Projects::MergeRequestsController < Projects::ApplicationController
@notes = prepare_notes_for_rendering(@discussions.flat_map(&:notes))
end
def define_commit_vars
@commit = @merge_request.diff_head_commit
@base_commit = @merge_request.diff_base_commit || @merge_request.likely_diff_base_commit
end
def define_diff_vars
@merge_request_diff =
if params[:diff_id]
......@@ -626,7 +618,6 @@ class Projects::MergeRequestsController < Projects::ApplicationController
@source_project = merge_request.source_project
@commits = @merge_request.compare_commits.reverse
@commit = @merge_request.diff_head_commit
@base_commit = @merge_request.diff_base_commit
@note_counts = Note.where(commit_id: @commits.map(&:id)).
group(:commit_id).count
......
app/controllers/projects/push_rules_controller.rb
View file @ 25b97e94
......@@ -25,6 +25,6 @@ class Projects::PushRulesController < Projects::ApplicationController
# Only allow a trusted parameter "white list" through.
def push_rule_params
params.require(:push_rule).permit(:deny_delete_tag, :delete_branch_regex,
:commit_message_regex, :force_push_regex, :author_email_regex, :member_check, :file_name_regex, :max_file_size, :prevent_secrets)
:commit_message_regex, :branch_name_regex, :force_push_regex, :author_email_regex, :member_check, :file_name_regex, :max_file_size, :prevent_secrets)
end
end
app/controllers/projects/refs_controller.rb
View file @ 25b97e94
......@@ -81,6 +81,6 @@ class Projects::RefsController < Projects::ApplicationController
private
def validate_ref_id
return not_found! if params[:id].present? && params[:id] !~ Gitlab::Regex.git_reference_regex
return not_found! if params[:id].present? && params[:id] !~ Gitlab::PathRegex.git_reference_regex
end
end
app/helpers/blob_helper.rb
View file @ 25b97e94
......@@ -120,7 +120,7 @@ module BlobHelper
def blob_raw_url
if @build && @entry
raw_namespace_project_build_artifacts_path(@project.namespace, @project, @build, path: @entry.path)
raw_namespace_project_job_artifacts_path(@project.namespace, @project, @build, path: @entry.path)
elsif @snippet
if @snippet.project_id
raw_namespace_project_snippet_path(@project.namespace, @project, @snippet)
......
app/helpers/builds_helper.rb
View file @ 25b97e94
......@@ -2,7 +2,7 @@ module BuildsHelper
def build_summary(build, skip: false)
if build.has_trace?
if skip
link_to "View job trace", pipeline_build_url(build.pipeline, build)
link_to "View job trace", pipeline_job_url(build.pipeline, build)
else
build.trace.html(last_lines: 10).html_safe
end
......@@ -20,8 +20,8 @@ module BuildsHelper
def javascript_build_options
{
page_url: namespace_project_build_url(@project.namespace, @project, @build),
build_url: namespace_project_build_url(@project.namespace, @project, @build, :json),
page_url: namespace_project_job_url(@project.namespace, @project, @build),
build_url: namespace_project_job_url(@project.namespace, @project, @build, :json),
build_status: @build.status,
build_stage: @build.stage,
log_state: ''
......@@ -31,7 +31,7 @@ module BuildsHelper
def build_failed_issue_options
{
title: "Build Failed ##{@build.id}",
description: namespace_project_build_url(@project.namespace, @project, @build)
description: namespace_project_job_url(@project.namespace, @project, @build)
}
end
end
app/helpers/commits_helper.rb
View file @ 25b97e94
......@@ -15,16 +15,6 @@ module CommitsHelper
commit_person_link(commit, options.merge(source: :committer))
end
def image_diff_class(diff)
if diff.deleted_file
"deleted"
elsif diff.new_file
"added"
else
nil
end
end
def commit_to_html(commit, ref, project)
render 'projects/commits/commit',
commit: commit,
......
app/helpers/diff_helper.rb
View file @ 25b97e94
......@@ -102,14 +102,14 @@ module DiffHelper
].join(' ').html_safe
end
def commit_for_diff(diff_file)
return diff_file.content_commit if diff_file.content_commit
def diff_file_blob_raw_path(diff_file)
namespace_project_raw_path(@project.namespace, @project, tree_join(diff_file.content_sha, diff_file.file_path))
end
if diff_file.deleted_file
@base_commit || @commit.parent || @commit
else
@commit
end
def diff_file_old_blob_raw_path(diff_file)
sha = diff_file.old_content_sha
return unless sha
namespace_project_raw_path(@project.namespace, @project, tree_join(diff_file.old_content_sha, diff_file.old_path))
end
def diff_file_html_data(project, diff_file_path, diff_commit_id)
......@@ -120,8 +120,8 @@ module DiffHelper
}
end
def editable_diff?(diff)
!diff.deleted_file && @merge_request && @merge_request.source_project
def editable_diff?(diff_file)
!diff_file.deleted_file? && @merge_request && @merge_request.source_project
end
private
......
app/helpers/gitlab_routing_helper.rb
View file @ 25b97e94
......@@ -50,8 +50,8 @@ module GitlabRoutingHelper
namespace_project_cycle_analytics_path(project.namespace, project, *args)
end
def project_builds_path(project, *args)
namespace_project_builds_path(project.namespace, project, *args)
def project_jobs_path(project, *args)
namespace_project_jobs_path(project.namespace, project, *args)
end
def project_ref_path(project, ref_name, *args)
......@@ -110,8 +110,8 @@ module GitlabRoutingHelper
namespace_project_pipeline_url(pipeline.project.namespace, pipeline.project, pipeline.id, *args)
end
def pipeline_build_url(pipeline, build, *args)
namespace_project_build_url(pipeline.project.namespace, pipeline.project, build.id, *args)
def pipeline_job_url(pipeline, build, *args)
namespace_project_job_url(pipeline.project.namespace, pipeline.project, build.id, *args)
end
def commits_url(entity, *args)
......@@ -215,13 +215,13 @@ module GitlabRoutingHelper
case action
when 'download'
download_namespace_project_build_artifacts_path(*args)
download_namespace_project_job_artifacts_path(*args)
when 'browse'
browse_namespace_project_build_artifacts_path(*args)
browse_namespace_project_job_artifacts_path(*args)
when 'file'
file_namespace_project_build_artifacts_path(*args)
file_namespace_project_job_artifacts_path(*args)
when 'raw'
raw_namespace_project_build_artifacts_path(*args)
raw_namespace_project_job_artifacts_path(*args)
end
end
......
app/helpers/issuables_helper.rb
View file @ 25b97e94
......@@ -210,6 +210,27 @@ module IssuablesHelper
issuable_filter_params.any? { |k| params.key?(k) }
end
def issuable_initial_data(issuable)
{
endpoint: namespace_project_issue_path(@project.namespace, @project, issuable),
canUpdate: can?(current_user, :update_issue, issuable),
canDestroy: can?(current_user, :destroy_issue, issuable),
canMove: current_user ? issuable.can_move?(current_user) : false,
issuableRef: issuable.to_reference,
isConfidential: issuable.confidential,
markdownPreviewUrl: preview_markdown_path(@project),
markdownDocs: help_page_path('user/markdown'),
projectsAutocompleteUrl: autocomplete_projects_path(project_id: @project.id),
issuableTemplates: issuable_templates(issuable),
projectPath: ref_project.path,
projectNamespace: ref_project.namespace.full_path,
initialTitleHtml: markdown_field(issuable, :title),
initialTitleText: issuable.title,
initialDescriptionHtml: markdown_field(issuable, :description),
initialDescriptionText: issuable.description
}.to_json
end
private
def sidebar_gutter_collapsed?
......
app/helpers/labels_helper.rb
View file @ 25b97e94
......@@ -69,13 +69,12 @@ module LabelsHelper
end
def render_colored_label(label, label_suffix = '', tooltip: true)
label_color = label.color || Label::DEFAULT_COLOR
text_color = text_color_for_bg(label_color)
text_color = text_color_for_bg(label.color)
# Intentionally not using content_tag here so that this method can be called
# by LabelReferenceFilter
span = %(<span class="label color-label #{"has-tooltip" if tooltip}" ) +
%(style="background-color: #{label_color}; color: #{text_color}" ) +
%(style="background-color: #{label.color}; color: #{text_color}" ) +
%(title="#{escape_once(label.description)}" data-container="body">) +
%(#{escape_once(label.name)}#{label_suffix}</span>)
......
app/helpers/projects_helper.rb
View file @ 25b97e94
......@@ -122,6 +122,7 @@ module ProjectsHelper
def last_push_event
return unless current_user
return current_user.recent_push unless @project
project_ids = [@project.id]
if fork = current_user.fork_of(@project)
......
app/mailers/base_mailer.rb
View file @ 25b97e94
class BaseMailer < ActionMailer::Base
around_action :render_with_default_locale
helper ApplicationHelper
helper MarkupHelper
......@@ -14,6 +16,10 @@ class BaseMailer < ActionMailer::Base
private
def render_with_default_locale(&block)
Gitlab::I18n.with_default_locale(&block)
end
def default_sender_address
address = Mail::Address.new(Gitlab.config.gitlab.email_from)
address.display_name = Gitlab.config.gitlab.email_display_name
......
app/models/ci/build.rb
View file @ 25b97e94
......@@ -35,6 +35,7 @@ module Ci
scope :with_expired_artifacts, ->() { with_artifacts.where('artifacts_expire_at < ?', Time.now) }
scope :last_month, ->() { where('created_at > ?', Date.today - 1.month) }
scope :manual_actions, ->() { where(when: :manual).relevant }
scope :codeclimate, ->() { where(name: 'codeclimate') }
mount_uploader :artifacts_file, ArtifactUploader
mount_uploader :artifacts_metadata, ArtifactUploader
......@@ -52,6 +53,12 @@ module Ci
after_destroy :update_project_statistics
class << self
# This is needed for url_for to work,
# as the controller is JobsController
def model_name
ActiveModel::Name.new(self, nil, 'job')
end
def first_pending
pending.unstarted.order('created_at ASC').first
end
......@@ -440,6 +447,11 @@ module Ci
trace
end
def has_codeclimate_json?
options.dig(:artifacts, :paths) == ['codeclimate.json'] &&
artifacts_metadata?
end
private
def update_artifacts_size
......
app/models/ci/pipeline.rb
View file @ 25b97e94
......@@ -396,6 +396,10 @@ module Ci
.fabricate!
end
def codeclimate_artifact
artifacts.codeclimate.find(&:has_codeclimate_json?)
end
private
def pipeline_data
......
app/models/concerns/note_on_diff.rb
View file @ 25b97e94
......@@ -33,14 +33,4 @@ module NoteOnDiff
def created_at_diff?(diff_refs)
false
end
private
def noteable_diff_refs
if noteable.respond_to?(:diff_sha_refs)
noteable.diff_sha_refs
else
noteable.diff_refs
end
end
end
app/models/diff_note.rb
View file @ 25b97e94
......@@ -68,7 +68,7 @@ class DiffNote < Note
return false unless supported?
return true if for_commit?
diff_refs ||= noteable_diff_refs
diff_refs ||= noteable.diff_refs
self.position.diff_refs == diff_refs
end
......@@ -104,7 +104,7 @@ class DiffNote < Note
self.project,
nil,
old_diff_refs: self.position.diff_refs,
new_diff_refs: noteable_diff_refs,
new_diff_refs: noteable.diff_refs,
paths: self.position.paths
).execute(self)
end
......
app/models/geo_node.rb
View file @ 25b97e94
This diff is collapsed.
app/models/hooks/service_hook.rb
View file @ 25b97e94
This diff is collapsed.
app/models/hooks/system_hook.rb
View file @ 25b97e94
This diff is collapsed.
app/models/hooks/web_hook.rb
View file @ 25b97e94
This diff is collapsed.
app/models/hooks/web_hook_log.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
app/models/label.rb
View file @ 25b97e94
This diff is collapsed.
app/models/legacy_diff_note.rb
View file @ 25b97e94
This diff is collapsed.
app/models/merge_request.rb
View file @ 25b97e94
This diff is collapsed.
app/models/merge_request_diff.rb
View file @ 25b97e94
This diff is collapsed.
app/models/project.rb
View file @ 25b97e94
This diff is collapsed.
app/models/project_services/jira_service.rb
View file @ 25b97e94
This diff is collapsed.
app/models/push_rule.rb
View file @ 25b97e94
This diff is collapsed.
app/models/user.rb
View file @ 25b97e94
This diff is collapsed.
app/serializers/analytics_build_entity.rb
View file @ 25b97e94
This diff is collapsed.
app/serializers/build_action_entity.rb
View file @ 25b97e94
This diff is collapsed.
app/serializers/build_artifact_entity.rb
View file @ 25b97e94
This diff is collapsed.
app/serializers/build_entity.rb
View file @ 25b97e94
This diff is collapsed.
app/serializers/issue_entity.rb
View file @ 25b97e94
This diff is collapsed.
app/serializers/merge_request_entity.rb
View file @ 25b97e94
This diff is collapsed.
app/services/issues/close_service.rb
View file @ 25b97e94
This diff is collapsed.
app/services/issues/reopen_service.rb
View file @ 25b97e94
This diff is collapsed.
app/services/web_hook_service.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
app/validators/dynamic_path_validator.rb
View file @ 25b97e94
This diff is collapsed.
app/views/admin/dashboard/_head.html.haml
View file @ 25b97e94
This diff is collapsed.
app/views/admin/hook_logs/_index.html.haml 0 → 100644
View file @ 25b97e94
This diff is collapsed.
app/views/admin/hook_logs/show.html.haml 0 → 100644
View file @ 25b97e94
This diff is collapsed.
app/views/admin/hooks/edit.html.haml
View file @ 25b97e94
This diff is collapsed.
app/views/admin/runners/show.html.haml
View file @ 25b97e94
This diff is collapsed.
app/views/dashboard/_activities.html.haml
View file @ 25b97e94
This diff is collapsed.
app/views/dashboard/activity.html.haml
View file @ 25b97e94
This diff is collapsed.
app/views/discussions/_notes.html.haml
View file @ 25b97e94
This diff is collapsed.
app/views/events/_event_last_push.html.haml deleted 100644 → 0
View file @ 0ed08366
This diff is collapsed.
app/views/events/event/_push.html.haml
View file @ 25b97e94
This diff is collapsed.
app/views/groups/_activities.html.haml
View file @ 25b97e94
This diff is collapsed.
app/views/groups/_head.html.haml
View file @ 25b97e94
This diff is collapsed.
app/views/groups/show.html.haml
View file @ 25b97e94
This diff is collapsed.
app/views/layouts/nav/_admin.html.haml
View file @ 25b97e94
This diff is collapsed.
app/views/layouts/nav/_project.html.haml
View file @ 25b97e94
This diff is collapsed.
app/views/projects/_activity.html.haml
View file @ 25b97e94
This diff is collapsed.
app/views/projects/_last_push.html.haml
View file @ 25b97e94
This diff is collapsed.
app/views/projects/activity.html.haml
View file @ 25b97e94
This diff is collapsed.
app/views/projects/artifacts/file.html.haml
View file @ 25b97e94
This diff is collapsed.
app/views/projects/blob/show.html.haml
View file @ 25b97e94
This diff is collapsed.
app/views/projects/diffs/_content.html.haml
View file @ 25b97e94
This diff is collapsed.
app/views/projects/diffs/_diffs.html.haml
View file @ 25b97e94
This diff is collapsed.
app/views/projects/diffs/_file.html.haml
View file @ 25b97e94
This diff is collapsed.
app/views/projects/diffs/_stats.html.haml
View file @ 25b97e94
This diff is collapsed.
app/views/projects/diffs/viewers/_text.html.haml 0 → 100644
View file @ 25b97e94
This diff is collapsed.
app/views/projects/hook_logs/_index.html.haml 0 → 100644
View file @ 25b97e94
This diff is collapsed.
app/views/projects/hook_logs/show.html.haml 0 → 100644
View file @ 25b97e94
This diff is collapsed.
app/views/projects/hooks/edit.html.haml
View file @ 25b97e94
This diff is collapsed.
app/views/projects/issues/show.html.haml
View file @ 25b97e94
This diff is collapsed.
app/views/projects/settings/_head.html.haml
View file @ 25b97e94
This diff is collapsed.
app/views/projects/tree/show.html.haml
View file @ 25b97e94
This diff is collapsed.
app/views/shared/_group_form.html.haml
View file @ 25b97e94
This diff is collapsed.
app/views/shared/_push_rules_form.html.haml
View file @ 25b97e94
This diff is collapsed.
app/views/shared/hook_logs/_content.html.haml 0 → 100644
View file @ 25b97e94
This diff is collapsed.
app/views/shared/hook_logs/_status_label.html.haml 0 → 100644
View file @ 25b97e94
This diff is collapsed.
app/views/shared/notes/_note.html.haml
View file @ 25b97e94
This diff is collapsed.
app/workers/process_commit_worker.rb
View file @ 25b97e94
This diff is collapsed.
app/workers/remove_old_web_hook_logs_worker.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
app/workers/system_hook_worker.rb deleted 100644 → 0
View file @ 0ed08366
This diff is collapsed.
changelogs/unreleased-ee/dz-codeclimate-compare-ee.yml 0 → 100644
View file @ 25b97e94
This diff is collapsed.
changelogs/unreleased/12614-fix-long-message-from-mr.yml 0 → 100644
View file @ 25b97e94
This diff is collapsed.
changelogs/unreleased/28080-system-checks.yml 0 → 100644
View file @ 25b97e94
This diff is collapsed.
changelogs/unreleased/31448-jira-urls.yml 0 → 100644
View file @ 25b97e94
This diff is collapsed.
changelogs/unreleased/31556-ci-coverage-paralel-rspec.yml 0 → 100644
View file @ 25b97e94
This diff is collapsed.
changelogs/unreleased/32851-postgres-min-version.yml 0 → 100644
View file @ 25b97e94
This diff is collapsed.
changelogs/unreleased/ci-build-pipeline-header-vue.yml 0 → 100644
View file @ 25b97e94
This diff is collapsed.
changelogs/unreleased/dm-consistent-last-push-event.yml 0 → 100644
View file @ 25b97e94
This diff is collapsed.
changelogs/unreleased/dm-more-dependency-linkers.yml 0 → 100644
View file @ 25b97e94
This diff is collapsed.
changelogs/unreleased/issue-edit-inline.yml 0 → 100644
View file @ 25b97e94
This diff is collapsed.
changelogs/unreleased/issue_19262.yml 0 → 100644
View file @ 25b97e94
This diff is collapsed.
changelogs/unreleased/rename-builds-controller.yml 0 → 100644
View file @ 25b97e94
This diff is collapsed.
config/initializers/1_settings.rb
View file @ 25b97e94
This diff is collapsed.
config/initializers/fast_gettext.rb
View file @ 25b97e94
This diff is collapsed.
config/initializers/geo.rb
View file @ 25b97e94
This diff is collapsed.
config/routes.rb
View file @ 25b97e94
This diff is collapsed.
config/routes/admin.rb
View file @ 25b97e94
This diff is collapsed.
config/routes/git_http.rb
View file @ 25b97e94
This diff is collapsed.
config/routes/group.rb
View file @ 25b97e94
This diff is collapsed.
config/routes/project.rb
View file @ 25b97e94
This diff is collapsed.
config/routes/repository.rb
View file @ 25b97e94
This diff is collapsed.
config/routes/user.rb
View file @ 25b97e94
This diff is collapsed.
config/sidekiq_queues.yml
View file @ 25b97e94
This diff is collapsed.
config/webpack.config.js
View file @ 25b97e94
This diff is collapsed.
db/migrate/20170427103502_create_web_hook_logs.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
db/migrate/20170513005817_add_push_rule_branch_name.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
db/migrate/20170602003304_add_clone_url_prefix_to_geo_node.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
db/schema.rb
View file @ 25b97e94
This diff is collapsed.
doc/api/projects.md
View file @ 25b97e94
This diff is collapsed.
doc/ci/examples/code_climate.md
View file @ 25b97e94
This diff is collapsed.
doc/development/geo.md
View file @ 25b97e94
This diff is collapsed.
doc/development/i18n_guide.md
View file @ 25b97e94
This diff is collapsed.
doc/gitlab-geo/configuration_source.md
View file @ 25b97e94
This diff is collapsed.
doc/install/database_mysql.md
View file @ 25b97e94
This diff is collapsed.
doc/install/installation.md
View file @ 25b97e94
This diff is collapsed.
doc/install/requirements.md
View file @ 25b97e94
This diff is collapsed.
doc/push_rules/push_rules.png
View file @ 25b97e94
This diff is collapsed.
doc/user/group/subgroups/index.md
View file @ 25b97e94
This diff is collapsed.
doc/user/project/integrations/img/webhook_logs.png 0 → 100755
View file @ 25b97e94
This diff is collapsed.
doc/user/project/integrations/jira.md
View file @ 25b97e94
This diff is collapsed.
doc/user/project/integrations/webhooks.md
View file @ 25b97e94
This diff is collapsed.
doc/user/project/merge_requests/code_quality_diff.md 0 → 100644
View file @ 25b97e94
This diff is collapsed.
doc/user/project/merge_requests/img/code_quality.gif 0 → 100644
View file @ 25b97e94
This diff is collapsed.
doc/user/project/merge_requests/index.md
View file @ 25b97e94
This diff is collapsed.
features/project/hooks.feature deleted 100644 → 0
View file @ 0ed08366
This diff is collapsed.
features/steps/dashboard/dashboard.rb
View file @ 25b97e94
This diff is collapsed.
features/steps/project/hooks.rb deleted 100644 → 0
View file @ 0ed08366
This diff is collapsed.
features/steps/project/services.rb
View file @ 25b97e94
This diff is collapsed.
features/steps/shared/builds.rb
View file @ 25b97e94
This diff is collapsed.
features/steps/shared/markdown.rb
View file @ 25b97e94
This diff is collapsed.
lib/api/api.rb
View file @ 25b97e94
This diff is collapsed.
lib/api/entities.rb
View file @ 25b97e94
This diff is collapsed.
lib/api/project_push_rule.rb
View file @ 25b97e94
This diff is collapsed.
lib/api/repositories.rb
View file @ 25b97e94
This diff is collapsed.
lib/api/services.rb
View file @ 25b97e94
This diff is collapsed.
lib/api/v3/repositories.rb
View file @ 25b97e94
This diff is collapsed.
lib/constraints/group_url_constrainer.rb
View file @ 25b97e94
This diff is collapsed.
lib/constraints/project_url_constrainer.rb
View file @ 25b97e94
This diff is collapsed.
lib/constraints/user_url_constrainer.rb
View file @ 25b97e94
This diff is collapsed.
lib/gitlab/checks/change_access.rb
View file @ 25b97e94
This diff is collapsed.
lib/gitlab/ci/status/build/cancelable.rb
View file @ 25b97e94
This diff is collapsed.
lib/gitlab/ci/status/build/common.rb
View file @ 25b97e94
This diff is collapsed.
lib/gitlab/ci/status/build/play.rb
View file @ 25b97e94
This diff is collapsed.
lib/gitlab/ci/status/build/retryable.rb
View file @ 25b97e94
This diff is collapsed.
lib/gitlab/ci/status/build/stop.rb
View file @ 25b97e94
This diff is collapsed.
lib/gitlab/ci/trace/stream.rb
View file @ 25b97e94
This diff is collapsed.
lib/gitlab/database/migration_helpers.rb
View file @ 25b97e94
This diff is collapsed.
lib/gitlab/dependency_linker.rb
View file @ 25b97e94
This diff is collapsed.
lib/gitlab/dependency_linker/base_linker.rb
View file @ 25b97e94
This diff is collapsed.
lib/gitlab/dependency_linker/cartfile_linker.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
lib/gitlab/dependency_linker/cocoapods.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
lib/gitlab/dependency_linker/composer_json_linker.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
lib/gitlab/dependency_linker/gemspec_linker.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
lib/gitlab/dependency_linker/godeps_json_linker.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
lib/gitlab/dependency_linker/json_linker.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
lib/gitlab/dependency_linker/method_linker.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
lib/gitlab/dependency_linker/package_json_linker.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
lib/gitlab/dependency_linker/podfile_linker.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
lib/gitlab/dependency_linker/podspec_json_linker.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
lib/gitlab/dependency_linker/podspec_linker.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
lib/gitlab/dependency_linker/requirements_txt_linker.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
lib/gitlab/diff/file.rb
View file @ 25b97e94
This diff is collapsed.
lib/gitlab/diff/file_collection/base.rb
View file @ 25b97e94
This diff is collapsed.
lib/gitlab/diff/highlight.rb
View file @ 25b97e94
This diff is collapsed.
lib/gitlab/etag_caching/router.rb
View file @ 25b97e94
This diff is collapsed.
lib/gitlab/git/diff.rb
View file @ 25b97e94
This diff is collapsed.
lib/gitlab/git/diff_collection.rb
View file @ 25b97e94
This diff is collapsed.
lib/gitlab/health_checks/fs_shards_check.rb
View file @ 25b97e94
This diff is collapsed.
lib/gitlab/i18n.rb
View file @ 25b97e94
This diff is collapsed.
lib/gitlab/path_regex.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
lib/gitlab/regex.rb
View file @ 25b97e94
This diff is collapsed.
lib/gitlab/routes/legacy_builds.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
lib/system_check.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
lib/system_check/app/active_users_check.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
lib/system_check/app/database_config_exists_check.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
lib/system_check/app/elasticsearch_check.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
lib/system_check/app/git_config_check.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
lib/system_check/app/git_version_check.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
lib/system_check/app/gitlab_config_exists_check.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
lib/system_check/app/gitlab_config_up_to_date_check.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
lib/system_check/app/init_script_exists_check.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
lib/system_check/app/init_script_up_to_date_check.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
lib/system_check/app/log_writable_check.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
lib/system_check/app/migrations_are_up_check.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
lib/system_check/app/orphaned_group_members_check.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
lib/system_check/app/projects_have_namespace_check.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
lib/system_check/app/redis_version_check.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
lib/system_check/app/ruby_version_check.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
lib/system_check/app/tmp_writable_check.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
lib/system_check/app/uploads_directory_exists_check.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
lib/system_check/app/uploads_path_permission_check.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
lib/system_check/app/uploads_path_tmp_permission_check.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
lib/system_check/base_check.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
lib/system_check/helpers.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
lib/system_check/simple_executor.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
lib/tasks/gitlab/check.rake
View file @ 25b97e94
This diff is collapsed.
lib/tasks/gitlab/task_helpers.rb
View file @ 25b97e94
This diff is collapsed.
package.json
View file @ 25b97e94
This diff is collapsed.
spec/db/production/settings.rb
View file @ 25b97e94
This diff is collapsed.
spec/factories/services.rb
View file @ 25b97e94
This diff is collapsed.
spec/factories/web_hook_log.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
spec/features/admin/admin_builds_spec.rb
View file @ 25b97e94
This diff is collapsed.
spec/features/admin/admin_hook_logs_spec.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
spec/features/admin/admin_hooks_spec.rb
View file @ 25b97e94
This diff is collapsed.
spec/features/issues/form_spec.rb
View file @ 25b97e94
This diff is collapsed.
spec/features/issues/move_spec.rb
View file @ 25b97e94
This diff is collapsed.
spec/features/merge_requests/squash_spec.rb
View file @ 25b97e94
This diff is collapsed.
spec/features/merge_requests/widget_spec.rb
View file @ 25b97e94
This diff is collapsed.
spec/features/projects/artifacts/browse_spec.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
spec/features/projects/artifacts/download_spec.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
spec/features/projects/artifacts/raw_spec.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
spec/features/projects/sub_group_issuables_spec.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
spec/javascripts/build_spec.js
View file @ 25b97e94
This diff is collapsed.
spec/javascripts/issue_show/components/edit_actions_spec.js 0 → 100644
View file @ 25b97e94
This diff is collapsed.
spec/javascripts/issue_show/components/fields/title_spec.js 0 → 100644
View file @ 25b97e94
This diff is collapsed.
spec/javascripts/issue_show/components/form_spec.js 0 → 100644
View file @ 25b97e94
This diff is collapsed.
spec/javascripts/merge_request_tabs_spec.js
View file @ 25b97e94
This diff is collapsed.
spec/javascripts/vue_mr_widget/mock_data.js
View file @ 25b97e94
This diff is collapsed.
spec/javascripts/vue_shared/components/markdown/field_spec.js 0 → 100644
View file @ 25b97e94
This diff is collapsed.
spec/javascripts/vue_shared/components/markdown/header_spec.js 0 → 100644
View file @ 25b97e94
This diff is collapsed.
spec/lib/gitlab/ci/trace/stream_spec.rb
View file @ 25b97e94
This diff is collapsed.
spec/lib/gitlab/dependency_linker/cartfile_linker_spec.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
spec/lib/gitlab/dependency_linker/composer_json_linker_spec.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
spec/lib/gitlab/dependency_linker/gemspec_linker_spec.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
spec/lib/gitlab/dependency_linker/godeps_json_linker_spec.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
spec/lib/gitlab/dependency_linker/package_json_linker_spec.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
spec/lib/gitlab/dependency_linker/podfile_linker_spec.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
spec/lib/gitlab/dependency_linker/podspec_json_linker_spec.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
spec/lib/gitlab/dependency_linker/podspec_linker_spec.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
spec/lib/gitlab/dependency_linker_spec.rb
View file @ 25b97e94
This diff is collapsed.
spec/lib/gitlab/diff/position_spec.rb
View file @ 25b97e94
This diff is collapsed.
spec/lib/gitlab/git/diff_collection_spec.rb
View file @ 25b97e94
This diff is collapsed.
spec/lib/gitlab/highlight_spec.rb
View file @ 25b97e94
This diff is collapsed.
spec/lib/gitlab/i18n_spec.rb
View file @ 25b97e94
This diff is collapsed.
spec/lib/gitlab/path_regex_spec.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
spec/lib/gitlab/regex_spec.rb
View file @ 25b97e94
This diff is collapsed.
spec/lib/system_check/simple_executor_spec.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
spec/lib/system_check_spec.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
spec/mailers/notify_spec.rb
View file @ 25b97e94
This diff is collapsed.
spec/models/ci/build_spec.rb
View file @ 25b97e94
This diff is collapsed.
spec/models/ci/pipeline_spec.rb
View file @ 25b97e94
This diff is collapsed.
spec/models/diff_note_spec.rb
View file @ 25b97e94
This diff is collapsed.
spec/models/geo_node_spec.rb
View file @ 25b97e94
This diff is collapsed.
spec/models/hooks/service_hook_spec.rb
View file @ 25b97e94
This diff is collapsed.
spec/models/hooks/system_hook_spec.rb
View file @ 25b97e94
This diff is collapsed.
spec/models/hooks/web_hook_log_spec.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
spec/models/hooks/web_hook_spec.rb
View file @ 25b97e94
This diff is collapsed.
spec/models/label_spec.rb
View file @ 25b97e94
This diff is collapsed.
spec/models/merge_request_spec.rb
View file @ 25b97e94
This diff is collapsed.
spec/models/namespace_spec.rb
View file @ 25b97e94
This diff is collapsed.
spec/requests/api/project_push_rule_spec.rb
View file @ 25b97e94
This diff is collapsed.
spec/requests/api/users_spec.rb
View file @ 25b97e94
This diff is collapsed.
spec/routing/admin_routing_spec.rb
View file @ 25b97e94
This diff is collapsed.
spec/routing/project_routing_spec.rb
View file @ 25b97e94
This diff is collapsed.
spec/services/issues/close_service_spec.rb
View file @ 25b97e94
This diff is collapsed.
spec/services/issues/reopen_service_spec.rb
View file @ 25b97e94
This diff is collapsed.
spec/services/merge_requests/post_merge_service_spec.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
spec/services/web_hook_service_spec.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
spec/spec_helper.rb
View file @ 25b97e94
This diff is collapsed.
spec/support/issuable_shared_examples.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
spec/support/kubernetes_helpers.rb
View file @ 25b97e94
This diff is collapsed.
spec/support/matchers/execute_check.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
spec/support/rake_helpers.rb
View file @ 25b97e94
This diff is collapsed.
spec/support/test_env.rb
View file @ 25b97e94
This diff is collapsed.
spec/workers/process_commit_worker_spec.rb
View file @ 25b97e94
This diff is collapsed.
spec/workers/remove_old_web_hook_logs_worker_spec.rb 0 → 100644
View file @ 25b97e94
This diff is collapsed.
yarn.lock
View file @ 25b97e94
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