Skip to content

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

Merge branch 'master' into pawel/prometheus-business-metrics-ee-2273

parents e70bef40 1d237d4b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 22867 additions and 14549 deletions
.flayignore
View file @ 13380b16
......@@ -15,3 +15,8 @@ app/models/project_services/packagist_service.rb
lib/gitlab/background_migration/normalize_ldap_extern_uids_range.rb
lib/gitlab/background_migration/*
app/models/project_services/kubernetes_service.rb
ee/db/**/*
ee/app/serializers/ee/merge_request_widget_entity.rb
ee/lib/ee/gitlab/ldap/sync/admin_users.rb
ee/spec/**/*
.gitlab-ci.yml
View file @ 13380b16
......@@ -36,6 +36,7 @@ variables:
# This hack is needed to make ES not that memory hungry
ES_JAVA_OPTS: "-Xms256m -Xmx256m"
ELASTIC_URL: "http://elastic:changeme@docker.elastic.co-elasticsearch-elasticsearch:9200"
EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH: knapsack/${CI_PROJECT_NAME}/rspec_report-master-ee.json
before_script:
- bundle --version
......@@ -134,6 +135,30 @@ stages:
<<: *rspec-metadata
<<: *use-pg
.rspec-metadata-mysql: &rspec-metadata-mysql
<<: *rspec-metadata
<<: *use-mysql
.rspec-metadata-ee: &rspec-metadata-ee
<<: *rspec-metadata
stage: test
script:
- export KNAPSACK_TEST_FILE_PATTERN="ee/spec/**{,/*/**}/*_spec.rb" KNAPSACK_GENERATE_REPORT=true CACHE_CLASSES=true
- JOB_NAME=( $CI_JOB_NAME )
- export CI_NODE_INDEX=${JOB_NAME[-2]} CI_NODE_TOTAL=${JOB_NAME[-1]}
- export KNAPSACK_REPORT_PATH=knapsack/${CI_PROJECT_NAME}/${JOB_NAME[0]}_node_${CI_NODE_INDEX}_${CI_NODE_TOTAL}_report-ee.json
- cp ${EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH} ${KNAPSACK_REPORT_PATH}
- scripts/gitaly-test-spawn
- knapsack rspec "-Ispec --color --format documentation --tag ~geo"
.rspec-ee-pg: &rspec-ee-pg
<<: *rspec-metadata-ee
<<: *use-pg
.rspec-ee-mysql: &rspec-ee-mysql
<<: *rspec-metadata-ee
<<: *use-mysql
.rspec-geo-pg-9-6: &rspec-metadata-pg-geo
<<: *rspec-metadata
<<: *use-pg-9-6-no-elasticsearch
......@@ -143,11 +168,7 @@ stages:
- export CACHE_CLASSES=true
- source scripts/prepare_postgres_fdw.sh
- scripts/gitaly-test-spawn
- bundle exec rspec --color --format documentation --tag geo spec/
.rspec-metadata-mysql: &rspec-metadata-mysql
<<: *rspec-metadata
<<: *use-mysql
- bundle exec rspec --color --format documentation --tag geo ee/spec/
.spinach-metadata: &spinach-metadata
<<: *dedicated-runner
......@@ -265,6 +286,8 @@ retrieve-tests-metadata:
- mkdir -p rspec_flaky/
- wget -O $FLAKY_RSPEC_SUITE_REPORT_PATH http://${TESTS_METADATA_S3_BUCKET}.s3.amazonaws.com/$FLAKY_RSPEC_SUITE_REPORT_PATH || rm $FLAKY_RSPEC_SUITE_REPORT_PATH
- '[[ -f $FLAKY_RSPEC_SUITE_REPORT_PATH ]] || echo "{}" > ${FLAKY_RSPEC_SUITE_REPORT_PATH}'
- wget -O $EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH http://${TESTS_METADATA_S3_BUCKET}.s3.amazonaws.com/$EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH || rm $EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH
- '[[ -f $EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH ]] || echo "{}" > ${EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH}'
update-tests-metadata:
<<: *tests-metadata-state
......@@ -280,8 +303,10 @@ update-tests-metadata:
- retry gem install fog-aws mime-types
- scripts/merge-reports ${KNAPSACK_RSPEC_SUITE_REPORT_PATH} knapsack/${CI_PROJECT_NAME}/rspec-pg_node_*.json
- scripts/merge-reports ${KNAPSACK_SPINACH_SUITE_REPORT_PATH} knapsack/${CI_PROJECT_NAME}/spinach-pg_node_*.json
- scripts/merge-reports ${EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH} knapsack/${CI_PROJECT_NAME}/rspec-pg_node_*-ee.json
- scripts/merge-reports ${FLAKY_RSPEC_SUITE_REPORT_PATH} rspec_flaky/all_*_*.json
- '[[ -z ${TESTS_METADATA_S3_BUCKET} ]] || scripts/sync-reports put $TESTS_METADATA_S3_BUCKET $KNAPSACK_RSPEC_SUITE_REPORT_PATH $KNAPSACK_SPINACH_SUITE_REPORT_PATH'
- '[[ -z ${TESTS_METADATA_S3_BUCKET} ]] || scripts/sync-reports put $TESTS_METADATA_S3_BUCKET $EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH'
- '[[ -z ${TESTS_METADATA_S3_BUCKET} ]] || scripts/sync-reports put $TESTS_METADATA_S3_BUCKET $FLAKY_RSPEC_SUITE_REPORT_PATH'
- rm -f knapsack/${CI_PROJECT_NAME}/*_node_*.json
- rm -f rspec_flaky/all_*.json rspec_flaky/new_*.json
......@@ -346,7 +371,13 @@ setup-test-env:
- tmp/tests
- config/secrets.yml
# EE jobs
rspec-pg-ee 0 2: *rspec-ee-pg
rspec-pg-ee 1 2: *rspec-ee-pg
rspec-mysql-ee 0 2: *rspec-ee-mysql
rspec-mysql-ee 1 2: *rspec-ee-mysql
rspec-pg geo: *rspec-metadata-pg-geo
## EE jobs
rspec-pg 0 27: *rspec-metadata-pg
rspec-pg 1 27: *rspec-metadata-pg
......
.rubocop.yml
View file @ 13380b16
......@@ -10,10 +10,9 @@ AllCops:
Exclude:
- 'vendor/**/*'
- 'node_modules/**/*'
- 'db/*'
- 'db/**/*'
- 'db/fixtures/**/*'
- 'db/geo/*'
- 'ee/db/geo/*'
- 'ee/db/**/*'
- 'tmp/**/*'
- 'bin/**/*'
- 'generator_templates/**/*'
......@@ -27,7 +26,6 @@ Style/MutableConstant:
Exclude:
- 'db/migrate/**/*'
- 'db/post_migrate/**/*'
- 'db/geo/migrate/**/*'
- 'ee/db/migrate/**/*'
- 'ee/db/post_migrate/**/*'
- 'ee/db/geo/migrate/**/*'
......@@ -46,3 +44,16 @@ Gitlab/ModuleWithInstanceVariables:
# We ignore spec helpers because it usually doesn't matter
- spec/support/**/*.rb
- features/steps/**/*.rb
GitlabSecurity/PublicSend:
Enabled: true
Exclude:
- 'config/**/*'
- 'db/**/*'
- 'features/**/*'
- 'lib/**/*.rake'
- 'qa/**/*'
- 'spec/**/*'
- 'ee/db/**/*'
- 'ee/lib/**/*.rake'
- 'ee/spec/**/*'
app/assets/javascripts/boards/components/board_list.vue
View file @ 13380b16
......@@ -176,6 +176,7 @@ export default {
<loading-icon />
</div>
<board-new-issue
:group-id="groupId"
:list="list"
v-if="list.type !== 'closed' && showIssueForm"/>
<ul
......@@ -191,6 +192,7 @@ export default {
:list="list"
:issue="issue"
:issue-link-base="issueLinkBase"
:group-id="groupId"
:root-path="rootPath"
:disabled="disabled"
:key="issue.id" />
......
app/assets/javascripts/boards/components/board_sidebar.js
View file @ 13380b16
......@@ -3,6 +3,7 @@
import Vue from 'vue';
import weight from 'ee/sidebar/components/weight/weight.vue';
import Flash from '../../flash';
import { __ } from '../../locale';
import Sidebar from '../../right_sidebar';
import eventHub from '../../sidebar/event_hub';
import assigneeTitle from '../../sidebar/components/assignees/assignee_title';
......@@ -96,7 +97,7 @@ gl.issueBoards.BoardSidebar = Vue.extend({
})
.catch(() => {
this.loadingAssignees = false;
return new Flash('An error occurred while saving assignees');
Flash(__('An error occurred while saving assignees'));
});
},
},
......
app/assets/javascripts/boards/components/modal/footer.js
View file @ 13380b16
/* eslint-disable no-new */
import Vue from 'vue';
import Flash from '../../../flash';
import { __ } from '../../../locale';
import './lists_dropdown';
import { pluralize } from '../../../lib/utils/text_utility';
......@@ -42,7 +41,7 @@ gl.issueBoards.ModalFooter = Vue.extend({
assignee_ids: assigneeIds,
weight: currentBoard.weight,
}).catch(() => {
new Flash('Failed to update issues, please try again.', 'alert');
Flash(__('Failed to update issues, please try again.'));
selectedIssues.forEach((issue) => {
list.removeIssue(issue);
......
app/assets/javascripts/boards/components/new_list_dropdown.js
View file @ 13380b16
/* eslint-disable func-names, no-new, space-before-function-paren, one-var,
promise/catch-or-return */
import axios from '~/lib/utils/axios_utils';
import _ from 'underscore';
import CreateLabelDropdown from '../../create_label';
......@@ -28,9 +29,9 @@ gl.issueBoards.newListDropdownInit = () => {
$this.glDropdown({
data(term, callback) {
$.get($this.attr('data-list-labels-path'))
.then((resp) => {
callback(resp);
axios.get($this.attr('data-list-labels-path'))
.then(({ data }) => {
callback(data);
});
},
renderRow (label) {
......
app/assets/javascripts/boards/components/sidebar/remove_issue.js
View file @ 13380b16
/* eslint-disable no-new */
import Vue from 'vue';
import Flash from '../../../flash';
import { __ } from '../../../locale';
const Store = gl.issueBoards.BoardsStore;
......@@ -69,7 +68,7 @@ gl.issueBoards.RemoveIssueBtn = Vue.extend({
// Post the remove data
Vue.http.patch(this.updateUrl, data).catch(() => {
new Flash('Failed to remove issue from board, please try again.', 'alert');
Flash(__('Failed to remove issue from board, please try again.'));
lists.forEach((list) => {
list.addIssue(issue);
......
app/assets/javascripts/ci_variable_list/ci_variable_list.js
View file @ 13380b16
......@@ -39,7 +39,7 @@ export default class VariableList {
},
protected: {
selector: '.js-ci-variable-input-protected',
default: 'true',
default: 'false',
},
environment_scope: {
// We can't use a `.js-` class here because
......
app/assets/javascripts/commit/image_file.js
View file @ 13380b16
/* eslint-disable func-names, space-before-function-paren, wrap-iife, no-var, no-use-before-define, prefer-arrow-callback, no-else-return, consistent-return, prefer-template, quotes, one-var, one-var-declaration-per-line, no-unused-vars, no-return-assign, comma-dangle, quote-props, no-unused-expressions, no-sequences, object-shorthand, max-len */
import 'vendor/jquery.waitforimages';
// Width where images must fits in, for 2-up this gets divided by 2
const availWidth = 900;
......
app/assets/javascripts/commons/jquery.js
View file @ 13380b16
......@@ -6,7 +6,7 @@ import 'vendor/jquery.endless-scroll';
import 'vendor/jquery.caret';
import 'vendor/jquery.atwho';
import 'vendor/jquery.scrollTo';
import 'vendor/jquery.waitforimages';
import 'jquery.waitforimages';
import 'select2/select2';
// EE-only
......
app/assets/javascripts/create_merge_request_dropdown.js
View file @ 13380b16
......@@ -180,6 +180,7 @@ export default class CreateMergeRequestDropdown {
valueAttribute: 'data-text',
},
],
hideOnClick: false,
};
}
......
app/assets/javascripts/diff.js
View file @ 13380b16
import axios from '~/lib/utils/axios_utils';
import flash from '~/flash';
import { __ } from '~/locale';
import { getLocationHash } from './lib/utils/url_utility';
import FilesCommentButton from './files_comment_button';
import SingleFileDiff from './single_file_diff';
......@@ -69,7 +72,9 @@ export default class Diff {
const view = file.data('view');
const params = { since, to, bottom, offset, unfold, view };
$.get(link, params, response => $target.parent().replaceWith(response));
axios.get(link, { params })
.then(({ data }) => $target.parent().replaceWith(data))
.catch(() => flash(__('An error occurred while loading diff')));
}
openAnchoredDiff(cb) {
......
app/assets/javascripts/dispatcher.js
View file @ 13380b16
/* eslint-disable func-names, space-before-function-paren, no-var, prefer-arrow-callback, wrap-iife, no-shadow, consistent-return, one-var, one-var-declaration-per-line, camelcase, default-case, no-new, quotes, no-duplicate-case, no-case-declarations, no-fallthrough, max-len */
import MergeRequest from './merge_request';
import Flash from './flash';
import GfmAutoComplete from './gfm_auto_complete';
import ZenMode from './zen_mode';
import initNotes from './init_notes';
import initIssuableSidebar from './init_issuable_sidebar';
import { convertPermissionToBoolean } from './lib/utils/common_utils';
import GlFieldErrors from './gl_field_errors';
import Shortcuts from './shortcuts';
import ShortcutsIssuable from './shortcuts_issuable';
import Diff from './diff';
import SearchAutocomplete from './search_autocomplete';
// EE-only
import UsersSelect from './users_select';
import UserCallout from './user_callout';
import ZenMode from './zen_mode';
import initCompareAutocomplete from './compare_autocomplete';
import initGeoInfoModal from 'ee/init_geo_info_modal'; // eslint-disable-line import/first
import initGroupAnalytics from 'ee/init_group_analytics'; // eslint-disable-line import/first
......@@ -301,17 +296,10 @@ var Dispatcher;
.catch(fail);
break;
case 'projects:merge_requests:show':
new Diff();
new ZenMode();
initIssuableSidebar();
initNotes();
const mrShowNode = document.querySelector('.merge-request');
window.mergeRequest = new MergeRequest({
action: mrShowNode.dataset.mrAction,
});
shortcut_handler = new ShortcutsIssuable(true);
import('./pages/projects/merge_requests/show')
.then(callDefault)
.catch(fail);
shortcut_handler = true;
break;
case 'dashboard:activity':
import('./pages/dashboard/activity')
......@@ -348,7 +336,7 @@ var Dispatcher;
// ee-end
break;
case 'projects:edit':
import('./pages/projects/edit')
import(/* webpackChunkName: "ee_projects_edit" */ 'ee/pages/projects/edit')
.then(callDefault)
.catch(fail);
break;
......
app/assets/javascripts/droplab/constants.js
View file @ 13380b16
......@@ -3,7 +3,6 @@ const DATA_DROPDOWN = 'data-dropdown';
const SELECTED_CLASS = 'droplab-item-selected';
const ACTIVE_CLASS = 'droplab-item-active';
const IGNORE_CLASS = 'droplab-item-ignore';
const IGNORE_HIDING_CLASS = 'droplab-item-ignore-hiding';
// Matches `{{anything}}` and `{{ everything }}`.
const TEMPLATE_REGEX = /\{\{(.+?)\}\}/g;
......@@ -14,5 +13,4 @@ export {
ACTIVE_CLASS,
TEMPLATE_REGEX,
IGNORE_CLASS,
IGNORE_HIDING_CLASS,
};
app/assets/javascripts/droplab/drop_down.js
View file @ 13380b16
import utils from './utils';
import { SELECTED_CLASS, IGNORE_CLASS, IGNORE_HIDING_CLASS } from './constants';
import { SELECTED_CLASS, IGNORE_CLASS } from './constants';
class DropDown {
constructor(list, config = {}) {
constructor(list, config = { }) {
this.currentIndex = 0;
this.hidden = true;
this.list = typeof list === 'string' ? document.querySelector(list) : list;
this.items = [];
this.eventWrapper = {};
this.hideOnClick = config.hideOnClick !== false;
if (config.addActiveClassToDropdownButton) {
this.dropdownToggle = this.list.parentNode.querySelector('.js-dropdown-toggle');
......@@ -37,15 +38,17 @@ class DropDown {
clickEvent(e) {
if (e.target.tagName === 'UL') return;
if (e.target.classList.contains(IGNORE_CLASS)) return;
if (e.target.closest(`.${IGNORE_CLASS}`)) return;
const selected = utils.closest(e.target, 'LI');
const selected = e.target.closest('li');
if (!selected) return;
this.addSelectedClass(selected);
e.preventDefault();
if (!e.target.classList.contains(IGNORE_HIDING_CLASS)) this.hide();
if (this.hideOnClick) {
this.hide();
}
const listEvent = new CustomEvent('click.dl', {
detail: {
......
app/assets/javascripts/environments/components/environment_item.vue
View file @ 13380b16
<script>
import Timeago from 'timeago.js';
import _ from 'underscore';
import userAvatarLink from '../../vue_shared/components/user_avatar/user_avatar_link.vue';
import { humanize } from '../../lib/utils/text_utility';
import tooltip from '~/vue_shared/directives/tooltip';
import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue';
import { humanize } from '~/lib/utils/text_utility';
import ActionsComponent from './environment_actions.vue';
import ExternalUrlComponent from './environment_external_url.vue';
import StopComponent from './environment_stop.vue';
......@@ -21,14 +22,18 @@
export default {
components: {
userAvatarLink,
'commit-component': CommitComponent,
'actions-component': ActionsComponent,
'external-url-component': ExternalUrlComponent,
'stop-component': StopComponent,
'rollback-component': RollbackComponent,
'terminal-button-component': TerminalButtonComponent,
'monitoring-button-component': MonitoringButtonComponent,
UserAvatarLink,
CommitComponent,
ActionsComponent,
ExternalUrlComponent,
StopComponent,
RollbackComponent,
TerminalButtonComponent,
MonitoringButtonComponent,
},
directives: {
tooltip,
},
props: {
......@@ -463,7 +468,11 @@
v-if="!model.isFolder"
class="environment-name flex-truncate-parent table-mobile-content"
:href="environmentPath">
<span class="flex-truncate-child">{{ model.name }}</span>
<span
class="flex-truncate-child"
v-tooltip
:title="model.name"
>{{ model.name }}</span>
</a>
<span
v-else
......
app/assets/javascripts/gl_form.js
View file @ 13380b16
/* global autosize */
import autosize from 'autosize';
import GfmAutoComplete from './gfm_auto_complete';
import dropzoneInput from './dropzone_input';
import textUtils from './lib/utils/text_markdown';
......
app/assets/javascripts/gpg_badges.js
View file @ 13380b16
import { parseQueryStringIntoObject } from '~/lib/utils/common_utils';
import axios from '~/lib/utils/axios_utils';
import flash from '~/flash';
import { __ } from '~/locale';
export default class GpgBadges {
static fetch() {
const badges = $('.js-loading-gpg-badge');
......@@ -5,13 +10,13 @@ export default class GpgBadges {
badges.html('<i class="fa fa-spinner fa-spin"></i>');
$.get({
url: form.data('signatures-path'),
data: form.serialize(),
}).done((response) => {
response.signatures.forEach((signature) => {
const params = parseQueryStringIntoObject(form.serialize());
return axios.get(form.data('signatures-path'), { params })
.then(({ data }) => {
data.signatures.forEach((signature) => {
badges.filter(`[data-commit-sha="${signature.commit_sha}"]`).replaceWith(signature.html);
});
});
})
.catch(() => flash(__('An error occurred while loading commits')));
}
}
app/assets/javascripts/groups_select.js
View file @ 13380b16
import axios from './lib/utils/axios_utils';
import Api from './api';
import { normalizeCRLFHeaders } from './lib/utils/common_utils';
import { normalizeHeaders } from './lib/utils/common_utils';
export default function groupsSelect() {
// Needs to be accessible in rspec
......@@ -17,24 +18,23 @@ export default function groupsSelect() {
dataType: 'json',
quietMillis: 250,
transport(params) {
return $.ajax(params)
.then((data, status, xhr) => {
const results = data || [];
const headers = normalizeCRLFHeaders(xhr.getAllResponseHeaders());
axios[params.type.toLowerCase()](params.url, {
params: params.data,
})
.then((res) => {
const results = res.data || [];
const headers = normalizeHeaders(res.headers);
const currentPage = parseInt(headers['X-PAGE'], 10) || 0;
const totalPages = parseInt(headers['X-TOTAL-PAGES'], 10) || 0;
const more = currentPage < totalPages;
return {
params.success({
results,
pagination: {
more,
},
};
})
.then(params.success)
.fail(params.error);
});
}).catch(params.error);
},
data(search, page) {
return {
......
app/assets/javascripts/ide/components/changed_file_icon.vue 0 → 100644
View file @ 13380b16
<script>
import icon from '../../vue_shared/components/icon.vue';
export default {
components: {
icon,
},
props: {
file: {
type: Object,
required: true,
},
},
computed: {
changedIcon() {
return this.file.tempFile ? 'file-addition' : 'file-modified';
},
changedIconClass() {
return `multi-${this.changedIcon}`;
},
},
};
</script>
<template>
<icon
:name="changedIcon"
:size="12"
:css-classes="`multi-file-changed-icon ${changedIconClass}`"
/>
</template>
app/assets/javascripts/ide/components/new_dropdown/index.vue
View file @ 13380b16
......@@ -27,28 +27,38 @@
return {
openModal: false,
modalType: '',
dropdownOpen: false,
};
},
methods: {
createNewItem(type) {
this.modalType = type;
this.openModal = true;
this.dropdownOpen = false;
},
hideModal() {
this.openModal = false;
},
openDropdown() {
this.dropdownOpen = !this.dropdownOpen;
},
},
};
</script>
<template>
<div class="repo-new-btn pull-right">
<div class="dropdown">
<div
class="dropdown"
:class="{
open: dropdownOpen,
}"
>
<button
type="button"
class="btn btn-sm btn-default dropdown-toggle add-to-tree"
data-toggle="dropdown"
aria-label="Create new file or directory"
@click.stop="openDropdown()"
>
<icon
name="plus"
......@@ -66,7 +76,7 @@
<a
href="#"
role="button"
@click.prevent="createNewItem('blob')"
@click.stop.prevent="createNewItem('blob')"
>
{{ __('New file') }}
</a>
......@@ -82,7 +92,7 @@
<a
href="#"
role="button"
@click.prevent="createNewItem('tree')"
@click.stop.prevent="createNewItem('tree')"
>
{{ __('New directory') }}
</a>
......
app/assets/javascripts/ide/components/new_dropdown/upload.vue
View file @ 13380b16
......@@ -73,7 +73,7 @@
<a
href="#"
role="button"
@click.prevent="startFileUpload"
@click.stop.prevent="startFileUpload"
>
{{ __('Upload file') }}
</a>
......
app/assets/javascripts/ide/components/repo_editor.vue
View file @ 13380b16
......@@ -93,10 +93,12 @@ export default {
this.editor.attachModel(this.model);
this.model.onChange((m) => {
this.changeFileContent({
file: this.activeFile,
content: m.getValue(),
});
if (this.model.file.active) {
this.changeFileContent({
file: this.model.file,
content: m.getValue(),
});
}
});
// Handle Cursor Position
......
app/assets/javascripts/ide/components/repo_file.vue
View file @ 13380b16
......@@ -5,6 +5,7 @@
import fileStatusIcon from './repo_file_status_icon.vue';
import newDropdown from './new_dropdown/index.vue';
import fileIcon from '../../vue_shared/components/file_icon.vue';
import changedFileIcon from './changed_file_icon.vue';
export default {
components: {
......@@ -12,6 +13,7 @@
newDropdown,
fileStatusIcon,
fileIcon,
changedFileIcon,
},
mixins: [
timeAgoMixin,
......@@ -61,11 +63,6 @@
}
return '';
},
changedClass() {
return {
'fa-circle unsaved-icon': this.file.changed || this.file.tempFile,
};
},
},
updated() {
if (this.file.type === 'blob' && this.file.active) {
......@@ -91,10 +88,11 @@
<tr
class="file"
:class="fileClass"
@click="clickFile(file)">
>
<td
class="multi-file-table-name"
:colspan="submoduleColSpan"
@click="clickFile(file)"
>
<a
class="repo-file-name str-truncated"
......@@ -117,13 +115,11 @@
:path="file.path"
:parent="file"
/>
<i
class="fa"
<changed-file-icon
v-if="file.changed || file.tempFile"
:class="changedClass"
aria-hidden="true"
>
</i>
:file="file"
class="prepend-top-5 pull-right"
/>
<template v-if="isSubmodule && file.id">
@
<span class="commit-sha">
......
app/assets/javascripts/ide/components/repo_tab.vue
View file @ 13380b16
......@@ -3,12 +3,14 @@
import fileStatusIcon from './repo_file_status_icon.vue';
import fileIcon from '../../vue_shared/components/file_icon.vue';
import icon from '../../vue_shared/components/icon.vue';
import changedFileIcon from './changed_file_icon.vue';
export default {
components: {
fileStatusIcon,
fileIcon,
icon,
changedFileIcon,
},
props: {
tab: {
......@@ -31,12 +33,6 @@
showChangedIcon() {
return this.tab.changed ? !this.tabMouseOver : false;
},
changedIcon() {
return this.tab.tempFile ? 'file-addition' : 'file-modified';
},
changedIconClass() {
return this.tab.tempFile ? 'multi-file-addition' : 'multi-file-modified';
},
},
methods: {
......@@ -77,11 +73,9 @@
name="close"
:size="12"
/>
<icon
<changed-file-icon
v-else
:name="changedIcon"
:size="12"
:css-classes="changedIconClass"
:file="tab"
/>
</button>
......
app/assets/javascripts/ide/stores/actions/file.js
View file @ 13380b16
......@@ -21,7 +21,7 @@ export const closeFile = ({ commit, state, dispatch }, file) => {
const nextIndexToOpen = indexOfClosedFile === 0 ? 0 : indexOfClosedFile - 1;
const nextFileToOpen = state.openFiles[nextIndexToOpen];
dispatch('setFileActive', nextFileToOpen);
router.push(`/project${nextFileToOpen.url}`);
} else if (!state.openFiles.length) {
router.push(`/project/${file.projectId}/tree/${file.branchId}/`);
}
......
app/assets/javascripts/ide/stores/actions/tree.js
View file @ 13380b16
......@@ -38,7 +38,7 @@ export const getTreeData = (
commit(types.SET_ROOT, data.path === '/');
}
dispatch('updateDirectoryData', { data, tree, projectId, branch });
dispatch('updateDirectoryData', { data, tree, projectId, branch, clearTree: false });
const selectedTree = tree || state.trees[`${projectId}/${branch}`];
commit(types.SET_PARENT_TREE_URL, data.parent_tree_url);
......@@ -84,7 +84,11 @@ export const handleTreeEntryAction = ({ commit, dispatch }, row) => {
} else if (row.type === 'submodule') {
commit(types.TOGGLE_LOADING, row);
visitUrl(row.url);
} else if (row.type === 'blob' && row.opened) {
} else if (row.type === 'blob' && (row.opened || row.changed)) {
if (row.changed && !row.opened) {
commit(types.TOGGLE_FILE_OPEN, row);
}
dispatch('setFileActive', row);
} else {
dispatch('getFileData', row);
......@@ -156,7 +160,7 @@ export const getLastCommitData = ({ state, commit, dispatch, getters }, tree = s
export const updateDirectoryData = (
{ commit, state },
{ data, tree, projectId, branch },
{ data, tree, projectId, branch, clearTree = true },
) => {
if (!tree) {
const existingTree = state.trees[`${projectId}/${branch}`];
......@@ -169,20 +173,28 @@ export const updateDirectoryData = (
const level = selectedTree.level !== undefined ? selectedTree.level + 1 : 0;
const parentTreeUrl = data.parent_tree_url ? `${data.parent_tree_url}${data.path}` : state.endpoints.rootUrl;
const createEntry = (entry, type) => createOrMergeEntry({
tree: selectedTree,
projectId: `${projectId}`,
branchId: branch,
entry,
level,
type,
parentTreeUrl,
state,
});
const formattedData = [
let formattedData = [
...data.trees.map(t => createEntry(t, 'tree')),
...data.submodules.map(m => createEntry(m, 'submodule')),
...data.blobs.map(b => createEntry(b, 'blob')),
];
if (!clearTree && tree) {
const tempFiles = state.changedFiles.filter(f => f.tempFile && f.path === `${tree.path}/${f.name}`);
if (tempFiles.length) {
formattedData = formattedData.concat(tempFiles);
}
}
commit(types.SET_DIRECTORY_DATA, { tree: selectedTree, data: formattedData });
};
app/assets/javascripts/ide/stores/utils.js
View file @ 13380b16
......@@ -155,21 +155,27 @@ export const createTemp = ({
});
};
export const createOrMergeEntry = ({ tree,
projectId,
export const createOrMergeEntry = ({ projectId,
branchId,
entry,
type,
parentTreeUrl,
level }) => {
const found = findEntry(tree.tree || tree, type, entry.name);
if (found) {
return Object.assign({}, found, {
id: entry.id,
url: entry.url,
tempFile: false,
});
level,
state }) => {
if (state.changedFiles.length) {
const foundChangedFile = findEntry(state.changedFiles, type, entry.name);
if (foundChangedFile) {
return foundChangedFile;
}
}
if (state.openFiles.length) {
const foundOpenFile = findEntry(state.openFiles, type, entry.name);
if (foundOpenFile) {
return foundOpenFile;
}
}
return decorateData({
......
app/assets/javascripts/importer_status.js
View file @ 13380b16
import { __ } from './locale';
import axios from './lib/utils/axios_utils';
import flash from './flash';
class ImporterStatus {
constructor(jobsUrl, importUrl) {
this.jobsUrl = jobsUrl;
......@@ -9,29 +13,7 @@ class ImporterStatus {
initStatusPage() {
$('.js-add-to-import')
.off('click')
.on('click', (event) => {
const $btn = $(event.currentTarget);
const $tr = $btn.closest('tr');
const $targetField = $tr.find('.import-target');
const $namespaceInput = $targetField.find('.js-select-namespace option:selected');
const id = $tr.attr('id').replace('repo_', '');
let targetNamespace;
let newName;
if ($namespaceInput.length > 0) {
targetNamespace = $namespaceInput[0].innerHTML;
newName = $targetField.find('#path').prop('value');
$targetField.empty().append(`${targetNamespace}/${newName}`);
}
$btn.disable().addClass('is-loading');
return $.post(this.importUrl, {
repo_id: id,
target_namespace: targetNamespace,
new_name: newName,
}, {
dataType: 'script',
});
});
.on('click', this.addToImport.bind(this));
$('.js-import-all')
.off('click')
......@@ -44,6 +26,39 @@ class ImporterStatus {
});
}
addToImport(event) {
const $btn = $(event.currentTarget);
const $tr = $btn.closest('tr');
const $targetField = $tr.find('.import-target');
const $namespaceInput = $targetField.find('.js-select-namespace option:selected');
const id = $tr.attr('id').replace('repo_', '');
let targetNamespace;
let newName;
if ($namespaceInput.length > 0) {
targetNamespace = $namespaceInput[0].innerHTML;
newName = $targetField.find('#path').prop('value');
$targetField.empty().append(`${targetNamespace}/${newName}`);
}
$btn.disable().addClass('is-loading');
return axios.post(this.importUrl, {
repo_id: id,
target_namespace: targetNamespace,
new_name: newName,
})
.then(({ data }) => {
const job = $(`tr#repo_${id}`);
job.attr('id', `project_${data.id}`);
job.find('.import-target').html(`<a href="${data.full_path}">${data.full_path}</a>`);
$('table.import-jobs tbody').prepend(job);
job.addClass('active');
job.find('.import-actions').html('<i class="fa fa-spinner fa-spin" aria-label="importing"></i> started');
})
.catch(() => flash(__('An error occurred while importing project')));
}
setAutoUpdate() {
return setInterval(() => $.get(this.jobsUrl, data => $.each(data, (i, job) => {
const jobItem = $(`#project_${job.id}`);
......@@ -71,7 +86,7 @@ class ImporterStatus {
}
// eslint-disable-next-line consistent-return
export default function initImporterStatus() {
function initImporterStatus() {
const importerStatus = document.querySelector('.js-importer-status');
if (importerStatus) {
......@@ -79,3 +94,8 @@ export default function initImporterStatus() {
return new ImporterStatus(data.jobsImportPath, data.importPath);
}
}
export {
initImporterStatus as default,
ImporterStatus,
};
app/assets/javascripts/issue.js
View file @ 13380b16
/* eslint-disable func-names, space-before-function-paren, no-var, prefer-rest-params, wrap-iife, one-var, no-underscore-dangle, one-var-declaration-per-line, object-shorthand, no-unused-vars, no-new, comma-dangle, consistent-return, quotes, dot-notation, quote-props, prefer-arrow-callback, max-len */
import 'vendor/jquery.waitforimages';
import axios from './lib/utils/axios_utils';
import { addDelimiter } from './lib/utils/text_utility';
import flash from './flash';
......@@ -25,6 +24,51 @@ export default class Issue {
if (Issue.createMrDropdownWrap) {
this.createMergeRequestDropdown = new CreateMergeRequestDropdown(Issue.createMrDropdownWrap);
}
// Listen to state changes in the Vue app
document.addEventListener('issuable_vue_app:change', (event) => {
this.updateTopState(event.detail.isClosed, event.detail.data);
});
}
/**
* This method updates the top area of the issue.
*
* Once the issue state changes, either through a click on the top area (jquery)
* or a click on the bottom area (Vue) we need to update the top area.
*
* @param {Boolean} isClosed
* @param {Array} data
* @param {String} issueFailMessage
*/
updateTopState(isClosed, data, issueFailMessage = 'Unable to update this issue at this time.') {
if ('id' in data) {
const isClosedBadge = $('div.status-box-issue-closed');
const isOpenBadge = $('div.status-box-open');
const projectIssuesCounter = $('.issue_counter');
isClosedBadge.toggleClass('hidden', !isClosed);
isOpenBadge.toggleClass('hidden', isClosed);
$(document).trigger('issuable:change', isClosed);
this.toggleCloseReopenButton(isClosed);
let numProjectIssues = Number(projectIssuesCounter.first().text().trim().replace(/[^\d]/, ''));
numProjectIssues = isClosed ? numProjectIssues - 1 : numProjectIssues + 1;
projectIssuesCounter.text(addDelimiter(numProjectIssues));
if (this.createMergeRequestDropdown) {
if (isClosed) {
this.createMergeRequestDropdown.unavailable();
this.createMergeRequestDropdown.disable();
} else {
// We should check in case a branch was created in another tab
this.createMergeRequestDropdown.checkAbilityToCreateBranch();
}
}
} else {
flash(issueFailMessage);
}
}
initIssueBtnEventListeners() {
......@@ -45,34 +89,8 @@ export default class Issue {
url = $button.attr('href');
return axios.put(url)
.then(({ data }) => {
const isClosedBadge = $('div.status-box-issue-closed');
const isOpenBadge = $('div.status-box-open');
const projectIssuesCounter = $('.issue_counter');
if ('id' in data) {
const isClosed = $button.hasClass('btn-close');
isClosedBadge.toggleClass('hidden', !isClosed);
isOpenBadge.toggleClass('hidden', isClosed);
$(document).trigger('issuable:change', isClosed);
this.toggleCloseReopenButton(isClosed);
let numProjectIssues = Number(projectIssuesCounter.first().text().trim().replace(/[^\d]/, ''));
numProjectIssues = isClosed ? numProjectIssues - 1 : numProjectIssues + 1;
projectIssuesCounter.text(addDelimiter(numProjectIssues));
if (this.createMergeRequestDropdown) {
if (isClosed) {
this.createMergeRequestDropdown.unavailable();
this.createMergeRequestDropdown.disable();
} else {
// We should check in case a branch was created in another tab
this.createMergeRequestDropdown.checkAbilityToCreateBranch();
}
}
} else {
flash(issueFailMessage);
}
const isClosed = $button.hasClass('btn-close');
this.updateTopState(isClosed, data);
})
.catch(() => flash(issueFailMessage))
.then(() => {
......
app/assets/javascripts/merge_request.js
View file @ 13380b16
/* eslint-disable func-names, space-before-function-paren, no-var, prefer-rest-params, wrap-iife, quotes, no-underscore-dangle, one-var, one-var-declaration-per-line, consistent-return, dot-notation, quote-props, comma-dangle, object-shorthand, max-len, prefer-arrow-callback */
import 'vendor/jquery.waitforimages';
import { __ } from '~/locale';
import TaskList from './task_list';
import MergeRequestTabs from './merge_request_tabs';
......
app/assets/javascripts/notes/components/comment_form.vue
View file @ 13380b16
......@@ -2,16 +2,18 @@
import { mapActions, mapGetters } from 'vuex';
import _ from 'underscore';
import Autosize from 'autosize';
import { __ } from '~/locale';
import Flash from '../../flash';
import Autosave from '../../autosave';
import TaskList from '../../task_list';
import * as constants from '../constants';
import eventHub from '../event_hub';
import issueWarning from '../../vue_shared/components/issue/issue_warning.vue';
import noteSignedOutWidget from './note_signed_out_widget.vue';
import discussionLockedWidget from './discussion_locked_widget.vue';
import markdownField from '../../vue_shared/components/markdown/field.vue';
import userAvatarLink from '../../vue_shared/components/user_avatar/user_avatar_link.vue';
import loadingButton from '../../vue_shared/components/loading_button.vue';
import noteSignedOutWidget from './note_signed_out_widget.vue';
import discussionLockedWidget from './discussion_locked_widget.vue';
import issuableStateMixin from '../mixins/issuable_state';
export default {
......@@ -22,6 +24,7 @@
discussionLockedWidget,
markdownField,
userAvatarLink,
loadingButton,
},
mixins: [
issuableStateMixin,
......@@ -30,9 +33,6 @@
return {
note: '',
noteType: constants.COMMENT,
// Can't use mapGetters,
// this needs to be in the data object because it belongs to the state
issueState: this.$store.getters.getNoteableData.state,
isSubmitting: false,
isSubmitButtonDisabled: true,
};
......@@ -43,6 +43,7 @@
'getUserData',
'getNoteableData',
'getNotesData',
'issueState',
]),
isLoggedIn() {
return this.getUserData.id;
......@@ -105,7 +106,7 @@
mounted() {
// jQuery is needed here because it is a custom event being dispatched with jQuery.
$(document).on('issuable:change', (e, isClosed) => {
this.issueState = isClosed ? constants.CLOSED : constants.REOPENED;
this.toggleIssueLocalState(isClosed ? constants.CLOSED : constants.REOPENED);
});
this.initAutoSave();
......@@ -117,6 +118,9 @@
'stopPolling',
'restartPolling',
'removePlaceholderNotes',
'closeIssue',
'reopenIssue',
'toggleIssueLocalState',
]),
setIsSubmitButtonDisabled(note, isSubmitting) {
if (!_.isEmpty(note) && !isSubmitting) {
......@@ -126,6 +130,8 @@
}
},
handleSave(withIssueAction) {
this.isSubmitting = true;
if (this.note.length) {
const noteData = {
endpoint: this.endpoint,
......@@ -142,7 +148,6 @@
if (this.noteType === constants.DISCUSSION) {
noteData.data.note.type = constants.DISCUSSION_NOTE;
}
this.isSubmitting = true;
this.note = ''; // Empty textarea while being requested. Repopulate in catch
this.resizeTextarea();
this.stopPolling();
......@@ -184,13 +189,25 @@ Please check your network connection and try again.`;
this.toggleIssueState();
}
},
enableButton() {
this.isSubmitting = false;
},
toggleIssueState() {
this.issueState = this.isIssueOpen ? constants.CLOSED : constants.REOPENED;
// This is out of scope for the Notes Vue component.
// It was the shortest path to update the issue state and relevant places.
const btnClass = this.isIssueOpen ? 'btn-reopen' : 'btn-close';
$(`.js-btn-issue-action.${btnClass}:visible`).trigger('click');
if (this.isIssueOpen) {
this.closeIssue()
.then(() => this.enableButton())
.catch(() => {
this.enableButton();
Flash(__('Something went wrong while closing the issue. Please try again later'));
});
} else {
this.reopenIssue()
.then(() => this.enableButton())
.catch(() => {
this.enableButton();
Flash(__('Something went wrong while reopening the issue. Please try again later'));
});
}
},
discard(shouldClear = true) {
// `blur` is needed to clear slash commands autocomplete cache if event fired.
......@@ -368,15 +385,19 @@ append-right-10 comment-type-dropdown js-comment-type-dropdown droplab-dropdown"
</li>
</ul>
</div>
<button
type="button"
@click="handleSave(true)"
<loading-button
v-if="canUpdateIssue"
:class="actionButtonClassNames"
:loading="isSubmitting"
@click="handleSave(true)"
:container-class="[
actionButtonClassNames,
'btn btn-comment btn-comment-and-close js-action-button'
]"
:disabled="isSubmitting"
class="btn btn-comment btn-comment-and-close js-action-button">
{{ issueActionButtonTitle }}
</button>
:label="issueActionButtonTitle"
/>
<button
type="button"
v-if="note.length"
......
app/assets/javascripts/notes/index.js
View file @ 13380b16
......@@ -28,6 +28,8 @@ document.addEventListener('DOMContentLoaded', () => new Vue({
notesPath: notesDataset.notesPath,
markdownDocsPath: notesDataset.markdownDocsPath,
quickActionsDocsPath: notesDataset.quickActionsDocsPath,
closeIssuePath: notesDataset.closeIssuePath,
reopenIssuePath: notesDataset.reopenIssuePath,
},
};
},
......
app/assets/javascripts/notes/services/notes_service.js
View file @ 13380b16
......@@ -32,4 +32,7 @@ export default {
toggleAward(endpoint, data) {
return Vue.http.post(endpoint, data, { emulateJSON: true });
},
toggleIssueState(endpoint, data) {
return Vue.http.put(endpoint, data);
},
};
app/assets/javascripts/notes/stores/actions.js
View file @ 13380b16
......@@ -61,6 +61,39 @@ export const createNewNote = ({ commit }, { endpoint, data }) => service
export const removePlaceholderNotes = ({ commit }) =>
commit(types.REMOVE_PLACEHOLDER_NOTES);
export const closeIssue = ({ commit, dispatch, state }) => service
.toggleIssueState(state.notesData.closeIssuePath)
.then(res => res.json())
.then((data) => {
commit(types.CLOSE_ISSUE);
dispatch('emitStateChangedEvent', data);
});
export const reopenIssue = ({ commit, dispatch, state }) => service
.toggleIssueState(state.notesData.reopenIssuePath)
.then(res => res.json())
.then((data) => {
commit(types.REOPEN_ISSUE);
dispatch('emitStateChangedEvent', data);
});
export const emitStateChangedEvent = ({ commit, getters }, data) => {
const event = new CustomEvent('issuable_vue_app:change', { detail: {
data,
isClosed: getters.issueState === constants.CLOSED,
} });
document.dispatchEvent(event);
};
export const toggleIssueLocalState = ({ commit }, newState) => {
if (newState === constants.CLOSED) {
commit(types.CLOSE_ISSUE);
} else if (newState === constants.REOPENED) {
commit(types.REOPEN_ISSUE);
}
};
export const saveNote = ({ commit, dispatch }, noteData) => {
const { note } = noteData.data.note;
let placeholderText = note;
......
app/assets/javascripts/notes/stores/getters.js
View file @ 13380b16
......@@ -8,6 +8,7 @@ export const getNotesDataByProp = state => prop => state.notesData[prop];
export const getNoteableData = state => state.noteableData;
export const getNoteableDataByProp = state => prop => state.noteableData[prop];
export const issueState = state => state.noteableData.state;
export const getUserData = state => state.userData || {};
export const getUserDataByProp = state => prop => state.userData && state.userData[prop];
......
app/assets/javascripts/notes/stores/mutation_types.js
View file @ 13380b16
......@@ -12,3 +12,7 @@ export const SHOW_PLACEHOLDER_NOTE = 'SHOW_PLACEHOLDER_NOTE';
export const TOGGLE_AWARD = 'TOGGLE_AWARD';
export const TOGGLE_DISCUSSION = 'TOGGLE_DISCUSSION';
export const UPDATE_NOTE = 'UPDATE_NOTE';
// Issue
export const CLOSE_ISSUE = 'CLOSE_ISSUE';
export const REOPEN_ISSUE = 'REOPEN_ISSUE';
app/assets/javascripts/notes/stores/mutations.js
View file @ 13380b16
......@@ -152,4 +152,12 @@ export default {
noteObj.notes.splice(noteObj.notes.indexOf(comment), 1, note);
}
},
[types.CLOSE_ISSUE](state) {
Object.assign(state.noteableData, { state: constants.CLOSED });
},
[types.REOPEN_ISSUE](state) {
Object.assign(state.noteableData, { state: constants.REOPENED });
},
};
app/assets/javascripts/pages/ci/lints/ci_lint_editor.js
View file @ 13380b16
......@@ -2,11 +2,18 @@ export default class CILintEditor {
constructor() {
this.editor = window.ace.edit('ci-editor');
this.textarea = document.querySelector('#content');
this.clearYml = document.querySelector('.clear-yml');
this.editor.getSession().setMode('ace/mode/yaml');
this.editor.on('input', () => {
const content = this.editor.getSession().getValue();
this.textarea.value = content;
});
this.clearYml.addEventListener('click', this.clear.bind(this));
}
clear() {
this.editor.setValue('');
}
}
app/assets/javascripts/pages/projects/edit/index.js
View file @ 13380b16
/* eslint-disable no-new */
import UsersSelect from '~/users_select';
import UserCallout from '~/user_callout';
import groupsSelect from '~/groups_select';
import initSettingsPanels from '~/settings_panels';
import setupProjectEdit from '~/project_edit';
import ProjectNew from '../shared/project_new';
import projectAvatar from '../shared/project_avatar';
import initProjectPermissionsSettings from '../shared/permissions';
// EE imports
import ApproversSelect from 'ee/approvers_select'; // eslint-disable-line import/first
export default () => {
new ProjectNew(); // eslint-disable-line no-new
new UsersSelect();
groupsSelect();
setupProjectEdit();
// Initialize expandable settings panels
initSettingsPanels();
projectAvatar();
initProjectPermissionsSettings();
new UserCallout({ className: 'js-service-desk-callout' });
new UserCallout({ className: 'js-mr-approval-callout' });
// EE imports
new ApproversSelect(); // eslint-disable-line no-new
};
app/assets/javascripts/pages/projects/merge_requests/show/index.js 0 → 100644
View file @ 13380b16
import MergeRequest from '~/merge_request';
import ZenMode from '~/zen_mode';
import initNotes from '~/init_notes';
import initIssuableSidebar from '~/init_issuable_sidebar';
import ShortcutsIssuable from '~/shortcuts_issuable';
import Diff from '~/diff';
import { handleLocationHash } from '~/lib/utils/common_utils';
export default () => {
new Diff(); // eslint-disable-line no-new
new ZenMode(); // eslint-disable-line no-new
initIssuableSidebar(); // eslint-disable-line no-new
initNotes(); // eslint-disable-line no-new
const mrShowNode = document.querySelector('.merge-request');
window.mergeRequest = new MergeRequest({
action: mrShowNode.dataset.mrAction,
});
new ShortcutsIssuable(true); // eslint-disable-line no-new
handleLocationHash();
};
app/assets/javascripts/pages/projects/tree/show/index.js
View file @ 13380b16
......@@ -15,7 +15,7 @@ export default () => {
$('#tree-slider').waitForImages(() =>
ajaxGet(document.querySelector('.js-tree-content').dataset.logsPath));
const commitPipelineStatusEl = document.getElementById('commit-pipeline-status');
const commitPipelineStatusEl = document.querySelector('.js-commit-pipeline-status');
const statusLink = document.querySelector('.commit-actions .ci-status-link');
if (statusLink != null) {
statusLink.remove();
......
app/assets/javascripts/render_math.js
View file @ 13380b16
/* global katex */
import { __ } from './locale';
import flash from './flash';
// Renders math using KaTeX in any element with the
// `js-render-math` class
......@@ -8,15 +9,8 @@
// <code class="js-render-math"></div>
//
import { __ } from './locale';
import axios from './lib/utils/axios_utils';
import flash from './flash';
// Only load once
let katexLoaded = false;
// Loop over all math elements and render math
function renderWithKaTeX(elements) {
function renderWithKaTeX(elements, katex) {
elements.each(function katexElementsLoop() {
const mathNode = $('<span></span>');
const $this = $(this);
......@@ -34,30 +28,10 @@ function renderWithKaTeX(elements) {
export default function renderMath($els) {
if (!$els.length) return;
if (katexLoaded) {
renderWithKaTeX($els);
} else {
axios.get(gon.katex_css_url)
.then(() => {
const css = $('<link>', {
rel: 'stylesheet',
type: 'text/css',
href: gon.katex_css_url,
});
css.appendTo('head');
})
.then(() => axios.get(gon.katex_js_url, {
responseType: 'text',
}))
.then(({ data }) => {
// Add katex js to our document
$.globalEval(data);
})
.then(() => {
katexLoaded = true;
renderWithKaTeX($els); // Run KaTeX
})
.catch(() => flash(__('An error occurred while rendering KaTeX')));
}
Promise.all([
import(/* webpackChunkName: 'katex' */ 'katex'),
import(/* webpackChunkName: 'katex' */ 'katex/dist/katex.css'),
]).then(([katex]) => {
renderWithKaTeX($els, katex);
}).catch(() => flash(__('An error occurred while rendering KaTeX')));
}
app/assets/javascripts/render_mermaid.js
View file @ 13380b16
......@@ -30,6 +30,9 @@ export default function renderMermaid($els) {
$els.each((i, el) => {
const source = el.textContent;
// Remove any extra spans added by the backend syntax highlighting.
Object.assign(el, { textContent: source });
mermaid.init(undefined, el, (id) => {
const svg = document.getElementById(id);
......
app/assets/javascripts/sidebar/components/time_tracking/sidebar_time_tracking.js
View file @ 13380b16
......@@ -2,7 +2,7 @@ import _ from 'underscore';
import '~/smart_interval';
import timeTracker from './time_tracker';
import IssuableTimeTracker from './time_tracker.vue';
import Store from '../../stores/sidebar_store';
import Mediator from '../../sidebar_mediator';
......@@ -16,7 +16,7 @@ export default {
};
},
components: {
'issuable-time-tracker': timeTracker,
IssuableTimeTracker,
},
methods: {
listenForQuickActions() {
......
app/assets/javascripts/sidebar/components/time_tracking/time_tracker.js → app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue
View file @ 13380b16
<script>
import timeTrackingHelpState from './help_state';
import timeTrackingCollapsedState from './collapsed_state';
import timeTrackingSpentOnlyPane from './spent_only_pane';
......@@ -8,7 +9,15 @@ import timeTrackingComparisonPane from './comparison_pane';
import eventHub from '../../event_hub';
export default {
name: 'issuable-time-tracker',
name: 'IssuableTimeTracker',
components: {
'time-tracking-collapsed-state': timeTrackingCollapsedState,
'time-tracking-estimate-only-pane': timeTrackingEstimateOnlyPane,
'time-tracking-spent-only-pane': timeTrackingSpentOnlyPane,
'time-tracking-no-tracking-pane': timeTrackingNoTrackingPane,
'time-tracking-comparison-pane': timeTrackingComparisonPane,
'time-tracking-help-state': timeTrackingHelpState,
},
props: {
time_estimate: {
type: Number,
......@@ -38,14 +47,6 @@ export default {
showHelp: false,
};
},
components: {
'time-tracking-collapsed-state': timeTrackingCollapsedState,
'time-tracking-estimate-only-pane': timeTrackingEstimateOnlyPane,
'time-tracking-spent-only-pane': timeTrackingSpentOnlyPane,
'time-tracking-no-tracking-pane': timeTrackingNoTrackingPane,
'time-tracking-comparison-pane': timeTrackingComparisonPane,
'time-tracking-help-state': timeTrackingHelpState,
},
computed: {
timeSpent() {
return this.time_spent;
......@@ -81,6 +82,9 @@ export default {
return !!this.showHelp;
},
},
created() {
eventHub.$on('timeTracker:updateData', this.update);
},
methods: {
toggleHelpState(show) {
this.showHelp = show;
......@@ -92,72 +96,73 @@ export default {
this.human_time_spent = data.human_time_spent;
},
},
created() {
eventHub.$on('timeTracker:updateData', this.update);
},
template: `
<div
class="time_tracker time-tracking-component-wrap"
v-cloak
>
<time-tracking-collapsed-state
:show-comparison-state="showComparisonState"
:show-no-time-tracking-state="showNoTimeTrackingState"
:show-help-state="showHelpState"
:show-spent-only-state="showSpentOnlyState"
:show-estimate-only-state="showEstimateOnlyState"
};
</script>
<template>
<div
class="time_tracker time-tracking-component-wrap"
v-cloak
>
<time-tracking-collapsed-state
:show-comparison-state="showComparisonState"
:show-no-time-tracking-state="showNoTimeTrackingState"
:show-help-state="showHelpState"
:show-spent-only-state="showSpentOnlyState"
:show-estimate-only-state="showEstimateOnlyState"
:time-spent-human-readable="timeSpentHumanReadable"
:time-estimate-human-readable="timeEstimateHumanReadable"
/>
<div class="title hide-collapsed">
{{ __('Time tracking') }}
<div
class="help-button pull-right"
v-if="!showHelpState"
@click="toggleHelpState(true)"
>
<i
class="fa fa-question-circle"
aria-hidden="true"
>
</i>
</div>
<div
class="close-help-button pull-right"
v-if="showHelpState"
@click="toggleHelpState(false)"
>
<i
class="fa fa-close"
aria-hidden="true"
>
</i>
</div>
</div>
<div class="time-tracking-content hide-collapsed">
<time-tracking-estimate-only-pane
v-if="showEstimateOnlyState"
:time-estimate-human-readable="timeEstimateHumanReadable"
/>
<time-tracking-spent-only-pane
v-if="showSpentOnlyState"
:time-spent-human-readable="timeSpentHumanReadable"
/>
<time-tracking-no-tracking-pane
v-if="showNoTimeTrackingState"
/>
<time-tracking-comparison-pane
v-if="showComparisonState"
:time-estimate="timeEstimate"
:time-spent="timeSpent"
:time-spent-human-readable="timeSpentHumanReadable"
:time-estimate-human-readable="timeEstimateHumanReadable"
/>
<div class="title hide-collapsed">
{{ __('Time tracking') }}
<div
class="help-button pull-right"
v-if="!showHelpState"
@click="toggleHelpState(true)"
>
<i
class="fa fa-question-circle"
aria-hidden="true"
/>
</div>
<div
class="close-help-button pull-right"
<transition name="help-state-toggle">
<time-tracking-help-state
v-if="showHelpState"
@click="toggleHelpState(false)"
>
<i
class="fa fa-close"
aria-hidden="true"
/>
</div>
</div>
<div class="time-tracking-content hide-collapsed">
<time-tracking-estimate-only-pane
v-if="showEstimateOnlyState"
:time-estimate-human-readable="timeEstimateHumanReadable"
:root-path="rootPath"
/>
<time-tracking-spent-only-pane
v-if="showSpentOnlyState"
:time-spent-human-readable="timeSpentHumanReadable"
/>
<time-tracking-no-tracking-pane
v-if="showNoTimeTrackingState"
/>
<time-tracking-comparison-pane
v-if="showComparisonState"
:time-estimate="timeEstimate"
:time-spent="timeSpent"
:time-spent-human-readable="timeSpentHumanReadable"
:time-estimate-human-readable="timeEstimateHumanReadable"
/>
<transition name="help-state-toggle">
<time-tracking-help-state
v-if="showHelpState"
:rootPath="rootPath"
/>
</transition>
</div>
</transition>
</div>
`,
};
</div>
</template>
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_missing_branch.js deleted 100644 → 0
View file @ e70bef40
import statusIcon from '../mr_widget_status_icon.vue';
import tooltip from '../../../vue_shared/directives/tooltip';
import mrWidgetMergeHelp from '../../components/mr_widget_merge_help.vue';
export default {
name: 'MRWidgetMissingBranch',
props: {
mr: { type: Object, required: true },
},
directives: {
tooltip,
},
components: {
'mr-widget-merge-help': mrWidgetMergeHelp,
statusIcon,
},
computed: {
missingBranchName() {
return this.mr.sourceBranchRemoved ? 'source' : 'target';
},
message() {
return `If the ${this.missingBranchName} branch exists in your local repository, you can merge this merge request manually using the command line`;
},
},
template: `
<div class="mr-widget-body media">
<status-icon status="warning" :show-disabled-button="true" />
<div class="media-body space-children">
<span class="bold js-branch-text">
<span class="capitalize">
{{missingBranchName}}
</span> branch does not exist.
Please restore it or use a different {{missingBranchName}} branch
<i
v-tooltip
class="fa fa-question-circle"
:title="message"
:aria-label="message"></i>
</span>
</div>
</div>
`,
};
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_missing_branch.vue 0 → 100644
View file @ 13380b16
<script>
import { sprintf, s__ } from '~/locale';
import tooltip from '~/vue_shared/directives/tooltip';
import statusIcon from '../mr_widget_status_icon.vue';
import mrWidgetMergeHelp from '../../components/mr_widget_merge_help.vue';
export default {
name: 'MRWidgetMissingBranch',
directives: {
tooltip,
},
components: {
mrWidgetMergeHelp,
statusIcon,
},
props: {
mr: {
type: Object,
required: true,
},
},
computed: {
missingBranchName() {
return this.mr.sourceBranchRemoved ? 'source' : 'target';
},
missingBranchNameMessage() {
return sprintf(s__('mrWidget| Please restore it or use a different %{missingBranchName} branch'), {
missingBranchName: this.missingBranchName,
});
},
message() {
return sprintf(s__('mrWidget|If the %{missingBranchName} branch exists in your local repository, you can merge this merge request manually using the command line'), {
missingBranchName: this.missingBranchName,
});
},
},
};
</script>
<template>
<div class="mr-widget-body media">
<status-icon
status="warning"
:show-disabled-button="true"
/>
<div class="media-body space-children">
<span class="bold js-branch-text">
<span class="capitalize">
{{ missingBranchName }}
</span> {{ s__("mrWidget|branch does not exist.") }}
{{ missingBranchNameMessage }}
<i
v-tooltip
class="fa fa-question-circle"
:title="message"
:aria-label="message"
>
</i>
</span>
</div>
</div>
</template>
app/assets/javascripts/vue_merge_request_widget/dependencies.js
View file @ 13380b16
......@@ -24,7 +24,7 @@ export { default as WipState } from './components/states/mr_widget_wip';
export { default as ArchivedState } from './components/states/mr_widget_archived.vue';
export { default as ConflictsState } from './components/states/mr_widget_conflicts.vue';
export { default as NothingToMergeState } from './components/states/mr_widget_nothing_to_merge';
export { default as MissingBranchState } from './components/states/mr_widget_missing_branch';
export { default as MissingBranchState } from './components/states/mr_widget_missing_branch.vue';
export { default as NotAllowedState } from './components/states/mr_widget_not_allowed';
export { default as ReadyToMergeState } from 'ee/vue_merge_request_widget/components/states/mr_widget_ready_to_merge';
export { default as SHAMismatchState } from './components/states/mr_widget_sha_mismatch';
......
app/assets/javascripts/vue_shared/components/confirmation_input.vue deleted 100644 → 0
View file @ e70bef40
<script>
import _ from 'underscore';
import { __, sprintf } from '~/locale';
export default {
props: {
inputId: {
type: String,
required: true,
},
confirmationKey: {
type: String,
required: true,
},
confirmationValue: {
type: String,
required: true,
},
shouldEscapeConfirmationValue: {
type: Boolean,
required: false,
default: true,
},
},
computed: {
inputLabel() {
let value = this.confirmationValue;
if (this.shouldEscapeConfirmationValue) {
value = _.escape(value);
}
return sprintf(
__('Type %{value} to confirm:'),
{ value: `<code>${value}</code>` },
false,
);
},
},
methods: {
hasCorrectValue() {
return this.$refs.enteredValue.value === this.confirmationValue;
},
},
};
</script>
<template>
<div>
<label
v-html="inputLabel"
:for="inputId"
>
</label>
<input
:id="inputId"
:name="confirmationKey"
type="text"
ref="enteredValue"
class="form-control"
/>
</div>
</template>
app/assets/javascripts/vue_shared/components/loading_button.vue
View file @ 13380b16
......@@ -39,7 +39,7 @@
required: false,
},
containerClass: {
type: String,
type: [String, Array, Object],
required: false,
default: 'btn btn-align-content',
},
......
app/assets/stylesheets/framework.scss
View file @ 13380b16
......@@ -20,7 +20,7 @@
@import "framework/flash";
@import "framework/forms";
@import "framework/gfm";
@import "framework/gitlab-theme";
@import "framework/gitlab_theme";
@import "framework/header";
@import "framework/highlight";
@import "framework/issue_box";
......@@ -34,10 +34,10 @@
@import "framework/pagination";
@import "framework/panels";
@import "framework/popup";
@import "framework/secondary-navigation-elements";
@import "framework/secondary_navigation_elements";
@import "framework/selects";
@import "framework/sidebar";
@import "framework/contextual-sidebar";
@import "framework/contextual_sidebar";
@import "framework/tables";
@import "framework/notes";
@import "framework/tabs";
......@@ -48,17 +48,17 @@
@import "framework/zen";
@import "framework/blank";
@import "framework/wells";
@import "framework/page-header";
@import "framework/page_header";
@import "framework/awards";
@import "framework/images";
@import "framework/broadcast-messages";
@import "framework/broadcast_messages";
@import "framework/emojis";
@import "framework/emoji-sprites";
@import "framework/emoji_sprites";
@import "framework/icons";
@import "framework/snippets";
@import "framework/memory_graph";
@import "framework/responsive_tables";
@import "framework/stacked-progress-bar";
@import "framework/stacked_progress_bar";
@import "framework/sortable";
@import "framework/ci_variable_list";
@import "framework/feature_highlight";
app/assets/stylesheets/framework/common.scss
View file @ 13380b16
......@@ -457,9 +457,11 @@ img.emoji {
.prepend-top-10 { margin-top: 10px; }
.prepend-top-15 { margin-top: 15px; }
.prepend-top-default { margin-top: $gl-padding !important; }
.prepend-top-16 { margin-top: 16px; }
.prepend-top-20 { margin-top: 20px; }
.prepend-left-4 { margin-left: 4px; }
.prepend-left-5 { margin-left: 5px; }
.prepend-left-8 { margin-left: 8px; }
.prepend-left-10 { margin-left: 10px; }
.prepend-left-15 { margin-left: 15px; }
.prepend-left-default { margin-left: $gl-padding; }
......
app/assets/stylesheets/framework/dropdowns.scss
View file @ 13380b16
......@@ -736,10 +736,6 @@
}
}
.droplab-item-ignore {
pointer-events: none;
}
.pika-single.animate-picker.is-bound,
.pika-single.animate-picker.is-bound.is-hidden {
/*
......
app/assets/stylesheets/framework/forms.scss
View file @ 13380b16
......@@ -182,6 +182,7 @@ label {
.help-block {
margin-bottom: 0;
margin-top: #{$grid-size / 2};
}
.gl-field-error {
......
app/assets/stylesheets/pages/environments.scss
View file @ 13380b16
......@@ -121,6 +121,10 @@
width: 100%;
text-align: left;
}
.environment-child-row {
padding-left: 20px;
}
}
}
......
app/assets/stylesheets/pages/issues.scss
View file @ 13380b16
......@@ -201,11 +201,6 @@ ul.related-merge-requests > li {
}
.create-mr-dropdown-wrap {
.branch-message,
.ref-message {
display: none;
}
.ref::selection {
color: $placeholder-text-color;
}
......@@ -236,6 +231,17 @@ ul.related-merge-requests > li {
transform: translateY(0);
display: none;
margin-top: 4px;
// override dropdown item styles
.btn.btn-success {
@include btn-default;
@include btn-green;
border-style: solid;
border-width: 1px;
line-height: $line-height-base;
width: auto;
}
}
.create-merge-request-dropdown-toggle {
......@@ -245,66 +251,6 @@ ul.related-merge-requests > li {
margin-left: 0;
}
}
.droplab-item-ignore {
pointer-events: auto;
}
.create-item {
cursor: pointer;
margin: 0 1px;
&:hover,
&:focus {
background-color: $dropdown-item-hover-bg;
color: $gl-text-color;
}
}
li.divider {
margin: 8px 10px;
}
li:not(.divider) {
padding: 8px 9px;
&:last-child {
padding-bottom: 8px;
}
&.droplab-item-selected {
.icon-container {
i {
visibility: visible;
}
}
.description {
display: block;
}
}
&.droplab-item-ignore {
padding-top: 8px;
}
.icon-container {
float: left;
i {
visibility: hidden;
}
}
.description {
padding-left: 22px;
}
input,
span {
margin: 4px 0 0;
}
}
}
.discussion-reply-holder .note-edit-form {
......
app/assets/stylesheets/pages/repo.scss
View file @ 13380b16
......@@ -50,13 +50,6 @@
text-overflow: ellipsis;
}
.unsaved-icon {
color: $indigo-700;
float: right;
font-size: smaller;
line-height: 20px;
}
.repo-new-btn {
display: none;
margin-top: -4px;
......@@ -67,10 +60,6 @@
.repo-new-btn {
display: block;
}
.unsaved-icon {
display: none;
}
}
&.folder {
......
app/controllers/import/base_controller.rb
View file @ 13380b16
......@@ -2,26 +2,16 @@ class Import::BaseController < ApplicationController
private
def find_or_create_namespace(names, owner)
return current_user.namespace if names == owner
return current_user.namespace unless current_user.can_create_group?
names = params[:target_namespace].presence || names
full_path_namespace = Namespace.find_by_full_path(names)
return full_path_namespace if full_path_namespace
return current_user.namespace if names == owner
group = Groups::NestedCreateService.new(current_user, group_path: names).execute
names.split('/').inject(nil) do |parent, name|
begin
namespace = Group.create!(name: name,
path: name,
owner: current_user,
parent: parent)
namespace.add_owner(current_user)
group.errors.any? ? current_user.namespace : group
rescue => e
Gitlab::AppLogger.error(e)
namespace
rescue ActiveRecord::RecordNotUnique, ActiveRecord::RecordInvalid
Namespace.where(parent: parent).find_by_path_or_name(name)
end
end
current_user.namespace
end
end
app/controllers/import/bitbucket_controller.rb
View file @ 13380b16
......@@ -37,24 +37,30 @@ class Import::BitbucketController < Import::BaseController
def create
bitbucket_client = Bitbucket::Client.new(credentials)
@repo_id = params[:repo_id].to_s
name = @repo_id.gsub('___', '/')
repo_id = params[:repo_id].to_s
name = repo_id.gsub('___', '/')
repo = bitbucket_client.repo(name)
@project_name = params[:new_name].presence || repo.name
project_name = params[:new_name].presence || repo.name
repo_owner = repo.owner
repo_owner = current_user.username if repo_owner == bitbucket_client.user.username
namespace_path = params[:new_namespace].presence || repo_owner
target_namespace = find_or_create_namespace(namespace_path, current_user)
@target_namespace = find_or_create_namespace(namespace_path, current_user)
if current_user.can?(:create_projects, @target_namespace)
if current_user.can?(:create_projects, target_namespace)
# The token in a session can be expired, we need to get most recent one because
# Bitbucket::Connection class refreshes it.
session[:bitbucket_token] = bitbucket_client.connection.token
@project = Gitlab::BitbucketImport::ProjectCreator.new(repo, @project_name, @target_namespace, current_user, credentials).execute
project = Gitlab::BitbucketImport::ProjectCreator.new(repo, project_name, target_namespace, current_user, credentials).execute
if project.persisted?
render json: ProjectSerializer.new.represent(project)
else
render json: { errors: project.errors.full_messages }, status: :unprocessable_entity
end
else
render 'unauthorized'
render json: { errors: 'This namespace has already been taken! Please choose another one.' }, status: :unprocessable_entity
end
end
......
app/controllers/import/fogbugz_controller.rb
View file @ 13380b16
......@@ -58,17 +58,17 @@ class Import::FogbugzController < Import::BaseController
end
def create
@repo_id = params[:repo_id]
repo = client.repo(@repo_id)
repo = client.repo(params[:repo_id])
fb_session = { uri: session[:fogbugz_uri], token: session[:fogbugz_token] }
@target_namespace = current_user.namespace
@project_name = repo.name
namespace = @target_namespace
umap = session[:fogbugz_user_map] || client.user_map
@project = Gitlab::FogbugzImport::ProjectCreator.new(repo, fb_session, namespace, current_user, umap).execute
project = Gitlab::FogbugzImport::ProjectCreator.new(repo, fb_session, current_user.namespace, current_user, umap).execute
if project.persisted?
render json: ProjectSerializer.new.represent(project)
else
render json: { errors: project.errors.full_messages }, status: :unprocessable_entity
end
end
private
......
app/controllers/import/github_controller.rb
View file @ 13380b16
......@@ -36,16 +36,21 @@ class Import::GithubController < Import::BaseController
end
def create
@repo_id = params[:repo_id].to_i
repo = client.repo(@repo_id)
@project_name = params[:new_name].presence || repo.name
repo = client.repo(params[:repo_id].to_i)
project_name = params[:new_name].presence || repo.name
namespace_path = params[:target_namespace].presence || current_user.namespace_path
@target_namespace = find_or_create_namespace(namespace_path, current_user.namespace_path)
target_namespace = find_or_create_namespace(namespace_path, current_user.namespace_path)
if can?(current_user, :create_projects, @target_namespace)
@project = Gitlab::LegacyGithubImport::ProjectCreator.new(repo, @project_name, @target_namespace, current_user, access_params, type: provider).execute
if can?(current_user, :create_projects, target_namespace)
project = Gitlab::LegacyGithubImport::ProjectCreator.new(repo, project_name, target_namespace, current_user, access_params, type: provider).execute
if project.persisted?
render json: ProjectSerializer.new.represent(project)
else
render json: { errors: project.errors.full_messages }, status: :unprocessable_entity
end
else
render 'unauthorized'
render json: { errors: 'This namespace has already been taken! Please choose another one.' }, status: :unprocessable_entity
end
end
......
app/controllers/import/gitlab_controller.rb
View file @ 13380b16
......@@ -24,15 +24,19 @@ class Import::GitlabController < Import::BaseController
end
def create
@repo_id = params[:repo_id].to_i
repo = client.project(@repo_id)
@project_name = repo['name']
@target_namespace = find_or_create_namespace(repo['namespace']['path'], client.user['username'])
repo = client.project(params[:repo_id].to_i)
target_namespace = find_or_create_namespace(repo['namespace']['path'], client.user['username'])
if current_user.can?(:create_projects, @target_namespace)
@project = Gitlab::GitlabImport::ProjectCreator.new(repo, @target_namespace, current_user, access_params).execute
if current_user.can?(:create_projects, target_namespace)
project = Gitlab::GitlabImport::ProjectCreator.new(repo, target_namespace, current_user, access_params).execute
if project.persisted?
render json: ProjectSerializer.new.represent(project)
else
render json: { errors: project.errors.full_messages }, status: :unprocessable_entity
end
else
render 'unauthorized'
render json: { errors: 'This namespace has already been taken! Please choose another one.' }, status: :unprocessable_entity
end
end
......
app/controllers/import/google_code_controller.rb
View file @ 13380b16
......@@ -85,16 +85,16 @@ class Import::GoogleCodeController < Import::BaseController
end
def create
@repo_id = params[:repo_id]
repo = client.repo(@repo_id)
@target_namespace = current_user.namespace
@project_name = repo.name
namespace = @target_namespace
repo = client.repo(params[:repo_id])
user_map = session[:google_code_user_map]
@project = Gitlab::GoogleCodeImport::ProjectCreator.new(repo, namespace, current_user, user_map).execute
project = Gitlab::GoogleCodeImport::ProjectCreator.new(repo, current_user.namespace, current_user, user_map).execute
if project.persisted?
render json: ProjectSerializer.new.represent(project)
else
render json: { errors: project.errors.full_messages }, status: :unprocessable_entity
end
end
private
......
app/finders/snippets_finder.rb
View file @ 13380b16
# Snippets Finder
#
# Used to filter Snippets collections by a set of params
#
# Arguments.
#
# current_user - The current user, nil also can be used.
# params:
# visibility (integer) - Individual snippet visibility: Public(20), internal(10) or private(0).
# project (Project) - Project related.
# author (User) - Author related.
#
# params are optional
class SnippetsFinder < UnionFinder
attr_accessor :current_user, :params
include Gitlab::Allowable
attr_accessor :current_user, :params, :project
def initialize(current_user, params = {})
@current_user = current_user
@params = params
@project = params[:project]
end
def execute
items = init_collection
items = by_project(items)
items = by_author(items)
items = by_visibility(items)
......@@ -18,25 +32,42 @@ class SnippetsFinder < UnionFinder
private
def init_collection
items = Snippet.all
if project.present?
authorized_snippets_from_project
else
authorized_snippets
end
end
accessible(items)
def authorized_snippets_from_project
if can?(current_user, :read_project_snippet, project)
if project.team.member?(current_user)
project.snippets
else
project.snippets.public_to_user(current_user)
end
else
Snippet.none
end
end
def accessible(items)
segments = []
segments << items.public_to_user(current_user)
segments << authorized_to_user(items) if current_user
def authorized_snippets
Snippet.where(feature_available_projects.or(not_project_related)).public_or_visible_to_user(current_user)
end
find_union(segments, Snippet.includes(:author))
def feature_available_projects
projects = Project.public_or_visible_to_user(current_user)
.with_feature_available_for_user(:snippets, current_user).select(:id)
arel_query = Arel::Nodes::SqlLiteral.new(projects.to_sql)
table[:project_id].in(arel_query)
end
def authorized_to_user(items)
items.where(
'author_id = :author_id
OR project_id IN (:project_ids)',
author_id: current_user.id,
project_ids: current_user.authorized_projects.select(:id))
def not_project_related
table[:project_id].eq(nil)
end
def table
Snippet.arel_table
end
def by_visibility(items)
......@@ -53,12 +84,6 @@ class SnippetsFinder < UnionFinder
items.where(author_id: params[:author].id)
end
def by_project(items)
return items unless params[:project]
items.where(project_id: params[:project].id)
end
def visibility_from_scope
case params[:scope].to_s
when 'are_private'
......
app/models/key.rb
View file @ 13380b16
......@@ -36,8 +36,9 @@ class Key < ActiveRecord::Base
after_destroy :refresh_user_cache
def key=(value)
write_attribute(:key, value.present? ? Gitlab::SSHPublicKey.sanitize(value) : nil)
value&.delete!("\n\r")
value.strip! unless value.blank?
write_attribute(:key, value)
@public_key = nil
end
......@@ -99,7 +100,7 @@ class Key < ActiveRecord::Base
def generate_fingerprint
self.fingerprint = nil
return unless public_key.valid?
return unless self.key.present?
self.fingerprint = public_key.fingerprint
end
......
app/models/project.rb
View file @ 13380b16
......@@ -1603,8 +1603,11 @@ class Project < ActiveRecord::Base
end
def protected_for?(ref)
ProtectedBranch.protected?(self, ref) ||
if repository.branch_exists?(ref)
ProtectedBranch.protected?(self, ref)
elsif repository.tag_exists?(ref)
ProtectedTag.protected?(self, ref)
end
end
def deployment_variables(environment: nil)
......
app/models/snippet.rb
View file @ 13380b16
......@@ -75,6 +75,27 @@ class Snippet < ActiveRecord::Base
@link_reference_pattern ||= super("snippets", /(?<snippet>\d+)/)
end
# Returns a collection of snippets that are either public or visible to the
# logged in user.
#
# This method does not verify the user actually has the access to the project
# the snippet is in, so it should be only used on a relation that's already scoped
# for project access
def self.public_or_visible_to_user(user = nil)
if user
authorized = user
.project_authorizations
.select(1)
.where('project_authorizations.project_id = snippets.project_id')
levels = Gitlab::VisibilityLevel.levels_for_user(user)
where('EXISTS (?) OR snippets.visibility_level IN (?) or snippets.author_id = (?)', authorized, levels, user.id)
else
public_to_user
end
end
def to_reference(from = nil, full: false)
reference = "#{self.class.reference_prefix}#{id}"
......
app/models/user.rb
View file @ 13380b16
......@@ -569,7 +569,7 @@ class User < ActiveRecord::Base
gpg_keys.each(&:update_invalid_gpg_signatures)
end
# Returns the groups a user has access to
# Returns the groups a user has access to, either through a membership or a project authorization
def authorized_groups
union = Gitlab::SQL::Union
.new([groups.select(:id), authorized_projects.select(:namespace_id)])
......@@ -577,6 +577,11 @@ class User < ActiveRecord::Base
Group.where("namespaces.id IN (#{union.to_sql})") # rubocop:disable GitlabSecurity/SqlInjection
end
# Returns the groups a user is a member of, either directly or through a parent group
def membership_groups
Gitlab::GroupHierarchy.new(groups).base_and_descendants
end
# Returns a relation of groups the user has access to, including their parent
# and child groups (recursively).
def all_expanded_groups
......
app/policies/project_policy.rb
View file @ 13380b16
......@@ -122,7 +122,6 @@ class ProjectPolicy < BasePolicy
enable :create_note
enable :upload_file
enable :read_cycle_analytics
enable :read_project_snippet
end
rule { can?(:reporter_access) }.policy do
......
app/serializers/project_serializer.rb 0 → 100644
View file @ 13380b16
class ProjectSerializer < BaseSerializer
entity ProjectEntity
end
app/services/groups/nested_create_service.rb
View file @ 13380b16
......@@ -11,8 +11,8 @@ module Groups
def execute
return nil unless group_path
if group = Group.find_by_full_path(group_path)
return group
if namespace = namespace_or_group(group_path)
return namespace
end
if group_path.include?('/') && !Group.supports_nested_groups?
......@@ -40,10 +40,14 @@ module Groups
)
new_params[:visibility_level] ||= Gitlab::CurrentSettings.current_application_settings.default_group_visibility
last_group = Group.find_by_full_path(partial_path) || Groups::CreateService.new(current_user, new_params).execute
last_group = namespace_or_group(partial_path) || Groups::CreateService.new(current_user, new_params).execute
end
last_group
end
def namespace_or_group(group_path)
Namespace.find_by_full_path(group_path)
end
end
end
app/services/merge_requests/build_service.rb
View file @ 13380b16
......@@ -161,10 +161,12 @@ module MergeRequests
merge_request.title = "Resolve \"#{issue.title}\"" if issue.is_a?(Issue)
unless merge_request.title
branch_title = source_branch.downcase.remove(issue_iid.downcase).titleize.humanize
return if merge_request.title.present?
if issue_iid.present?
merge_request.title = "Resolve #{issue_iid}"
merge_request.title += " \"#{branch_title}\"" unless branch_title.empty?
branch_title = source_branch.downcase.remove(issue_iid.downcase).titleize.humanize
merge_request.title += " \"#{branch_title}\"" if branch_title.present?
end
end
......
app/views/ci/lints/show.html.haml
View file @ 13380b16
......@@ -18,6 +18,8 @@
.col-sm-12
.pull-left.prepend-top-10
= submit_tag('Validate', class: 'btn btn-success submit-yml')
.pull-right.prepend-top-10
= button_tag('Clear', type: 'button', class: 'btn btn-default clear-yml')
.row.prepend-top-20
.col-sm-12
......
app/views/ci/variables/_variable_row.html.haml
View file @ 13380b16
......@@ -5,7 +5,7 @@
- id = variable&.id
- key = variable&.key
- value = variable&.value
- is_protected = variable && !only_key_value ? variable.protected : true
- is_protected = variable && !only_key_value ? variable.protected : false
- id_input_name = "#{form_field}[variables_attributes][][id]"
- destroy_input_name = "#{form_field}[variables_attributes][][_destroy]"
......
app/views/groups/labels/new.html.haml
View file @ 13380b16
- breadcrumb_title "Labels"
- page_title 'New Label'
- header_title group_title(@group, 'Labels', group_labels_path(@group))
%h3.page-title
New Label
......
app/views/import/base/create.js.haml deleted 100644 → 0
View file @ e70bef40
- if @project.persisted?
:plain
job = $("tr#repo_#{@repo_id}")
job.attr("id", "project_#{@project.id}")
target_field = job.find(".import-target")
target_field.empty()
target_field.append('#{link_to @project.full_path, project_path(@project)}')
$("table.import-jobs tbody").prepend(job)
job.addClass("active").find(".import-actions").html("<i class='fa fa-spinner fa-spin'></i> started")
- else
:plain
job = $("tr#repo_#{@repo_id}")
job.find(".import-actions").html("<i class='fa fa-exclamation-circle'></i> Error saving project: #{escape_javascript(h(@project.errors.full_messages.join(',')))}")
app/views/import/base/unauthorized.js.haml deleted 100644 → 0
View file @ e70bef40
:plain
tr = $("tr#repo_#{@repo_id}")
target_field = tr.find(".import-target")
import_button = tr.find(".btn-import")
origin_target = target_field.text()
project_name = "#{@project_name}"
origin_namespace = "#{@target_namespace.full_path}"
target_field.empty()
target_field.append("<p class='alert alert-danger'>This namespace has already been taken! Please choose another one.</p>")
target_field.append("<input type='text' name='target_namespace' />")
target_field.append("/" + project_name)
target_field.data("project_name", project_name)
target_field.find('input').prop("value", origin_namespace)
import_button.enable().removeClass('is-loading')
app/views/projects/commits/_commit.html.haml
View file @ 13380b16
......@@ -58,7 +58,7 @@
- if commit.status(ref)
= render_commit_status(commit, ref: ref)
#commit-pipeline-status{ data: { endpoint: pipelines_project_commit_path(project, commit.id) } }
.js-commit-pipeline-status{ data: { endpoint: pipelines_project_commit_path(project, commit.id) } }
= link_to commit.short_id, link, class: "commit-sha btn btn-transparent btn-link"
= clipboard_button(text: commit.id, title: _("Copy commit SHA to clipboard"))
= link_to_browse_code(project, commit)
......
app/views/projects/issues/_discussion.html.haml
View file @ 13380b16
......@@ -12,6 +12,8 @@
markdown_docs_path: help_page_path('user/markdown'),
quick_actions_docs_path: help_page_path('user/project/quick_actions'),
notes_path: notes_url,
close_issue_path: issue_path(@issue, issue: { state_event: :close }, format: 'json'),
reopen_issue_path: issue_path(@issue, issue: { state_event: :reopen }, format: 'json'),
last_fetched_at: Time.now.to_i,
noteable_data: serialize_issuable(@issue),
current_user_data: UserSerializer.new.represent(current_user, only_path: true).to_json } }
app/views/projects/issues/_new_branch.html.haml
View file @ 13380b16
......@@ -21,30 +21,33 @@
%button.btn.create-merge-request-dropdown-toggle.dropdown-toggle.btn-success.btn-inverted.js-dropdown-toggle{ type: 'button', data: { dropdown: { trigger: '#create-merge-request-dropdown' } } }
= icon('caret-down')
%ul#create-merge-request-dropdown.create-merge-request-dropdown-menu.dropdown-menu.dropdown-menu-align-right.gl-show-field-errors{ data: { dropdown: true } }
- if can_create_merge_request
%li.create-item.droplab-item-selected.droplab-item-ignore-hiding{ role: 'button', data: { value: 'create-mr', text: 'Create merge request' } }
.menu-item.droplab-item-ignore-hiding
.icon-container.droplab-item-ignore-hiding= icon('check')
.description.droplab-item-ignore-hiding Create merge request and branch
%li.create-item.droplab-item-ignore-hiding{ class: [!can_create_merge_request && 'droplab-item-selected'], role: 'button', data: { value: 'create-branch', text: 'Create branch' } }
.menu-item.droplab-item-ignore-hiding
.icon-container.droplab-item-ignore-hiding= icon('check')
.description.droplab-item-ignore-hiding Create branch
%li.divider
%li.droplab-item-ignore
Branch name
%input.js-branch-name.form-control.droplab-item-ignore{ type: 'text', placeholder: "#{@issue.to_branch_name}", value: "#{@issue.to_branch_name}" }
%span.js-branch-message.branch-message.droplab-item-ignore
%li.droplab-item-ignore
Source (branch or tag)
%input.js-ref.ref.form-control.droplab-item-ignore{ type: 'text', placeholder: "#{@project.default_branch}", value: "#{@project.default_branch}", data: { value: "#{@project.default_branch}" } }
%span.js-ref-message.ref-message.droplab-item-ignore
%li.droplab-item-ignore
%button.btn.btn-success.js-create-target.droplab-item-ignore{ type: 'button', data: { action: 'create-mr' } }
Create merge request
.droplab-dropdown
%ul#create-merge-request-dropdown.create-merge-request-dropdown-menu.dropdown-menu.dropdown-menu-align-right.gl-show-field-errors{ data: { dropdown: true } }
- if can_create_merge_request
%li.droplab-item-selected{ role: 'button', data: { value: 'create-mr', text: _('Create merge request') } }
.menu-item
= icon('check', class: 'icon')
= _('Create merge request and branch')
%li{ class: [!can_create_merge_request && 'droplab-item-selected'], role: 'button', data: { value: 'create-branch', text: _('Create branch') } }
.menu-item
= icon('check', class: 'icon')
= _('Create branch')
%li.divider.droplab-item-ignore
%li.droplab-item-ignore.prepend-left-8.append-right-8.prepend-top-16
.form-group
%label{ for: 'new-branch-name' }
= _('Branch name')
%input#new-branch-name.js-branch-name.form-control{ type: 'text', placeholder: "#{@issue.to_branch_name}", value: "#{@issue.to_branch_name}" }
%span.js-branch-message.help-block
.form-group
%label{ for: 'source-name' }
= _('Source (branch or tag)')
%input#source-name.js-ref.ref.form-control{ type: 'text', placeholder: "#{@project.default_branch}", value: "#{@project.default_branch}", data: { value: "#{@project.default_branch}" } }
%span.js-ref-message.help-block
.form-group
%button.btn.btn-success.js-create-target{ type: 'button', data: { action: 'create-mr' } }
= _('Create merge request')
app/views/projects/milestones/show.html.haml
View file @ 13380b16
......@@ -27,7 +27,7 @@
Edit
- if @project.group
= link_to promote_project_milestone_path(@milestone.project, @milestone), title: "Promote to Group Milestone", class: 'btn btn-grouped', data: { confirm: "You are about to promote #{@milestone.title} to a group level. This will make this milestone available to all projects inside #{@project.group.name}. The existing project milestone will be merged into the group level. This action cannot be reversed.", toggle: "tooltip" }, method: :post do
= link_to promote_project_milestone_path(@milestone.project, @milestone), title: "Promote to Group Milestone", class: 'btn btn-grouped', data: { confirm: "Promoting #{@milestone.title} will make it available for all projects inside #{@project.group.name}. Existing project milestones with the same name will be merged. This action cannot be reversed.", toggle: "tooltip" }, method: :post do
Promote
- if @milestone.active?
......
app/views/shared/_label.html.haml
View file @ 13380b16
......@@ -48,7 +48,7 @@
.pull-right.hidden-xs.hidden-sm
- if label.is_a?(ProjectLabel) && label.project.group && can?(current_user, :admin_label, label.project.group)
= link_to promote_project_label_path(label.project, label), title: "Promote to Group Label", class: 'btn btn-transparent btn-action', data: {confirm: "You are about to promote #{label.title} to a group level. This will make this milestone available to all projects inside #{label.project.group.name}. The existing project label will be merged into the group level. This action cannot be reversed.", toggle: "tooltip"}, method: :post do
= link_to promote_project_label_path(label.project, label), title: "Promote to Group Label", class: 'btn btn-transparent btn-action', data: {confirm: "Promoting #{label.title} will make it available for all projects inside #{label.project.group.name}. Existing project labels with the same name will be merged. This action cannot be reversed.", toggle: "tooltip"}, method: :post do
%span.sr-only Promote to Group
= sprite_icon('level-up')
- if can?(current_user, :admin_label, label)
......
app/views/shared/milestones/_milestone.html.haml
View file @ 13380b16
......@@ -51,7 +51,7 @@
\
- if @project.group
= link_to promote_project_milestone_path(milestone.project, milestone), title: "Promote to Group Milestone", class: 'btn btn-xs btn-grouped', data: { confirm: "You are about to promote #{milestone.title} to a group level. This will make this milestone available to all projects inside #{@project.group.name}. The existing project milestone will be merged into the group level. This action cannot be reversed.", toggle: "tooltip" }, method: :post do
= link_to promote_project_milestone_path(milestone.project, milestone), title: "Promote to Group Milestone", class: 'btn btn-xs btn-grouped', data: { confirm: "Promoting #{milestone.title} will make it available for all projects inside #{@project.group.name}. Existing project milestones with the same name will be merged. This action cannot be reversed.", toggle: "tooltip" }, method: :post do
Promote
= link_to 'Close Milestone', project_milestone_path(@project, milestone, milestone: {state_event: :close }), method: :put, remote: true, class: "btn btn-xs btn-close btn-grouped"
......
app/workers/all_queues.yml
View file @ 13380b16
......@@ -114,12 +114,16 @@
- cronjob:ldap_sync
- cronjob:update_all_mirrors
- geo:geo_base_scheduler
- geo:geo_file_download
- geo:geo_file_removal
- geo:geo_hashed_storage_attachments_migration
- geo:geo_hashed_storage_migration
- geo:geo_project_sync
- geo:geo_rename_repository
- geo:geo_repositories_clean_up
- geo:geo_repository_destroy
- geo:geo_repository_shard_sync
- object_storage_upload
- object_storage:object_storage_background_move
......@@ -130,10 +134,6 @@
- elastic_commit_indexer
- elastic_indexer
- export_csv
- geo_base_scheduler
- geo_file_download
- geo_project_sync
- geo_repository_shard_sync
- ldap_group_sync
- project_update_repository_storage
- rebase
......
changelogs/unreleased-ee/4297-fdw-status.yml 0 → 100644
View file @ 13380b16
---
title: 'Geo: FDW issues are displayed in the Geo Node Admin UI'
merge_request: 4266
author:
type: added
changelogs/unreleased/40552-sanitize-extra-blank-spaces-used-when-uploading-a-ssh-key.yml deleted 100644 → 0
View file @ e70bef40
---
title: Sanitize extra blank spaces used when uploading a SSH key
merge_request: 40552
author:
type: fixed
changelogs/unreleased/42922-environment-name.yml 0 → 100644
View file @ 13380b16
---
title: Adds tooltip in environment names to increase readability
merge_request:
author:
type: fixed
changelogs/unreleased/42923-close-issue.yml 0 → 100644
View file @ 13380b16
---
title: Fix close button on issues not working on mobile
merge_request:
author:
type: fixed
changelogs/unreleased/4826-geo-wikisyncservice-attempts-to-sync-projects.yml 0 → 100644
View file @ 13380b16
---
title: Create empty wiki when import from GitLab and wiki is not there
merge_request:
author:
type: fixed
changelogs/unreleased/docs-update-vue-naming-guidelines.yml 0 → 100644
View file @ 13380b16
---
title: Update vue component naming guidelines
merge_request: 17018
author: George Tsiolis
type: other
changelogs/unreleased/feature-26598-clear-button-ci-lint.yml 0 → 100644
View file @ 13380b16
---
title: Added clear button to ci lint editor
merge_request:
author: Michael Robinson
changelogs/unreleased/feature-oidc-groups-claim.yml 0 → 100644
View file @ 13380b16
This diff is collapsed.
changelogs/unreleased/group-label-page-breadcrumb.yml 0 → 100644
View file @ 13380b16
This diff is collapsed.
changelogs/unreleased/jivl-update-katex.yml 0 → 100644
View file @ 13380b16
This diff is collapsed.
changelogs/unreleased/winh-new-branch-dropdown-style.yml 0 → 100644
View file @ 13380b16
This diff is collapsed.
config/application.rb
View file @ 13380b16
This diff is collapsed.
config/locales/doorkeeper.en.yml
View file @ 13380b16
This diff is collapsed.
config/sidekiq_queues.yml
View file @ 13380b16
This diff is collapsed.
config/webpack.config.js
View file @ 13380b16
This diff is collapsed.
doc/ci/examples/sast.md
View file @ 13380b16
This diff is collapsed.
doc/ci/variables/README.md
View file @ 13380b16
This diff is collapsed.
doc/development/ee_features.md
View file @ 13380b16
This diff is collapsed.
doc/development/fe_guide/style_guide_js.md
View file @ 13380b16
This diff is collapsed.
doc/development/i18n/externalization.md
View file @ 13380b16
This diff is collapsed.
doc/gitlab-geo/README.md
View file @ 13380b16
This diff is collapsed.
doc/gitlab-geo/bring-primary-back.md 0 → 100644
View file @ 13380b16
This diff is collapsed.
doc/gitlab-geo/configuration.md
View file @ 13380b16
This diff is collapsed.
doc/gitlab-geo/database.md
View file @ 13380b16
This diff is collapsed.
doc/install/installation.md
View file @ 13380b16
This diff is collapsed.
doc/integration/openid_connect_provider.md
View file @ 13380b16
This diff is collapsed.
doc/topics/autodevops/index.md
View file @ 13380b16
This diff is collapsed.
doc/update/10.4-to-10.5.md 0 → 100644
View file @ 13380b16
This diff is collapsed.
doc/user/project/issues/index.md
View file @ 13380b16
This diff is collapsed.
doc/user/project/merge_requests/img/approvals_can_override.png 0 → 100644
View file @ 13380b16
This diff is collapsed.
doc/user/project/merge_requests/img/approvals_config_project.png 0 → 100644
View file @ 13380b16
This diff is collapsed.
doc/user/project/merge_requests/img/approvals_mr.png deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
doc/user/project/merge_requests/img/approvals_remove_on_push.png 0 → 100644
View file @ 13380b16
This diff is collapsed.
doc/user/project/merge_requests/img/approve.png 0 → 100644
View file @ 13380b16
This diff is collapsed.
doc/user/project/merge_requests/img/approve_additionally.png 0 → 100644
View file @ 13380b16
This diff is collapsed.
doc/user/project/merge_requests/img/remove_approval.png 0 → 100644
View file @ 13380b16
This diff is collapsed.
doc/user/project/merge_requests/index.md
View file @ 13380b16
This diff is collapsed.
doc/user/project/merge_requests/sast.md
View file @ 13380b16
This diff is collapsed.
doc/user/project/pages/index.md
View file @ 13380b16
This diff is collapsed.
ee/app/assets/javascripts/pages/projects/edit/index.js 0 → 100644
View file @ 13380b16
This diff is collapsed.
ee/app/finders/geo/expire_uploads_finder.rb
View file @ 13380b16
This diff is collapsed.
ee/app/finders/geo/registry_finder.rb
View file @ 13380b16
This diff is collapsed.
ee/app/models/ee/namespace.rb
View file @ 13380b16
This diff is collapsed.
ee/app/models/geo/fdw/ci/job_artifact.rb
View file @ 13380b16
This diff is collapsed.
ee/app/models/geo/fdw/lfs_object.rb
View file @ 13380b16
This diff is collapsed.
ee/app/models/geo/fdw/project.rb
View file @ 13380b16
This diff is collapsed.
ee/app/models/geo/fdw/project_feature.rb
View file @ 13380b16
This diff is collapsed.
ee/app/models/geo/fdw/upload.rb
View file @ 13380b16
This diff is collapsed.
ee/app/models/license.rb
View file @ 13380b16
This diff is collapsed.
ee/app/workers/geo/base_scheduler_worker.rb
View file @ 13380b16
This diff is collapsed.
ee/app/workers/geo/file_download_worker.rb
View file @ 13380b16
This diff is collapsed.
ee/app/workers/geo/project_sync_worker.rb
View file @ 13380b16
This diff is collapsed.
ee/lib/api/ldap.rb
View file @ 13380b16
This diff is collapsed.
ee/lib/ee/api/helpers.rb
View file @ 13380b16
This diff is collapsed.
ee/lib/ee/api/helpers/runner.rb
View file @ 13380b16
This diff is collapsed.
ee/lib/ee/ci/api/helpers.rb deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
ee/lib/gitlab/geo.rb
View file @ 13380b16
This diff is collapsed.
ee/lib/gitlab/geo/fdw.rb 0 → 100644
View file @ 13380b16
This diff is collapsed.
ee/lib/gitlab/geo/geo_tasks.rb
View file @ 13380b16
This diff is collapsed.
ee/lib/gitlab/geo/health_check.rb
View file @ 13380b16
This diff is collapsed.
ee/lib/system_check/geo/fdw_enabled_check.rb 0 → 100644
View file @ 13380b16
This diff is collapsed.
ee/lib/system_check/geo/fdw_schema_up_to_date_check.rb 0 → 100644
View file @ 13380b16
This diff is collapsed.
ee/lib/tasks/geo.rake
View file @ 13380b16
This diff is collapsed.
ee/spec/features/profiles/pipeline_quota_spec.rb 0 → 100644
View file @ 13380b16
This diff is collapsed.
features/support/env.rb
View file @ 13380b16
This diff is collapsed.
lib/api/search.rb
View file @ 13380b16
This diff is collapsed.
lib/api/todos.rb
View file @ 13380b16
This diff is collapsed.
lib/api/v3/todos.rb
View file @ 13380b16
This diff is collapsed.
lib/gitlab/encoding_helper.rb
View file @ 13380b16
This diff is collapsed.
lib/gitlab/git/repository.rb
View file @ 13380b16
This diff is collapsed.
lib/gitlab/gon_helper.rb
View file @ 13380b16
This diff is collapsed.
lib/gitlab/import_export/importer.rb
View file @ 13380b16
This diff is collapsed.
lib/gitlab/import_export/wiki_restorer.rb 0 → 100644
View file @ 13380b16
This diff is collapsed.
lib/gitlab/middleware/multipart.rb
View file @ 13380b16
This diff is collapsed.
lib/gitlab/query_limiting.rb
View file @ 13380b16
This diff is collapsed.
lib/gitlab/ssh_public_key.rb
View file @ 13380b16
This diff is collapsed.
lib/tasks/flay.rake
View file @ 13380b16
This diff is collapsed.
lib/tasks/gemojione.rake
View file @ 13380b16
This diff is collapsed.
lib/tasks/gitlab/check.rake
View file @ 13380b16
This diff is collapsed.
locale/bg/gitlab.po
View file @ 13380b16
This diff is collapsed.
locale/de/gitlab.po
View file @ 13380b16
This diff is collapsed.
locale/eo/gitlab.po
View file @ 13380b16
This diff is collapsed.
locale/es/gitlab.po
View file @ 13380b16
This diff is collapsed.
locale/fr/gitlab.po
View file @ 13380b16
This diff is collapsed.
locale/it/gitlab.po
View file @ 13380b16
This diff is collapsed.
locale/ja/gitlab.po
View file @ 13380b16
This diff is collapsed.
locale/ko/gitlab.po
View file @ 13380b16
This diff is collapsed.
locale/nl_NL/gitlab.po
View file @ 13380b16
This diff is collapsed.
locale/pl_PL/gitlab.po
View file @ 13380b16
This diff is collapsed.
locale/pt_BR/gitlab.po
View file @ 13380b16
This diff is collapsed.
locale/ru/gitlab.po
View file @ 13380b16
This diff is collapsed.
locale/uk/gitlab.po
View file @ 13380b16
This diff is collapsed.
locale/zh_CN/gitlab.po
View file @ 13380b16
This diff is collapsed.
locale/zh_HK/gitlab.po
View file @ 13380b16
This diff is collapsed.
locale/zh_TW/gitlab.po
View file @ 13380b16
This diff is collapsed.
package.json
View file @ 13380b16
This diff is collapsed.
qa/README.md
View file @ 13380b16
This diff is collapsed.
qa/qa/page/main/login.rb
View file @ 13380b16
This diff is collapsed.
qa/qa/runtime/env.rb
View file @ 13380b16
This diff is collapsed.
qa/qa/runtime/namespace.rb
View file @ 13380b16
This diff is collapsed.
qa/qa/runtime/user.rb
View file @ 13380b16
This diff is collapsed.
qa/qa/service/runner.rb
View file @ 13380b16
This diff is collapsed.
qa/qa/service/shellout.rb
View file @ 13380b16
This diff is collapsed.
qa/qa/specs/features/api/users_spec.rb
View file @ 13380b16
This diff is collapsed.
qa/spec/runtime/env_spec.rb
View file @ 13380b16
This diff is collapsed.
spec/ee/spec/features/profiles/pipeline_quota_spec.rb deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
spec/ee/spec/lib/gitlab/geo/fdw_spec.rb 0 → 100644
View file @ 13380b16
This diff is collapsed.
spec/factories/keys.rb
View file @ 13380b16
This diff is collapsed.
spec/features/ci_lint_spec.rb
View file @ 13380b16
This diff is collapsed.
spec/features/markdown/math_spec.rb 0 → 100644
View file @ 13380b16
This diff is collapsed.
spec/features/markdown/mermaid_spec.rb 0 → 100644
View file @ 13380b16
This diff is collapsed.
spec/finders/snippets_finder_spec.rb
View file @ 13380b16
This diff is collapsed.
spec/javascripts/boards/board_list_spec.js
View file @ 13380b16
This diff is collapsed.
spec/javascripts/droplab/drop_down_spec.js
View file @ 13380b16
This diff is collapsed.
spec/javascripts/gl_form_spec.js
View file @ 13380b16
This diff is collapsed.
spec/javascripts/gpg_badges_spec.js
View file @ 13380b16
This diff is collapsed.
spec/javascripts/importer_status_spec.js 0 → 100644
View file @ 13380b16
This diff is collapsed.
spec/javascripts/notes/helpers.js 0 → 100644
View file @ 13380b16
This diff is collapsed.
spec/javascripts/notes/mock_data.js
View file @ 13380b16
This diff is collapsed.
spec/javascripts/repo/components/changed_file_icon_spec.js 0 → 100644
View file @ 13380b16
This diff is collapsed.
spec/lib/gitlab/encoding_helper_spec.rb
View file @ 13380b16
This diff is collapsed.
spec/lib/gitlab/import_export/wiki_restorer_spec.rb 0 → 100644
View file @ 13380b16
This diff is collapsed.
spec/lib/gitlab/query_limiting_spec.rb
View file @ 13380b16
This diff is collapsed.
spec/lib/gitlab/ssh_public_key_spec.rb
View file @ 13380b16
This diff is collapsed.
spec/models/ci/build_spec.rb
View file @ 13380b16
This diff is collapsed.
spec/models/group_spec.rb
View file @ 13380b16
This diff is collapsed.
spec/models/key_spec.rb
View file @ 13380b16
This diff is collapsed.
spec/models/project_spec.rb
View file @ 13380b16
This diff is collapsed.
spec/models/user_spec.rb
View file @ 13380b16
This diff is collapsed.
spec/requests/api/search_spec.rb
View file @ 13380b16
This diff is collapsed.
spec/requests/api/snippets_spec.rb
View file @ 13380b16
This diff is collapsed.
spec/requests/api/todos_spec.rb
View file @ 13380b16
This diff is collapsed.
spec/requests/api/v3/todos_spec.rb
View file @ 13380b16
This diff is collapsed.
spec/requests/openid_connect_spec.rb
View file @ 13380b16
This diff is collapsed.
spec/spec_helper.rb
View file @ 13380b16
This diff is collapsed.
spec/support/api/schema_matcher.rb
View file @ 13380b16
This diff is collapsed.
spec/support/fixture_helpers.rb
View file @ 13380b16
This diff is collapsed.
spec/support/migrations_helpers.rb
View file @ 13380b16
This diff is collapsed.
spec/support/snippet_visibility.rb 0 → 100644
View file @ 13380b16
This diff is collapsed.
spec/support/stub_configuration.rb
View file @ 13380b16
This diff is collapsed.
vendor/assets/fonts/KaTeX_AMS-Regular.eot deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_AMS-Regular.ttf deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_AMS-Regular.woff deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_AMS-Regular.woff2 deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Caligraphic-Bold.eot deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Caligraphic-Bold.ttf deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Caligraphic-Bold.woff deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Caligraphic-Bold.woff2 deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Caligraphic-Regular.eot deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Caligraphic-Regular.ttf deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Caligraphic-Regular.woff deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Caligraphic-Regular.woff2 deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Fraktur-Bold.eot deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Fraktur-Bold.ttf deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Fraktur-Bold.woff deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Fraktur-Bold.woff2 deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Fraktur-Regular.eot deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Fraktur-Regular.ttf deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Fraktur-Regular.woff deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Fraktur-Regular.woff2 deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Main-Bold.eot deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Main-Bold.ttf deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Main-Bold.woff deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Main-Bold.woff2 deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Main-Italic.eot deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Main-Italic.ttf deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Main-Italic.woff deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Main-Italic.woff2 deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Main-Regular.eot deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Main-Regular.ttf deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Main-Regular.woff deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Main-Regular.woff2 deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Math-BoldItalic.eot deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Math-BoldItalic.ttf deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Math-BoldItalic.woff deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Math-BoldItalic.woff2 deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Math-Italic.eot deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Math-Italic.ttf deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Math-Italic.woff deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Math-Italic.woff2 deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Math-Regular.eot deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Math-Regular.ttf deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Math-Regular.woff deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Math-Regular.woff2 deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_SansSerif-Bold.eot deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_SansSerif-Bold.ttf deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_SansSerif-Bold.woff deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_SansSerif-Bold.woff2 deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_SansSerif-Italic.eot deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_SansSerif-Italic.ttf deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_SansSerif-Italic.woff deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_SansSerif-Italic.woff2 deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_SansSerif-Regular.eot deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_SansSerif-Regular.ttf deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_SansSerif-Regular.woff deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_SansSerif-Regular.woff2 deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Script-Regular.eot deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Script-Regular.ttf deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Script-Regular.woff deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Script-Regular.woff2 deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Size1-Regular.eot deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Size1-Regular.ttf deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Size1-Regular.woff deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Size1-Regular.woff2 deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Size2-Regular.eot deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Size2-Regular.ttf deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Size2-Regular.woff deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Size2-Regular.woff2 deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Size3-Regular.eot deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Size3-Regular.ttf deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Size3-Regular.woff deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Size3-Regular.woff2 deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Size4-Regular.eot deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Size4-Regular.ttf deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Size4-Regular.woff deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Size4-Regular.woff2 deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Typewriter-Regular.eot deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Typewriter-Regular.ttf deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Typewriter-Regular.woff deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/fonts/KaTeX_Typewriter-Regular.woff2 deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/javascripts/jquery.waitforimages.js deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/javascripts/katex.js deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/assets/stylesheets/katex.scss deleted 100644 → 0
View file @ e70bef40
This diff is collapsed.
vendor/gitignore/Android.gitignore
View file @ 13380b16
This diff is collapsed.
vendor/gitignore/Dart.gitignore
View file @ 13380b16
This diff is collapsed.
vendor/gitignore/Global/JetBrains.gitignore
View file @ 13380b16
This diff is collapsed.
vendor/gitignore/Python.gitignore
View file @ 13380b16
This diff is collapsed.
vendor/gitignore/ROS.gitignore
View file @ 13380b16
This diff is collapsed.
vendor/gitignore/TeX.gitignore
View file @ 13380b16
This diff is collapsed.
vendor/gitignore/VisualStudio.gitignore
View file @ 13380b16
This diff is collapsed.
vendor/licenses.csv
View file @ 13380b16
This diff is collapsed.
yarn.lock
View file @ 13380b16
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