Skip to content

G
gitlab-ce
Commit 7f7edbcc authored by Felipe Artur's avatar Felipe Artur
Browse files
Options

Merge master

parents 379f4841 58f6a21c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 7329 additions and 3478 deletions
Gemfile.lock
View file @ 7f7edbcc
......@@ -752,7 +752,7 @@ GEM
retriable (1.4.1)
rinku (2.0.0)
rotp (2.1.2)
rouge (2.2.0)
rouge (2.2.1)
rqrcode (0.7.0)
chunky_png
rqrcode-rails3 (0.1.7)
......
app/assets/javascripts/breadcrumb.js 0 → 100644
View file @ 7f7edbcc
export const addTooltipToEl = (el) => {
const textEl = el.querySelector('.js-breadcrumb-item-text');
if (textEl && textEl.scrollWidth > textEl.offsetWidth) {
el.setAttribute('title', el.textContent);
el.setAttribute('data-container', 'body');
el.classList.add('has-tooltip');
}
};
export default () => {
const breadcrumbs = document.querySelector('.js-breadcrumbs-list');
if (breadcrumbs) {
const topLevelLinks = [...breadcrumbs.children].filter(el => !el.classList.contains('dropdown'))
.map(el => el.querySelector('a'))
.filter(el => el);
const $expander = $('.js-breadcrumbs-collapsed-expander');
topLevelLinks.forEach(el => addTooltipToEl(el));
$expander.closest('.dropdown')
.on('show.bs.dropdown hide.bs.dropdown', (e) => {
$('.js-breadcrumbs-collapsed-expander', e.currentTarget).toggleClass('open')
.tooltip('hide');
});
}
};
app/assets/javascripts/dispatcher.js
View file @ 7f7edbcc
......@@ -45,7 +45,6 @@ import Issue from './issue';
import BindInOut from './behaviors/bind_in_out';
import DeleteModal from './branches/branches_delete_modal';
import Group from './group';
import GroupName from './group_name';
import GroupsList from './groups_list';
import ProjectsList from './projects_list';
import setupProjectEdit from './project_edit';
......@@ -550,6 +549,8 @@ import initGroupAnalytics from './init_group_analytics';
initSettingsPanels();
break;
case 'projects:settings:ci_cd:show':
// Initialize expandable settings panels
initSettingsPanels();
case 'groups:settings:ci_cd:show':
new gl.ProjectVariables();
break;
......@@ -636,9 +637,6 @@ import initGroupAnalytics from './init_group_analytics';
case 'root':
new UserCallout();
break;
case 'groups':
new GroupName();
break;
case 'profiles':
new NotificationsForm();
new NotificationsDropdown();
......@@ -646,7 +644,6 @@ import initGroupAnalytics from './init_group_analytics';
case 'projects':
new Project();
new ProjectAvatar();
new GroupName();
switch (path[1]) {
case 'compare':
new CompareAutocomplete();
......
app/assets/javascripts/environments/components/deploy_board_component.vue
View file @ 7f7edbcc
......@@ -66,9 +66,7 @@
<template>
<div class="js-deploy-board deploy-board">
<div v-if="isLoading">
<loading-icon />
</div>
<loading-icon v-if="isLoading" />
<div v-if="canRenderDeployBoard">
......
app/assets/javascripts/environments/stores/environments_store.js
View file @ 7f7edbcc
......@@ -68,9 +68,7 @@ export default class EnvironmentsStore {
if (filtered.size === 1 && filtered.rollout_status_path) {
filtered = Object.assign({}, filtered, {
hasDeployBoard: true,
isDeployBoardVisible: oldEnvironmentState.isDeployBoardVisible === false ?
oldEnvironmentState.isDeployBoardVisible :
true,
isDeployBoardVisible: oldEnvironmentState.isDeployBoardVisible || false,
deployBoardData: oldEnvironmentState.deployBoardData || {},
isLoadingDeployBoard: oldEnvironmentState.isLoadingDeployBoard || false,
hasErrorDeployBoard: oldEnvironmentState.hasErrorDeployBoard || false,
......
app/assets/javascripts/gl_dropdown.js
View file @ 7f7edbcc
......@@ -486,7 +486,7 @@ GitLabDropdown = (function() {
GitLabDropdown.prototype.shouldPropagate = function(e) {
var $target;
if (this.options.multiSelect) {
if (this.options.multiSelect || this.options.shouldPropagate === false) {
$target = $(e.target);
if ($target && !$target.hasClass('dropdown-menu-close') &&
!$target.hasClass('dropdown-menu-close-icon') &&
......@@ -546,10 +546,10 @@ GitLabDropdown = (function() {
};
GitLabDropdown.prototype.positionMenuAbove = function() {
var $button = $(this.el);
var $menu = this.dropdown.find('.dropdown-menu');
$menu.css('top', ($button.height() + $menu.height()) * -1);
$menu.css('top', 'initial');
$menu.css('bottom', '100%');
};
GitLabDropdown.prototype.hidden = function(e) {
......@@ -654,9 +654,14 @@ GitLabDropdown = (function() {
if (!selected) {
fieldName = this.options.fieldName;
field = this.dropdown.parent().find("input[name='" + fieldName + "'][value='" + value + "']");
if (field.length) {
selected = true;
if (value) {
field = this.dropdown.parent().find(`input[name='${fieldName}'][value='${value}']`);
if (field.length) {
selected = true;
}
} else {
field = this.dropdown.parent().find(`input[name='${fieldName}']`);
selected = !field.length;
}
}
// Set URL
......@@ -713,7 +718,7 @@ GitLabDropdown = (function() {
GitLabDropdown.prototype.noResults = function() {
var html;
return html = "<li class='dropdown-menu-empty-link'> <a href='#' class='is-focused'> No matching results. </a> </li>";
return html = '<li class="dropdown-menu-empty-link"><a href="#" class="is-focused">No matching results</a></li>';
};
GitLabDropdown.prototype.rowClicked = function(el) {
......
app/assets/javascripts/group_name.js deleted 100644 → 0
View file @ 379f4841
import Cookies from 'js-cookie';
import _ from 'underscore';
export default class GroupName {
constructor() {
this.titleContainer = document.querySelector('.js-title-container');
this.title = this.titleContainer.querySelector('.title');
if (this.title) {
this.titleWidth = this.title.offsetWidth;
this.groupTitle = this.titleContainer.querySelector('.group-title');
this.groups = this.titleContainer.querySelectorAll('.group-path');
this.toggle = null;
this.isHidden = false;
this.init();
}
}
init() {
if (this.groups.length > 0) {
this.groups[this.groups.length - 1].classList.remove('hidable');
this.toggleHandler();
window.addEventListener('resize', _.debounce(this.toggleHandler.bind(this), 100));
}
this.render();
}
toggleHandler() {
if (this.titleWidth > this.titleContainer.offsetWidth) {
if (!this.toggle) this.createToggle();
this.showToggle();
} else if (this.toggle) {
this.hideToggle();
}
}
createToggle() {
this.toggle = document.createElement('button');
this.toggle.setAttribute('type', 'button');
this.toggle.className = 'text-expander group-name-toggle';
this.toggle.setAttribute('aria-label', 'Toggle full path');
if (Cookies.get('new_nav') === 'true') {
this.toggle.innerHTML = '<i class="fa fa-ellipsis-h" aria-hidden="true"></i>';
} else {
this.toggle.innerHTML = '...';
}
this.toggle.addEventListener('click', this.toggleGroups.bind(this));
if (Cookies.get('new_nav') === 'true') {
this.title.insertBefore(this.toggle, this.groupTitle);
} else {
this.titleContainer.insertBefore(this.toggle, this.title);
}
this.toggleGroups();
}
showToggle() {
this.title.classList.add('wrap');
this.toggle.classList.remove('hidden');
if (this.isHidden) this.groupTitle.classList.add('hidden');
}
hideToggle() {
this.title.classList.remove('wrap');
this.toggle.classList.add('hidden');
if (this.isHidden) this.groupTitle.classList.remove('hidden');
}
toggleGroups() {
this.isHidden = !this.isHidden;
this.groupTitle.classList.toggle('hidden');
}
render() {
this.title.classList.remove('initializing');
}
}
app/assets/javascripts/issuable_bulk_update_sidebar.js
View file @ 7f7edbcc
......@@ -5,7 +5,6 @@
/* global SubscriptionSelect */
import IssuableBulkUpdateActions from './issuable_bulk_update_actions';
import SidebarHeightManager from './sidebar_height_manager';
const HIDDEN_CLASS = 'hidden';
const DISABLED_CONTENT_CLASS = 'disabled-content';
......@@ -50,13 +49,6 @@ export default class IssuableBulkUpdateSidebar {
new SubscriptionSelect();
}
getNavHeight() {
const navbarHeight = $('.navbar-gitlab').outerHeight();
const layoutNavHeight = $('.layout-nav').outerHeight();
const subNavScroll = $('.sub-nav-scroll').outerHeight();
return navbarHeight + layoutNavHeight + subNavScroll;
}
setupBulkUpdateActions() {
IssuableBulkUpdateActions.setOriginalDropdownData();
}
......@@ -84,23 +76,6 @@ export default class IssuableBulkUpdateSidebar {
this.toggleBulkEditButtonDisabled(enable);
this.toggleOtherFiltersDisabled(enable);
this.toggleCheckboxDisplay(enable);
if (enable) {
this.initAffix();
SidebarHeightManager.init();
}
}
initAffix() {
if (!this.$sidebar.hasClass('affix-top')) {
const offsetTop = $('.scrolling-tabs-container').outerHeight() + $('.sub-nav-scroll').outerHeight();
this.$sidebar.affix({
offset: {
top: offsetTop,
},
});
}
}
updateSelectedIssuableIds() {
......
app/assets/javascripts/issuable_form.js
View file @ 7f7edbcc
......@@ -11,8 +11,6 @@ import ZenMode from './zen_mode';
(function() {
this.IssuableForm = (function() {
IssuableForm.prototype.issueMoveConfirmMsg = 'Are you sure you want to move this issue to another project?';
IssuableForm.prototype.wipRegex = /^\s*(\[WIP\]\s*|WIP:\s*|WIP\s+)+\s*/i;
function IssuableForm(form) {
......@@ -28,7 +26,6 @@ import ZenMode from './zen_mode';
new ZenMode();
this.titleField = this.form.find("input[name*='[title]']");
this.descriptionField = this.form.find("textarea[name*='[description]']");
this.issueMoveField = this.form.find("#move_to_project_id");
if (!(this.titleField.length && this.descriptionField.length)) {
return;
}
......@@ -36,7 +33,6 @@ import ZenMode from './zen_mode';
this.form.on("submit", this.handleSubmit);
this.form.on("click", ".btn-cancel", this.resetAutosave);
this.initWip();
this.initMoveDropdown();
$issuableDueDate = $('#issuable-due-date');
if ($issuableDueDate.length) {
calendar = new Pikaday({
......@@ -58,12 +54,6 @@ import ZenMode from './zen_mode';
};
IssuableForm.prototype.handleSubmit = function() {
var fieldId = (this.issueMoveField != null) ? this.issueMoveField.val() : null;
if ((parseInt(fieldId, 10) || 0) > 0) {
if (!confirm(this.issueMoveConfirmMsg)) {
return false;
}
}
return this.resetAutosave();
};
......@@ -115,48 +105,6 @@ import ZenMode from './zen_mode';
return this.titleField.val("WIP: " + (this.titleField.val()));
};
IssuableForm.prototype.initMoveDropdown = function() {
var $moveDropdown, pageSize;
$moveDropdown = $('.js-move-dropdown');
if ($moveDropdown.length) {
pageSize = $moveDropdown.data('page-size');
return $('.js-move-dropdown').select2({
ajax: {
url: $moveDropdown.data('projects-url'),
quietMillis: 125,
data: function(term, page, context) {
return {
search: term,
offset_id: context
};
},
results: function(data) {
var context,
more;
if (data.length >= pageSize)
more = true;
if (data[data.length - 1])
context = data[data.length - 1].id;
return {
results: data,
more: more,
context: context
};
}
},
formatResult: function(project) {
return project.name_with_namespace;
},
formatSelection: function(project) {
return project.name_with_namespace;
}
});
}
};
return IssuableForm;
})();
}).call(window);
app/assets/javascripts/issue_show/components/app.vue
View file @ 7f7edbcc
......@@ -17,10 +17,6 @@ export default {
required: true,
type: String,
},
canMove: {
required: true,
type: Boolean,
},
canUpdate: {
required: true,
type: Boolean,
......@@ -96,10 +92,6 @@ export default {
type: String,
required: true,
},
projectsAutocompleteUrl: {
type: String,
required: true,
},
},
data() {
const store = new Store({
......@@ -142,7 +134,6 @@ export default {
confidential: this.isConfidential,
description: this.state.descriptionText,
lockedWarningVisible: false,
move_to_project_id: 0,
updateLoading: false,
});
}
......@@ -151,16 +142,6 @@ export default {
this.showForm = false;
},
updateIssuable() {
const canPostUpdate = this.store.formState.move_to_project_id !== 0 ?
confirm('Are you sure you want to move this issue to another project?') : true; // eslint-disable-line no-alert
if (!canPostUpdate) {
this.store.setFormState({
updateLoading: false,
});
return;
}
this.service.updateIssuable(this.store.formState)
.then(res => res.json())
.then((data) => {
......@@ -239,14 +220,12 @@ export default {
<form-component
v-if="canUpdate && showForm"
:form-state="formState"
:can-move="canMove"
:can-destroy="canDestroy"
:issuable-templates="issuableTemplates"
:markdown-docs="markdownDocs"
:markdown-preview-url="markdownPreviewUrl"
:project-path="projectPath"
:project-namespace="projectNamespace"
:projects-autocomplete-url="projectsAutocompleteUrl"
/>
<div v-else>
<title-component
......
app/assets/javascripts/issue_show/components/fields/project_move.vue deleted 100644 → 0
View file @ 379f4841
<script>
import tooltip from '../../../vue_shared/directives/tooltip';
export default {
directives: {
tooltip,
},
props: {
formState: {
type: Object,
required: true,
},
projectsAutocompleteUrl: {
type: String,
required: true,
},
},
mounted() {
const $moveDropdown = $(this.$refs['move-dropdown']);
$moveDropdown.select2({
ajax: {
url: this.projectsAutocompleteUrl,
quietMillis: 125,
data(term, page, context) {
return {
search: term,
offset_id: context,
};
},
results(data) {
const more = data.length >= 50;
const context = data[data.length - 1] ? data[data.length - 1].id : null;
return {
results: data,
more,
context,
};
},
},
formatResult(project) {
return project.name_with_namespace;
},
formatSelection(project) {
return project.name_with_namespace;
},
})
.on('change', (e) => {
this.formState.move_to_project_id = parseInt(e.target.value, 10);
});
},
beforeDestroy() {
$(this.$refs['move-dropdown']).select2('destroy');
},
};
</script>
<template>
<fieldset>
<label
for="issuable-move"
class="sr-only">
Move
</label>
<div class="issuable-form-select-holder append-right-5">
<input
ref="move-dropdown"
type="hidden"
id="issuable-move"
data-placeholder="Move to a different project" />
</div>
<span
v-tooltip
data-placement="auto top"
title="Moving an issue will copy the discussion to a different project and close it here. All participants will be notified of the new location.">
<i
class="fa fa-question-circle"
aria-hidden="true">
</i>
</span>
</fieldset>
</template>
app/assets/javascripts/issue_show/components/form.vue
View file @ 7f7edbcc
......@@ -4,15 +4,10 @@
import descriptionField from './fields/description.vue';
import editActions from './edit_actions.vue';
import descriptionTemplate from './fields/description_template.vue';
import projectMove from './fields/project_move.vue';
import confidentialCheckbox from './fields/confidential_checkbox.vue';
export default {
props: {
canMove: {
type: Boolean,
required: true,
},
canDestroy: {
type: Boolean,
required: true,
......@@ -42,10 +37,6 @@
type: String,
required: true,
},
projectsAutocompleteUrl: {
type: String,
required: true,
},
},
components: {
lockedWarning,
......@@ -53,7 +44,6 @@
descriptionField,
descriptionTemplate,
editActions,
projectMove,
confidentialCheckbox,
},
computed: {
......@@ -93,10 +83,6 @@
:markdown-docs="markdownDocs" />
<confidential-checkbox
:form-state="formState" />
<project-move
v-if="canMove"
:form-state="formState"
:projects-autocomplete-url="projectsAutocompleteUrl" />
<edit-actions
:form-state="formState"
:can-destroy="canDestroy" />
......
app/assets/javascripts/issue_show/index.js
View file @ 7f7edbcc
......@@ -28,7 +28,6 @@ document.addEventListener('DOMContentLoaded', () => {
props: {
canUpdate: this.canUpdate,
canDestroy: this.canDestroy,
canMove: this.canMove,
endpoint: this.endpoint,
issuableRef: this.issuableRef,
initialTitleHtml: this.initialTitleHtml,
......@@ -41,7 +40,6 @@ document.addEventListener('DOMContentLoaded', () => {
markdownDocs: this.markdownDocs,
projectPath: this.projectPath,
projectNamespace: this.projectNamespace,
projectsAutocompleteUrl: this.projectsAutocompleteUrl,
updatedAt: this.updatedAt,
updatedByName: this.updatedByName,
updatedByPath: this.updatedByPath,
......
app/assets/javascripts/issue_show/stores/index.js
View file @ 7f7edbcc
......@@ -6,7 +6,6 @@ export default class Store {
confidential: false,
description: '',
lockedWarningVisible: false,
move_to_project_id: 0,
updateLoading: false,
};
}
......
app/assets/javascripts/layout_nav.js
View file @ 7f7edbcc
......@@ -50,19 +50,10 @@ import initFlyOutNav from './fly_out_nav';
});
});
function applyScrollNavClass() {
const scrollOpacityHeight = 40;
$('.navbar-border').css('opacity', Math.min($(window).scrollTop() / scrollOpacityHeight, 1));
}
$(() => {
if (Cookies.get('new_nav') === 'true') {
const newNavSidebar = new NewNavSidebar();
newNavSidebar.bindEvents();
initFlyOutNav();
}
const newNavSidebar = new NewNavSidebar();
newNavSidebar.bindEvents();
$(window).on('scroll', _.throttle(applyScrollNavClass, 100));
initFlyOutNav();
});
}).call(window);
app/assets/javascripts/lib/utils/pretty_time.js
View file @ 7f7edbcc
......@@ -2,19 +2,20 @@ import _ from 'underscore';
(() => {
/*
* TODO: Make these methods more configurable (e.g. parseSeconds timePeriodContstraints,
* stringifyTime condensed or non-condensed, abbreviateTimelengths)
* TODO: Make these methods more configurable (e.g. stringifyTime condensed or
* non-condensed, abbreviateTimelengths)
* */
const utils = window.gl.utils = gl.utils || {};
const prettyTime = utils.prettyTime = {
/*
* Accepts seconds and returns a timeObject { weeks: #, days: #, hours: #, minutes: # }
* Seconds can be negative or positive, zero or non-zero.
* Seconds can be negative or positive, zero or non-zero. Can be configured for any day
* or week length.
*/
parseSeconds(seconds) {
const DAYS_PER_WEEK = 5;
const HOURS_PER_DAY = 8;
parseSeconds(seconds, { daysPerWeek = 5, hoursPerDay = 8 } = {}) {
const DAYS_PER_WEEK = daysPerWeek;
const HOURS_PER_DAY = hoursPerDay;
const MINUTES_PER_HOUR = 60;
const MINUTES_PER_WEEK = DAYS_PER_WEEK * HOURS_PER_DAY * MINUTES_PER_HOUR;
const MINUTES_PER_DAY = HOURS_PER_DAY * MINUTES_PER_HOUR;
......
app/assets/javascripts/main.js
View file @ 7f7edbcc
......@@ -142,6 +142,7 @@ import './smart_interval';
import './star';
import './subscription';
import './subscription_select';
import initBreadcrumbs from './breadcrumb';
// EE-only scripts
import './admin_email_select';
......@@ -188,6 +189,8 @@ $(function () {
var bootstrapBreakpoint = bp.getBreakpointSize();
var fitSidebarForSize;
initBreadcrumbs();
// Set the default path for all cookies to GitLab's root directory
Cookies.defaults.path = gon.relative_url_root || '/';
......
app/assets/javascripts/new_sidebar.js
View file @ 7f7edbcc
......@@ -63,7 +63,7 @@ export default class NewNavSidebar {
if (breakpoint === 'sm' || breakpoint === 'md') {
this.toggleCollapsedSidebar(true);
} else if (breakpoint === 'lg') {
const collapse = Cookies.get('sidebar_collapsed') === 'true';
const collapse = this.$sidebar.hasClass('sidebar-icons-only');
this.toggleCollapsedSidebar(collapse);
}
}
......
app/assets/javascripts/project.js
View file @ 7f7edbcc
......@@ -65,10 +65,6 @@ import Cookies from 'js-cookie';
return _this.changeProject($(e.currentTarget).val());
};
})(this));
return $('.js-projects-dropdown-toggle').on('click', function(e) {
e.preventDefault();
return $('.js-projects-dropdown').select2('open');
});
};
Project.prototype.changeProject = function(url) {
......
app/assets/javascripts/project_select.js
View file @ 7f7edbcc
......@@ -5,51 +5,7 @@ import ProjectSelectComboButton from './project_select_combo_button';
(function () {
this.ProjectSelect = (function () {
function ProjectSelect() {
$('.js-projects-dropdown-toggle').each(function (i, dropdown) {
var $dropdown;
$dropdown = $(dropdown);
return $dropdown.glDropdown({
filterable: true,
filterRemote: true,
search: {
fields: ['name_with_namespace']
},
data: function (term, callback) {
var finalCallback, projectsCallback;
var orderBy = $dropdown.data('order-by');
finalCallback = function (projects) {
return callback(projects);
};
if (this.includeGroups) {
projectsCallback = function (projects) {
var groupsCallback;
groupsCallback = function (groups) {
var data;
data = groups.concat(projects);
return finalCallback(data);
};
return Api.groups(term, {}, groupsCallback);
};
} else {
projectsCallback = finalCallback;
}
if (this.groupId) {
return Api.groupProjects(this.groupId, term, projectsCallback);
} else {
return Api.projects(term, {
order_by: orderBy
}, projectsCallback);
}
},
url: function (project) {
return project.web_url;
},
text: function (project) {
return project.name_with_namespace;
}
});
});
$('.ajax-project-select').each(function (i, select) {
$('.ajax-project-select').each(function(i, select) {
var placeholder;
this.groupId = $(select).data('group-id');
this.includeGroups = $(select).data('include-groups');
......
app/assets/javascripts/right_sidebar.js
View file @ 7f7edbcc
......@@ -2,7 +2,6 @@
import _ from 'underscore';
import Cookies from 'js-cookie';
import SidebarHeightManager from './sidebar_height_manager';
(function() {
this.Sidebar = (function() {
......@@ -23,7 +22,6 @@ import SidebarHeightManager from './sidebar_height_manager';
};
Sidebar.prototype.addEventListeners = function() {
SidebarHeightManager.init();
const $document = $(document);
this.sidebar.on('click', '.sidebar-collapsed-icon', this, this.sidebarCollapseClicked);
......@@ -157,11 +155,16 @@ import SidebarHeightManager from './sidebar_height_manager';
Sidebar.prototype.openDropdown = function(blockOrName) {
var $block;
$block = _.isString(blockOrName) ? this.getBlock(blockOrName) : blockOrName;
$block.find('.edit-link').trigger('click');
if (!this.isOpen()) {
this.setCollapseAfterUpdate($block);
return this.toggleSidebar('open');
this.toggleSidebar('open');
}
// Wait for the sidebar to trigger('click') open
// so it doesn't cause our dropdown to close preemptively
setTimeout(() => {
$block.find('.js-sidebar-dropdown-toggle').trigger('click');
});
};
Sidebar.prototype.setCollapseAfterUpdate = function($block) {
......
app/assets/javascripts/sidebar/components/assignees/assignee_title.js
View file @ 7f7edbcc
......@@ -36,7 +36,7 @@ export default {
/>
<a
v-if="editable"
class="edit-link pull-right"
class="js-sidebar-dropdown-toggle edit-link pull-right"
href="#"
>
Edit
......
app/assets/javascripts/sidebar/lib/sidebar_move_issue.js 0 → 100644
View file @ 7f7edbcc
/* global Flash */
function isValidProjectId(id) {
return id > 0;
}
class SidebarMoveIssue {
constructor(mediator, dropdownToggle, confirmButton) {
this.mediator = mediator;
this.$dropdownToggle = $(dropdownToggle);
this.$confirmButton = $(confirmButton);
this.onConfirmClickedWrapper = this.onConfirmClicked.bind(this);
}
init() {
this.initDropdown();
this.addEventListeners();
}
destroy() {
this.removeEventListeners();
}
initDropdown() {
this.$dropdownToggle.glDropdown({
search: {
fields: ['name_with_namespace'],
},
showMenuAbove: true,
selectable: true,
filterable: true,
filterRemote: true,
multiSelect: false,
// Keep the dropdown open after selecting an option
shouldPropagate: false,
data: (searchTerm, callback) => {
this.mediator.fetchAutocompleteProjects(searchTerm)
.then(callback)
.catch(() => new Flash('An error occured while fetching projects autocomplete.'));
},
renderRow: project => `
<li>
<a href="#" class="js-move-issue-dropdown-item">
${project.name_with_namespace}
</a>
</li>
`,
clicked: (options) => {
const project = options.selectedObj;
const selectedProjectId = options.isMarking ? project.id : 0;
this.mediator.setMoveToProjectId(selectedProjectId);
this.$confirmButton.attr('disabled', !isValidProjectId(selectedProjectId));
},
});
}
addEventListeners() {
this.$confirmButton.on('click', this.onConfirmClickedWrapper);
}
removeEventListeners() {
this.$confirmButton.off('click', this.onConfirmClickedWrapper);
}
onConfirmClicked() {
if (isValidProjectId(this.mediator.store.moveToProjectId)) {
this.$confirmButton
.disable()
.addClass('is-loading');
this.mediator.moveIssue()
.catch(() => {
Flash('An error occured while moving the issue.');
this.$confirmButton
.enable()
.removeClass('is-loading');
});
}
}
}
export default SidebarMoveIssue;
app/assets/javascripts/sidebar/services/sidebar_service.js
View file @ 7f7edbcc
......@@ -4,9 +4,11 @@ import VueResource from 'vue-resource';
Vue.use(VueResource);
export default class SidebarService {
constructor(endpoint) {
constructor(endpointMap) {
if (!SidebarService.singleton) {
this.endpoint = endpoint;
this.endpoint = endpointMap.endpoint;
this.moveIssueEndpoint = endpointMap.moveIssueEndpoint;
this.projectsAutocompleteEndpoint = endpointMap.projectsAutocompleteEndpoint;
SidebarService.singleton = this;
}
......@@ -25,4 +27,18 @@ export default class SidebarService {
emulateJSON: true,
});
}
getProjectsAutocomplete(searchTerm) {
return Vue.http.get(this.projectsAutocompleteEndpoint, {
params: {
search: searchTerm,
},
});
}
moveIssue(moveToProjectId) {
return Vue.http.post(this.moveIssueEndpoint, {
move_to_project_id: moveToProjectId,
});
}
}
app/assets/javascripts/sidebar/sidebar_bundle.js
View file @ 7f7edbcc
......@@ -2,6 +2,7 @@ import Vue from 'vue';
import sidebarTimeTracking from './components/time_tracking/sidebar_time_tracking';
import sidebarAssignees from './components/assignees/sidebar_assignees';
import confidential from './components/confidential/confidential_issue_sidebar.vue';
import SidebarMoveIssue from './lib/sidebar_move_issue';
import Mediator from './sidebar_mediator';
......@@ -31,6 +32,12 @@ function domContentLoaded() {
service: mediator.service,
},
}).$mount(confidentialEl);
new SidebarMoveIssue(
mediator,
$('.js-move-issue'),
$('.js-move-issue-confirmation-button'),
).init();
}
new Vue(sidebarTimeTracking).$mount('#issuable-time-tracker');
......
app/assets/javascripts/sidebar/sidebar_mediator.js
View file @ 7f7edbcc
......@@ -7,7 +7,11 @@ export default class SidebarMediator {
constructor(options) {
if (!SidebarMediator.singleton) {
this.store = new Store(options);
this.service = new Service(options.endpoint);
this.service = new Service({
endpoint: options.endpoint,
moveIssueEndpoint: options.moveIssueEndpoint,
projectsAutocompleteEndpoint: options.projectsAutocompleteEndpoint,
});
SidebarMediator.singleton = this;
}
......@@ -26,6 +30,10 @@ export default class SidebarMediator {
return this.service.update(field, selected.length === 0 ? [0] : selected);
}
setMoveToProjectId(projectId) {
this.store.setMoveToProjectId(projectId);
}
fetch() {
this.service.get()
.then(response => response.json())
......@@ -35,4 +43,23 @@ export default class SidebarMediator {
})
.catch(() => new Flash('Error occured when fetching sidebar data'));
}
fetchAutocompleteProjects(searchTerm) {
return this.service.getProjectsAutocomplete(searchTerm)
.then(response => response.json())
.then((data) => {
this.store.setAutocompleteProjects(data);
return this.store.autocompleteProjects;
});
}
moveIssue() {
return this.service.moveIssue(this.store.moveToProjectId)
.then(response => response.json())
.then((data) => {
if (location.pathname !== data.web_url) {
gl.utils.visitUrl(data.web_url);
}
});
}
}
app/assets/javascripts/sidebar/stores/sidebar_store.js
View file @ 7f7edbcc
......@@ -13,6 +13,8 @@ export default class SidebarStore {
this.isFetching = {
assignees: true,
};
this.autocompleteProjects = [];
this.moveToProjectId = 0;
SidebarStore.singleton = this;
}
......@@ -53,4 +55,12 @@ export default class SidebarStore {
removeAllAssignees() {
this.assignees = [];
}
setAutocompleteProjects(projects) {
this.autocompleteProjects = projects;
}
setMoveToProjectId(moveToProjectId) {
this.moveToProjectId = moveToProjectId;
}
}
app/assets/javascripts/sidebar_height_manager.js deleted 100644 → 0
View file @ 379f4841
import _ from 'underscore';
import Cookies from 'js-cookie';
export default {
init() {
if (!this.initialized) {
if (Cookies.get('new_nav') === 'true' && $('.js-issuable-sidebar').length) return;
this.$window = $(window);
this.$rightSidebar = $('.js-right-sidebar');
this.$navHeight = $('.navbar-gitlab').outerHeight() +
$('.layout-nav').outerHeight() +
$('.sub-nav-scroll').outerHeight();
const throttledSetSidebarHeight = _.throttle(() => this.setSidebarHeight(), 20);
const debouncedSetSidebarHeight = _.debounce(() => this.setSidebarHeight(), 200);
this.$window.on('scroll', throttledSetSidebarHeight);
this.$window.on('resize', debouncedSetSidebarHeight);
this.initialized = true;
}
},
setSidebarHeight() {
const currentScrollDepth = window.pageYOffset || 0;
const diff = this.$navHeight - currentScrollDepth;
if (diff > 0) {
const newSidebarHeight = window.innerHeight - diff;
this.$rightSidebar.outerHeight(newSidebarHeight);
this.sidebarHeightIsCustom = true;
} else if (this.sidebarHeightIsCustom) {
this.$rightSidebar.outerHeight('100%');
this.sidebarHeightIsCustom = false;
}
},
};
app/assets/stylesheets/framework/dropdowns.scss
View file @ 7f7edbcc
......@@ -193,7 +193,7 @@
min-width: 240px;
max-width: 500px;
margin-top: 2px;
margin-bottom: 0;
margin-bottom: 2px;
font-size: 14px;
font-weight: $gl-font-weight-normal;
padding: 8px 0;
......@@ -618,6 +618,11 @@
border-top: 1px solid $dropdown-divider-color;
}
.dropdown-footer-content {
padding-left: 10px;
padding-right: 10px;
}
.dropdown-due-date-footer {
padding-top: 0;
margin-left: 10px;
......@@ -729,6 +734,7 @@
#{$selector}.dropdown-menu,
#{$selector}.dropdown-menu-nav {
li {
display: block;
padding: 0 1px;
&:hover {
......@@ -751,6 +757,7 @@
button {
border-radius: 0;
padding: 8px 16px;
white-space: normal;
// make sure the text color is not overriden
&.text-danger {
......@@ -798,4 +805,5 @@
}
}
@include new-style-dropdown('.breadcrumbs-list .dropdown ');
@include new-style-dropdown('.js-namespace-select + ');
app/assets/stylesheets/framework/selects.scss
View file @ 7f7edbcc
......@@ -279,14 +279,25 @@
// TODO: change global style
.ajax-project-dropdown,
.ajax-users-dropdown,
body[data-page="projects:settings:repository:show"] #select2-drop,
body[data-page="projects:new"] #select2-drop,
body[data-page="projects:merge_requests:edit"] #select2-drop,
body[data-page="projects:blob:new"] #select2-drop,
body[data-page="profiles:show"] #select2-drop,
body[data-page="admin:groups:show"] #select2-drop,
body[data-page="projects:blob:edit"] #select2-drop {
&.select2-drop {
border: 1px solid $dropdown-border-color;
border-radius: $border-radius-base;
color: $gl-text-color;
}
&.select2-drop-above {
border-top: none;
margin-top: -4px;
}
.select2-results {
.select2-no-results,
.select2-searching,
......
app/assets/stylesheets/new_nav.scss
View file @ 7f7edbcc
@import "framework/variables";
@import 'framework/tw_bootstrap_variables';
@import "bootstrap/variables";
@import "framework/mixins";
header.navbar-gitlab-new {
color: $white-light;
......@@ -301,109 +302,38 @@ header.navbar-gitlab-new {
.breadcrumbs {
display: flex;
min-height: 61px;
min-height: 48px;
color: $gl-text-color;
border-bottom: 1px solid $border-color;
.dropdown-toggle-caret {
position: relative;
top: -1px;
padding: 0 5px;
color: $gl-text-color-secondary;
font-size: 10px;
line-height: 1;
background: none;
border: 0;
&:focus {
outline: 0;
}
}
// TODO: fallback to global style
.dropdown-menu {
.divider {
margin: 6px 0;
}
li {
padding: 0 1px;
a {
border-radius: 0;
padding: 8px 16px;
&.is-focused,
&:hover,
&:active,
&:focus {
background-color: $gray-darker;
}
}
}
}
}
.breadcrumbs-container {
display: -webkit-flex;
display: flex;
width: 100%;
position: relative;
padding-top: $gl-padding;
padding-bottom: $gl-padding;
align-items: center;
.dropdown-menu-projects {
margin-top: -$gl-padding;
margin-left: $gl-padding;
}
border-bottom: 1px solid $border-color;
}
.breadcrumbs-links {
-webkit-flex: 1;
flex: 1;
min-width: 0;
align-self: center;
color: $gl-text-color-quaternary;
a {
color: $gl-text-color-secondary;
&:not(:first-child),
&.group-path {
margin-left: 4px;
}
&:not(:last-of-type),
&.group-path {
margin-right: 3px;
}
}
.title {
display: inline-block;
> a {
&:last-of-type:not(:first-child) {
font-weight: $gl-font-weight-bold;
}
}
}
color: $gl-text-color-secondary;
.avatar-tile {
margin-right: 5px;
margin-right: 4px;
border: 1px solid $border-color;
border-radius: 50%;
vertical-align: sub;
&.identicon {
float: left;
width: 16px;
height: 16px;
margin-top: 2px;
font-size: 10px;
}
}
.text-expander {
margin-left: 4px;
margin-right: 4px;
margin-left: 0;
margin-right: 2px;
> i {
position: relative;
......@@ -412,37 +342,52 @@ header.navbar-gitlab-new {
}
}
.breadcrumbs-extra {
.breadcrumbs-list {
display: -webkit-flex;
display: flex;
flex: 0 0 auto;
margin-left: auto;
}
.breadcrumbs-sub-title {
margin: 2px 0;
font-size: 16px;
font-weight: $gl-font-weight-normal;
line-height: 1;
ul {
margin: 0;
}
flex-wrap: wrap;
margin-bottom: 0;
line-height: 16px;
li {
display: inline-block;
> li {
display: flex;
align-items: center;
position: relative;
&:not(:last-child) {
&::after {
content: "/";
margin: 0 2px 0 5px;
color: rgba($black, .65);
}
margin-right: 20px;
}
&:last-child a {
font-weight: $gl-font-weight-bold;
> a {
font-size: 12px;
color: currentColor;
}
}
}
.breadcrumb-item-text {
@include str-truncated(128px);
}
.breadcrumbs-list-angle {
position: absolute;
right: -12px;
top: 50%;
color: $gl-text-color-tertiary;
transform: translateY(-50%);
}
.breadcrumbs-extra {
display: flex;
flex: 0 0 auto;
margin-left: auto;
}
.breadcrumbs-sub-title {
margin: 0;
font-size: 12px;
font-weight: 600;
line-height: 1;
a {
color: $gl-text-color;
......
app/assets/stylesheets/new_sidebar.scss
View file @ 7f7edbcc
......@@ -45,7 +45,6 @@ $new-sidebar-collapsed-width: 50px;
margin-right: 2px;
a {
border-bottom: 1px solid $border-color;
font-weight: $gl-font-weight-bold;
display: flex;
align-items: center;
......
app/assets/stylesheets/pages/boards.scss
View file @ 7f7edbcc
......@@ -466,6 +466,7 @@
&.right-sidebar {
top: 0;
bottom: 0;
height: 100%;
}
.issuable-sidebar-header {
......@@ -684,6 +685,8 @@
}
.boards-switcher {
@include new-style-dropdown;
padding-right: 10px;
}
......
app/assets/stylesheets/pages/commits.scss
View file @ 7f7edbcc
......@@ -141,17 +141,17 @@
display: inline-block;
background: $white-light;
color: $gl-text-color-secondary;
padding: 0 5px;
padding: 0 4px;
cursor: pointer;
border: 1px solid $border-gray-dark;
border-radius: $border-radius-default;
margin-left: 5px;
font-size: $gl-font-size;
font-size: 12px;
line-height: $gl-font-size;
outline: none;
&.open {
background: $gray-light;
background-color: darken($gray-light, 10%);
box-shadow: inset 0 0 2px rgba($black, 0.2);
}
......
app/assets/stylesheets/pages/issuable.scss
View file @ 7f7edbcc
......@@ -473,7 +473,7 @@
padding-top: 6px;
}
.open .dropdown-menu {
.dropdown-menu {
width: 100%;
}
}
......@@ -486,6 +486,24 @@
}
}
.sidebar-move-issue-dropdown {
@include new-style-dropdown;
}
.sidebar-move-issue-confirmation-button {
width: 100%;
&.is-loading {
.sidebar-move-issue-confirmation-loading-icon {
display: inline-block;
}
}
}
.sidebar-move-issue-confirmation-loading-icon {
display: none;
}
.detail-page-description {
padding: 16px 0;
......
app/assets/stylesheets/pages/members.scss
View file @ 7f7edbcc
......@@ -61,6 +61,10 @@
display: -webkit-flex;
display: flex;
}
.dropdown-menu.dropdown-menu-align-right {
margin-top: -2px;
}
}
.form-horizontal {
......@@ -356,3 +360,7 @@
}
}
}
.member-form-control {
@include new-style-dropdown;
}
app/assets/stylesheets/pages/merge_requests.scss
View file @ 7f7edbcc
......@@ -290,6 +290,7 @@
.dropdown-toggle {
.fa {
margin-left: 0;
color: inherit;
}
}
......@@ -723,7 +724,14 @@
.approvers-list {
display: flex;
align-items: center;
margin-right: 5px;
}
.approvers-list {
.link-to-member-avatar:not(:first-child) {
img {
margin-left: 0;
}
}
}
.unapprove-btn {
......@@ -797,3 +805,7 @@
}
}
}
.merge-request-form {
@include new-style-dropdown;
}
app/assets/stylesheets/pages/projects.scss
View file @ 7f7edbcc
......@@ -815,6 +815,8 @@ a.allowed-to-push {
.new-protected-branch,
.new-protected-tag {
@include new-style-dropdown;
label {
margin-top: 6px;
font-weight: $gl-font-weight-normal;
......@@ -841,19 +843,9 @@ a.allowed-to-push {
.protected-branches-list,
.protected-tags-list {
margin-bottom: 30px;
a {
color: $gl-text-color;
&:hover {
color: $gl-link-color;
}
@include new-style-dropdown;
&.is-active {
font-weight: $gl-font-weight-bold;
}
}
margin-bottom: 30px;
.settings-message {
margin: 0;
......
app/assets/stylesheets/pages/promotions.scss
View file @ 7f7edbcc
......@@ -9,16 +9,18 @@
margin-bottom: 20px;
}
.user-callout-copy {
max-width: 700px;
margin-left: auto;
margin-right: auto;
}
.bordered-box {
padding: 20px;
border-color: $border-color;
background-color: $white-light;
align-items: flex-start;
.user-callout-copy {
max-width: 700px;
}
.close {
.dismiss-icon {
......@@ -40,6 +42,10 @@
}
}
.user-callout.promotion-callout.promotion-empty-page {
margin-top: 56px;
}
.promotion-modal {
.modal-dialog {
......
app/assets/stylesheets/pages/search.scss
View file @ 7f7edbcc
......@@ -190,6 +190,8 @@ input[type="checkbox"]:hover {
}
.search-holder {
@include new-style-dropdown;
@media (min-width: $screen-sm-min) {
display: -webkit-flex;
display: flex;
......
app/controllers/admin/users_controller.rb
View file @ 7f7edbcc
......@@ -117,11 +117,14 @@ class Admin::UsersController < Admin::ApplicationController
user_params_with_pass = user_params.dup
if params[:user][:password].present?
user_params_with_pass.merge!(
password_params = {
password: params[:user][:password],
password_confirmation: params[:user][:password_confirmation],
password_expires_at: Time.now
)
password_confirmation: params[:user][:password_confirmation]
}
password_params[:password_expires_at] = Time.now unless changing_own_password?
user_params_with_pass.merge!(password_params)
end
respond_to do |format|
......@@ -167,6 +170,10 @@ class Admin::UsersController < Admin::ApplicationController
protected
def changing_own_password?
user == current_user
end
def user
@user ||= User.find_by!(username: params[:id])
end
......
app/controllers/application_controller.rb
View file @ 7f7edbcc
......@@ -210,7 +210,7 @@ class ApplicationController < ActionController::Base
end
def check_password_expiration
if current_user && current_user.password_expires_at && current_user.password_expires_at < Time.now && current_user.allow_password_authentication?
if current_user && current_user.password_expires_at && current_user.password_expires_at < Time.now && !current_user.ldap_user?
return redirect_to new_profile_password_path
end
end
......
app/controllers/autocomplete_controller.rb
View file @ 7f7edbcc
......@@ -45,12 +45,6 @@ class AutocompleteController < ApplicationController
project = Project.find_by_id(params[:project_id])
projects = projects_finder.execute(project, search: params[:search], offset_id: params[:offset_id])
no_project = {
id: 0,
name_with_namespace: 'No project'
}
projects.unshift(no_project) unless params[:offset_id].present?
render json: projects.to_json(only: [:id, :name_with_namespace], methods: :name_with_namespace)
end
......
app/controllers/concerns/requires_whitelisted_monitoring_client.rb
View file @ 7f7edbcc
module RequiresWhitelistedMonitoringClient
extend ActiveSupport::Concern
include Gitlab::CurrentSettings
included do
before_action :validate_ip_whitelisted_or_valid_token!
end
......
app/controllers/groups/hooks_controller.rb
View file @ 7f7edbcc
......@@ -69,4 +69,8 @@ class Groups::HooksController < Groups::ApplicationController
:wiki_page_events
)
end
def check_group_webhooks_available!
render_404 unless @group.feature_available?(:group_webhooks) || LicenseHelper.show_promotions?(current_user)
end
end
app/controllers/passwords_controller.rb
View file @ 7f7edbcc
class PasswordsController < Devise::PasswordsController
include Gitlab::CurrentSettings
before_action :resource_from_email, only: [:create]
before_action :check_password_authentication_available, only: [:create]
before_action :prevent_ldap_reset, only: [:create]
before_action :throttle_reset, only: [:create]
def edit
......@@ -40,11 +38,11 @@ class PasswordsController < Devise::PasswordsController
self.resource = resource_class.find_by_email(email)
end
def check_password_authentication_available
return if current_application_settings.password_authentication_enabled? && (resource.nil? || resource.allow_password_authentication?)
def prevent_ldap_reset
return unless resource&.ldap_user?
redirect_to after_sending_reset_password_instructions_path_for(resource_name),
alert: "Password authentication is unavailable."
alert: "Cannot reset password for LDAP user."
end
def throttle_reset
......
app/controllers/profiles/passwords_controller.rb
View file @ 7f7edbcc
......@@ -77,7 +77,7 @@ class Profiles::PasswordsController < Profiles::ApplicationController
end
def authorize_change_password!
render_404 unless @user.allow_password_authentication?
render_404 if @user.ldap_user?
end
def user_params
......
app/controllers/projects/application_controller.rb
View file @ 7f7edbcc
......@@ -94,6 +94,6 @@ class Projects::ApplicationController < ApplicationController
end
def require_pages_enabled!
not_found unless Gitlab.config.pages.enabled
not_found unless @project.pages_available?
end
end
app/controllers/projects/issues_controller.rb
View file @ 7f7edbcc
......@@ -17,7 +17,7 @@ class Projects::IssuesController < Projects::ApplicationController
before_action :authorize_create_issue!, only: [:new, :create]
# Allow modify issue
before_action :authorize_update_issue!, only: [:edit, :update]
before_action :authorize_update_issue!, only: [:edit, :update, :move]
# Allow create a new branch and empty WIP merge request from current issue
before_action :authorize_create_merge_request!, only: [:create_merge_request]
......@@ -131,25 +131,33 @@ class Projects::IssuesController < Projects::ApplicationController
@issue = Issues::UpdateService.new(project, current_user, update_params).execute(issue)
respond_to do |format|
format.html do
recaptcha_check_with_fallback { render :edit }
end
format.json do
render_issue_json
end
end
rescue ActiveRecord::StaleObjectError
render_conflict_response
end
def move
params.require(:move_to_project_id)
if params[:move_to_project_id].to_i > 0
new_project = Project.find(params[:move_to_project_id])
return render_404 unless issue.can_move?(current_user, new_project)
move_service = Issues::MoveService.new(project, current_user)
@issue = move_service.execute(@issue, new_project)
@issue = Issues::UpdateService.new(project, current_user, target_project: new_project).execute(issue)
end
respond_to do |format|
format.html do
recaptcha_check_with_fallback { render :edit }
end
format.json do
if @issue.valid?
render json: IssueSerializer.new.represent(@issue)
else
render json: { errors: @issue.errors.full_messages }, status: :unprocessable_entity
end
render_issue_json
end
end
......@@ -260,6 +268,14 @@ class Projects::IssuesController < Projects::ApplicationController
return render_404 unless @project.feature_available?(:issues, current_user)
end
def render_issue_json
if @issue.valid?
render json: IssueSerializer.new.represent(@issue)
else
render json: { errors: @issue.errors.full_messages }, status: :unprocessable_entity
end
end
def issue_params
params.require(:issue).permit(*issue_params_attributes)
end
......
app/controllers/projects/lfs_api_controller.rb
View file @ 7f7edbcc
class Projects::LfsApiController < Projects::GitHttpClientController
include ApplicationSettingsHelper
include ApplicationHelper
include GitlabRoutingHelper
include LfsRequest
skip_before_action :lfs_check_access!, only: [:deprecated]
before_action :lfs_check_batch_operation!, only: [:batch]
def batch
unless objects.present?
......@@ -90,4 +94,16 @@ class Projects::LfsApiController < Projects::GitHttpClientController
}
}
end
def lfs_check_batch_operation!
if upload_request? && Gitlab::Geo.secondary?
render(
json: {
message: "You cannot write to a secondary GitLab Geo instance. Please use #{geo_primary_default_url_to_repo(project)} instead."
},
content_type: "application/vnd.git-lfs+json",
status: 403
)
end
end
end
app/helpers/application_helper.rb
View file @ 7f7edbcc
......@@ -205,7 +205,7 @@ module ApplicationHelper
end
def support_url
current_application_settings.help_page_support_url.presence || promo_url + '/getting-help/'
Gitlab::CurrentSettings.current_application_settings.help_page_support_url.presence || promo_url + '/getting-help/'
end
def page_filter_path(options = {})
......@@ -306,10 +306,6 @@ module ApplicationHelper
end
end
def show_new_nav?
true
end
def collapsed_sidebar?
cookies["sidebar_collapsed"] == "true"
end
......
app/helpers/application_settings_helper.rb
View file @ 7f7edbcc
......@@ -2,6 +2,8 @@ module ApplicationSettingsHelper
prepend EE::ApplicationSettingsHelper
extend self
include Gitlab::CurrentSettings
delegate :gravatar_enabled?,
:signup_enabled?,
:password_authentication_enabled?,
......@@ -83,6 +85,18 @@ module ApplicationSettingsHelper
end
end
def key_restriction_options_for_select(type)
bit_size_options = Gitlab::SSHPublicKey.supported_sizes(type).map do |bits|
["Must be at least #{bits} bits", bits]
end
[
['Are allowed', 0],
*bit_size_options,
['Are forbidden', ApplicationSetting::FORBIDDEN_KEY_VALUE]
]
end
def repository_storages_options_for_select
options = Gitlab.config.repositories.storages.map do |name, storage|
["#{name} - #{storage['path']}", name]
......@@ -115,6 +129,9 @@ module ApplicationSettingsHelper
:domain_blacklist_enabled,
:domain_blacklist_raw,
:domain_whitelist_raw,
:dsa_key_restriction,
:ecdsa_key_restriction,
:ed25519_key_restriction,
:email_author_in_body,
:enabled_git_access_protocol,
:gravatar_enabled,
......@@ -158,6 +175,7 @@ module ApplicationSettingsHelper
:repository_storages,
:require_two_factor_authentication,
:restricted_visibility_levels,
:rsa_key_restriction,
:send_user_confirmation_email,
:sentry_dsn,
:sentry_enabled,
......
app/helpers/auth_helper.rb
View file @ 7f7edbcc
module AuthHelper
include Gitlab::CurrentSettings
PROVIDERS_WITH_ICONS = %w(twitter github gitlab bitbucket google_oauth2 facebook azure_oauth2 authentiq).freeze
FORM_BASED_PROVIDERS = [/\Aldap/, 'kerberos', 'crowd'].freeze
......
app/helpers/breadcrumbs_helper.rb
View file @ 7f7edbcc
......@@ -22,4 +22,16 @@ module BreadcrumbsHelper
@breadcrumb_title = title
end
def breadcrumb_list_item(link)
content_tag "li" do
link + icon("angle-right", class: "breadcrumbs-list-angle")
end
end
def add_to_breadcrumb_dropdown(link, location: :before)
@breadcrumb_dropdown_links ||= {}
@breadcrumb_dropdown_links[location] ||= []
@breadcrumb_dropdown_links[location] << link
end
end
app/helpers/dropdowns_helper.rb
View file @ 7f7edbcc
......@@ -106,9 +106,11 @@ module DropdownsHelper
end
end
def dropdown_footer(&block)
def dropdown_footer(add_content_class: false, &block)
content_tag(:div, class: "dropdown-footer") do
if block
if add_content_class
content_tag(:div, capture(&block), class: "dropdown-footer-content")
else
capture(&block)
end
end
......
app/helpers/form_helper.rb
View file @ 7f7edbcc
module FormHelper
prepend ::EE::FormHelper
def form_errors(model)
def form_errors(model, type: 'form')
return unless model.errors.any?
pluralized = 'error'.pluralize(model.errors.count)
headline = "The form contains the following #{pluralized}:"
headline = "The #{type} contains the following #{pluralized}:"
content_tag(:div, class: 'alert alert-danger', id: 'error_explanation') do
content_tag(:h4, headline) <<
......
app/helpers/groups_helper.rb
View file @ 7f7edbcc
......@@ -15,18 +15,20 @@ module GroupsHelper
@has_group_title = true
full_title = ''
group.ancestors.reverse.each do |parent|
full_title += group_title_link(parent, hidable: true)
full_title += '<span class="hidable"> / </span>'.html_safe
group.ancestors.reverse.each_with_index do |parent, index|
if index > 0
add_to_breadcrumb_dropdown(group_title_link(parent, hidable: false, show_avatar: true), location: :before)
else
full_title += breadcrumb_list_item group_title_link(parent, hidable: false)
end
end
full_title += group_title_link(group)
full_title += ' &middot; '.html_safe + link_to(simple_sanitize(name), url, class: 'group-path') if name
full_title += render "layouts/nav/breadcrumbs/collapsed_dropdown", location: :before, title: _("Show parent subgroups")
content_tag :span, class: 'group-title' do
full_title.html_safe
end
full_title += breadcrumb_list_item group_title_link(group)
full_title += ' &middot; '.html_safe + link_to(simple_sanitize(name), url, class: 'group-path breadcrumb-item-text js-breadcrumb-item-text') if name
full_title.html_safe
end
def projects_lfs_status(group)
......@@ -71,11 +73,11 @@ module GroupsHelper
private
def group_title_link(group, hidable: false)
link_to(group_path(group), class: "group-path #{'hidable' if hidable}") do
def group_title_link(group, hidable: false, show_avatar: false)
link_to(group_path(group), class: "group-path breadcrumb-item-text js-breadcrumb-item-text #{'hidable' if hidable}") do
output =
if show_new_nav? && !Rails.env.test?
image_tag(group_icon(group), class: "avatar-tile", width: 16, height: 16)
if (group.try(:avatar_url) || show_avatar) && !Rails.env.test?
image_tag(group_icon(group), class: "avatar-tile", width: 15, height: 15)
else
""
end
......
app/helpers/issuables_helper.rb
View file @ 7f7edbcc
......@@ -126,12 +126,8 @@ module IssuablesHelper
end
def issuable_meta(issuable, project, text)
output = content_tag(:strong, class: "identifier") do
concat("#{text} ")
concat(to_url_reference(issuable))
end
output << " opened #{time_ago_with_tooltip(issuable.created_at)} by ".html_safe
output = ""
output << "Opened #{time_ago_with_tooltip(issuable.created_at)} by ".html_safe
output << content_tag(:strong) do
author_output = link_to_member(project, issuable.author, size: 24, mobile_classes: "hidden-xs", tooltip: true)
author_output << link_to_member(project, issuable.author, size: 24, by_username: true, avatar: false, mobile_classes: "hidden-sm hidden-md hidden-lg")
......@@ -141,7 +137,7 @@ module IssuablesHelper
output << content_tag(:span, (issuable.task_status if issuable.tasks?), id: "task_status", class: "hidden-xs hidden-sm")
output << content_tag(:span, (issuable.task_status_short if issuable.tasks?), id: "task_status_short", class: "hidden-md hidden-lg")
output
output.html_safe
end
def issuable_todo(issuable)
......@@ -215,12 +211,10 @@ module IssuablesHelper
endpoint: project_issue_path(@project, issuable),
canUpdate: can?(current_user, :update_issue, issuable),
canDestroy: can?(current_user, :destroy_issue, issuable),
canMove: current_user ? issuable.can_move?(current_user) : false,
issuableRef: issuable.to_reference,
isConfidential: issuable.confidential,
markdownPreviewUrl: preview_markdown_path(@project),
markdownDocs: help_page_path('user/markdown'),
projectsAutocompleteUrl: autocomplete_projects_path(project_id: @project.id),
issuableTemplates: issuable_templates(issuable),
projectPath: ref_project.path,
projectNamespace: ref_project.namespace.full_path,
......@@ -377,6 +371,8 @@ module IssuablesHelper
def issuable_sidebar_options(issuable, can_edit_issuable)
{
endpoint: "#{issuable_json_path(issuable)}?basic=true",
moveIssueEndpoint: move_namespace_project_issue_path(namespace_id: issuable.project.namespace.to_param, project_id: issuable.project, id: issuable),
projectsAutocompleteEndpoint: autocomplete_projects_path(project_id: @project.id),
editable: can_edit_issuable,
currentUser: current_user.as_json(only: [:username, :id, :name], methods: :avatar_url),
rootPath: root_path,
......
app/helpers/license_helper.rb
View file @ 7f7edbcc
......@@ -77,15 +77,14 @@ module LicenseHelper
def show_promotions?(selected_user = current_user)
return false unless selected_user
return @show_promotions if defined?(@show_promotions)
@show_promotions =
if current_application_settings.should_check_namespace_plan?
true
else
license = License.current
license.nil? || license.expired?
end
if Gitlab::CurrentSettings.current_application_settings
.should_check_namespace_plan?
true
else
license = License.current
license.nil? || license.expired?
end
end
def show_project_feature_promotion?(project_feature, callout_id = nil)
......
app/helpers/nav_helper.rb
View file @ 7f7edbcc
module NavHelper
def page_with_sidebar_class
class_name = page_gutter_class
class_name << 'page-with-new-sidebar' if defined?(@new_sidebar) && @new_sidebar
class_name << 'page-with-icon-sidebar' if collapsed_sidebar? && @new_sidebar
class_name << 'page-with-new-sidebar' if defined?(@left_sidebar) && @left_sidebar
class_name << 'page-with-icon-sidebar' if collapsed_sidebar? && @left_sidebar
class_name
end
......@@ -30,23 +30,6 @@ module NavHelper
end
end
def nav_header_class
class_names = []
class_names << 'with-horizontal-nav' if defined?(nav) && nav
class_names
end
def layout_nav_class
return [] if show_new_nav?
class_names = []
class_names << 'page-with-layout-nav' if defined?(nav) && nav
class_names << 'page-with-sub-nav' if content_for?(:sub_nav)
class_names
end
def nav_control_class
"nav-control" if current_user
end
......
app/helpers/page_layout_helper.rb
View file @ 7f7edbcc
......@@ -4,7 +4,7 @@ module PageLayoutHelper
@page_title.push(*titles.compact) if titles.any?
if show_new_nav? && titles.any? && !defined?(@breadcrumb_title)
if titles.any? && !defined?(@breadcrumb_title)
@breadcrumb_title = @page_title.last
end
......@@ -80,7 +80,9 @@ module PageLayoutHelper
@header_title = title
@header_title_url = title_url
else
@header_title_url ? link_to(@header_title, @header_title_url) : @header_title
return @header_title unless @header_title_url
breadcrumb_list_item(link_to(@header_title, @header_title_url))
end
end
......
app/helpers/projects_helper.rb
View file @ 7f7edbcc
module ProjectsHelper
include Gitlab::CurrentSettings
def link_to_project(project)
link_to [project.namespace.becomes(Namespace), project], title: h(project.name) do
title = content_tag(:span, project.name, class: 'project-name')
......@@ -52,31 +54,28 @@ module ProjectsHelper
def project_title(project)
namespace_link =
if project.group
group_title(project.group)
group_title(project.group, nil, nil)
else
owner = project.namespace.owner
link_to(simple_sanitize(owner.name), user_path(owner))
end
project_link = link_to project_path(project), { class: "project-item-select-holder" } do
project_link = link_to project_path(project) do
output =
if show_new_nav? && !Rails.env.test?
project_icon(project, alt: project.name, class: 'avatar-tile', width: 16, height: 16)
if project.avatar_url && !Rails.env.test?
project_icon(project, alt: project.name, class: 'avatar-tile', width: 15, height: 15)
else
""
end
output << simple_sanitize(project.name)
output << content_tag("span", simple_sanitize(project.name), class: "breadcrumb-item-text js-breadcrumb-item-text")
output.html_safe
end
if current_user
project_link << button_tag(type: 'button', class: 'dropdown-toggle-caret js-projects-dropdown-toggle', aria: { label: 'Toggle switch project dropdown' }, data: { target: '.js-dropdown-menu-projects', toggle: 'dropdown', order_by: 'last_activity_at' }) do
icon("chevron-down")
end
end
namespace_link = breadcrumb_list_item(namespace_link) unless project.group
project_link = breadcrumb_list_item project_link
"#{namespace_link} / #{project_link}".html_safe
"#{namespace_link} #{project_link}".html_safe
end
def remove_project_message(project)
......
app/helpers/wiki_helper.rb
View file @ 7f7edbcc
......@@ -10,4 +10,15 @@ module WikiHelper
.map { |dir_or_page| WikiPage.unhyphenize(dir_or_page).capitalize }
.join(' / ')
end
def wiki_breadcrumb_dropdown_links(page_slug)
page_slug_split = page_slug.split('/')
page_slug_split.pop(1)
current_slug = ""
page_slug_split
.map do |dir_or_page|
current_slug = "#{current_slug}#{dir_or_page}/"
add_to_breadcrumb_dropdown link_to(WikiPage.unhyphenize(dir_or_page).capitalize, project_wiki_path(@project, current_slug)), location: :after
end
end
end
app/mailers/base_mailer.rb
View file @ 7f7edbcc
class BaseMailer < ActionMailer::Base
include Gitlab::CurrentSettings
around_action :render_with_default_locale
helper ApplicationHelper
helper MarkupHelper
attr_accessor :current_user
helper_method :current_user, :can?
helper_method :current_user, :can?, :current_application_settings
default from: proc { default_sender_address.format }
default reply_to: proc { default_reply_to_address.format }
......
app/models/application_setting.rb
View file @ 7f7edbcc
......@@ -14,6 +14,11 @@ class ApplicationSetting < ActiveRecord::Base
[\r\n] # any number of newline characters
}x
# Setting a key restriction to `-1` means that all keys of this type are
# forbidden.
FORBIDDEN_KEY_VALUE = KeyRestrictionValidator::FORBIDDEN
SUPPORTED_KEY_TYPES = %i[rsa dsa ecdsa ed25519].freeze
serialize :restricted_visibility_levels # rubocop:disable Cop/ActiveRecordSerialize
serialize :import_sources # rubocop:disable Cop/ActiveRecordSerialize
serialize :disabled_oauth_sign_in_sources, Array # rubocop:disable Cop/ActiveRecordSerialize
......@@ -159,6 +164,12 @@ class ApplicationSetting < ActiveRecord::Base
presence: true,
numericality: { greater_than_or_equal_to: 0 }
SUPPORTED_KEY_TYPES.each do |type|
validates :"#{type}_key_restriction", presence: true, key_restriction: { type: type }
end
validates :allowed_key_types, presence: true
validates_each :restricted_visibility_levels do |record, attr, value|
value&.each do |level|
unless Gitlab::VisibilityLevel.options.value?(level)
......@@ -184,6 +195,7 @@ class ApplicationSetting < ActiveRecord::Base
end
before_validation :ensure_uuid!
before_save :ensure_runners_registration_token
before_save :ensure_health_check_access_token
......@@ -234,6 +246,9 @@ class ApplicationSetting < ActiveRecord::Base
default_group_visibility: Settings.gitlab.default_projects_features['visibility_level'],
disabled_oauth_sign_in_sources: [],
domain_whitelist: Settings.gitlab['domain_whitelist'],
dsa_key_restriction: 0,
ecdsa_key_restriction: 0,
ed25519_key_restriction: 0,
gravatar_enabled: Settings.gravatar['enabled'],
help_page_text: nil,
help_page_hide_commercial_content: false,
......@@ -252,6 +267,7 @@ class ApplicationSetting < ActiveRecord::Base
max_attachment_size: Settings.gitlab['max_attachment_size'],
password_authentication_enabled: Settings.gitlab['password_authentication_enabled'],
performance_bar_allowed_group_id: nil,
rsa_key_restriction: 0,
plantuml_enabled: false,
plantuml_url: nil,
project_export_enabled: true,
......@@ -460,6 +476,18 @@ class ApplicationSetting < ActiveRecord::Base
usage_ping_can_be_configured? && super
end
def allowed_key_types
SUPPORTED_KEY_TYPES.select do |type|
key_restriction_for(type) != FORBIDDEN_KEY_VALUE
end
end
def key_restriction_for(type)
attr_name = "#{type}_key_restriction"
has_attribute?(attr_name) ? public_send(attr_name) : FORBIDDEN_KEY_VALUE # rubocop:disable GitlabSecurity/PublicSend
end
private
def ensure_uuid!
......
app/models/ci/build.rb
View file @ 7f7edbcc
......@@ -3,6 +3,7 @@ module Ci
include TokenAuthenticatable
include AfterCommitQueue
include Presentable
include Importable
prepend EE::Build
belongs_to :runner
......@@ -29,6 +30,7 @@ module Ci
validates :coverage, numericality: true, allow_blank: true
validates :ref, presence: true
validates :protected, inclusion: { in: [true, false], unless: :importing? }, on: :create
scope :unstarted, ->() { where(runner_id: nil) }
scope :ignore_failures, ->() { where(allow_failure: false) }
......@@ -38,6 +40,7 @@ module Ci
scope :last_month, ->() { where('created_at > ?', Date.today - 1.month) }
scope :manual_actions, ->() { where(when: :manual, status: COMPLETED_STATUSES + [:manual]) }
scope :codequality, ->() { where(name: %w[codequality codeclimate]) }
scope :ref_protected, -> { where(protected: true) }
mount_uploader :artifacts_file, ArtifactUploader
mount_uploader :artifacts_metadata, ArtifactUploader
......
app/models/ci/pipeline.rb
View file @ 7f7edbcc
......@@ -48,6 +48,7 @@ module Ci
validates :sha, presence: { unless: :importing? }
validates :ref, presence: { unless: :importing? }
validates :status, presence: { unless: :importing? }
validates :protected, inclusion: { in: [true, false], unless: :importing? }, on: :create
validate :valid_commit_sha, unless: :importing?
after_create :keep_around_commits, unless: :importing?
......
app/models/ci/runner.rb
View file @ 7f7edbcc
......@@ -6,7 +6,7 @@ module Ci
RUNNER_QUEUE_EXPIRY_TIME = 60.minutes
ONLINE_CONTACT_TIMEOUT = 1.hour
AVAILABLE_SCOPES = %w[specific shared active paused online].freeze
FORM_EDITABLE = %i[description tag_list active run_untagged locked].freeze
FORM_EDITABLE = %i[description tag_list active run_untagged locked access_level].freeze
has_many :builds
has_many :runner_projects, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent
......@@ -36,11 +36,17 @@ module Ci
end
validate :tag_constraints
validates :access_level, presence: true
acts_as_taggable
after_destroy :cleanup_runner_queue
enum access_level: {
not_protected: 0,
ref_protected: 1
}
# Searches for runners matching the given query.
#
# This method uses ILIKE on PostgreSQL and LIKE on MySQL.
......@@ -107,6 +113,8 @@ module Ci
end
def can_pick?(build)
return false if self.ref_protected? && !build.protected?
assignable_for?(build.project) && accepting_tags?(build)
end
......
app/models/commit.rb
View file @ 7f7edbcc
......@@ -251,6 +251,28 @@ class Commit
project.repository.next_branch("cherry-pick-#{short_id}", mild: true)
end
def cherry_pick_description(user)
message_body = "(cherry picked from commit #{sha})"
if merged_merge_request?(user)
commits_in_merge_request = merged_merge_request(user).commits
if commits_in_merge_request.present?
message_body << "\n"
commits_in_merge_request.reverse.each do |commit_in_merge|
message_body << "\n#{commit_in_merge.short_id} #{commit_in_merge.title}"
end
end
end
message_body
end
def cherry_pick_message(user)
%Q{#{message}\n\n#{cherry_pick_description(user)}}
end
def revert_description(user)
if merged_merge_request?(user)
"This reverts merge request #{merged_merge_request(user).to_reference}"
......
app/models/concerns/elastic/application_search.rb
View file @ 7f7edbcc
module Elastic
module ApplicationSearch
extend ActiveSupport::Concern
extend Gitlab::CurrentSettings
included do
include Elasticsearch::Model
include Gitlab::CurrentSettings
index_name [Rails.application.class.parent_name.downcase, Rails.env].join('-')
......
app/models/concerns/spammable.rb
View file @ 7f7edbcc
......@@ -28,7 +28,7 @@ module Spammable
def submittable_as_spam?
if user_agent_detail
user_agent_detail.submittable? && current_application_settings.akismet_enabled
user_agent_detail.submittable? && Gitlab::CurrentSettings.current_application_settings.akismet_enabled
else
false
end
......
app/models/issue.rb
View file @ 7f7edbcc
......@@ -304,7 +304,13 @@ class Issue < ActiveRecord::Base
end
end
def update_project_counter_caches?
state_changed? || confidential_changed?
end
def update_project_counter_caches
return unless update_project_counter_caches?
Projects::OpenIssuesCountService.new(project).refresh_cache
end
......
app/models/issue_assignee.rb
View file @ 7f7edbcc
class IssueAssignee < ActiveRecord::Base
extend Gitlab::CurrentSettings
belongs_to :issue
belongs_to :assignee, class_name: "User", foreign_key: :user_id
......@@ -9,7 +7,7 @@ class IssueAssignee < ActiveRecord::Base
# EE-specific
def update_elasticsearch_index
if current_application_settings.elasticsearch_indexing?
if Gitlab::CurrentSettings.current_application_settings.elasticsearch_indexing?
ElasticIndexerWorker.perform_async(
:update,
'Issue',
......
app/models/key.rb
View file @ 7f7edbcc
require 'digest/md5'
class Key < ActiveRecord::Base
include Gitlab::CurrentSettings
include Sortable
LAST_USED_AT_REFRESH_TIME = 1.day.to_i
......@@ -12,14 +13,19 @@ class Key < ActiveRecord::Base
validates :title,
presence: true,
length: { maximum: 255 }
validates :key,
presence: true,
length: { maximum: 5000 },
format: { with: /\A(ssh|ecdsa)-.*\Z/ }
validates :fingerprint,
uniqueness: true,
presence: { message: 'cannot be generated' }
validate :key_meets_restrictions
# EE-only
scope :ldap, -> { where(type: 'LDAPKey') }
delegate :name, :email, to: :user, prefix: true
......@@ -82,6 +88,10 @@ class Key < ActiveRecord::Base
SystemHooksService.new.execute_hooks_for(self, :destroy)
end
def public_key
@public_key ||= Gitlab::SSHPublicKey.new(key)
end
private
def generate_fingerprint
......@@ -89,7 +99,27 @@ class Key < ActiveRecord::Base
return unless self.key.present?
self.fingerprint = Gitlab::KeyFingerprint.new(self.key).fingerprint
self.fingerprint = public_key.fingerprint
end
def key_meets_restrictions
restriction = current_application_settings.key_restriction_for(public_key.type)
if restriction == ApplicationSetting::FORBIDDEN_KEY_VALUE
errors.add(:key, forbidden_key_type_message)
elsif public_key.bits < restriction
errors.add(:key, "must be at least #{restriction} bits")
end
end
def forbidden_key_type_message
allowed_types =
current_application_settings
.allowed_key_types
.map(&:upcase)
.to_sentence(last_word_connector: ', or ', two_words_connector: ' or ')
"type is forbidden. Must be #{allowed_types}"
end
def notify_user
......
app/models/merge_request.rb
View file @ 7f7edbcc
......@@ -630,6 +630,8 @@ class MergeRequest < ActiveRecord::Base
self.merge_requests_closing_issues.delete_all
closes_issues(current_user).each do |issue|
next if issue.is_a?(ExternalIssue)
self.merge_requests_closing_issues.create!(issue: issue)
end
end
......@@ -971,7 +973,13 @@ class MergeRequest < ActiveRecord::Base
@base_pipeline ||= project.pipelines.find_by(sha: merge_request_diff&.base_commit_sha)
end
def update_project_counter_caches?
state_changed?
end
def update_project_counter_caches
return unless update_project_counter_caches?
Projects::OpenMergeRequestsCountService.new(target_project).refresh_cache
end
......
app/models/namespace.rb
View file @ 7f7edbcc
......@@ -200,6 +200,10 @@ class Namespace < ActiveRecord::Base
parent.present?
end
def subgroup?
has_parent?
end
def soft_delete_without_removing_associations
# We can't use paranoia's `#destroy` since this will hard-delete projects.
# Project uses `pending_delete` instead of the acts_as_paranoia gem.
......
app/models/project.rb
View file @ 7f7edbcc
......@@ -22,6 +22,7 @@ class Project < ActiveRecord::Base
prepend EE::Project
extend Gitlab::ConfigHelper
extend Gitlab::CurrentSettings
BoardLimitExceeded = Class.new(StandardError)
......@@ -1231,6 +1232,10 @@ class Project < ActiveRecord::Base
File.join(pages_path, 'public')
end
def pages_available?
Gitlab.config.pages.enabled && !namespace.subgroup?
end
def remove_private_deploy_keys
exclude_keys_linked_to_other_projects = <<-SQL
NOT EXISTS (
......
app/models/project_feature.rb
View file @ 7f7edbcc
......@@ -51,7 +51,7 @@ class ProjectFeature < ActiveRecord::Base
default_value_for :repository_access_level, value: ENABLED, allows_nil: false
after_commit on: :update do
if current_application_settings.elasticsearch_indexing?
if Gitlab::CurrentSettings.current_application_settings.elasticsearch_indexing?
ElasticIndexerWorker.perform_async(:update, 'Project', project_id)
end
end
......
app/models/protected_branch.rb
View file @ 7f7edbcc
......@@ -3,6 +3,8 @@ class ProtectedBranch < ActiveRecord::Base
include ProtectedRef
prepend EE::ProtectedRef
extend Gitlab::CurrentSettings
protected_ref_access_levels :merge, :push
# Check if branch name is marked as protected in the system
......
app/models/repository.rb
View file @ 7f7edbcc
......@@ -934,7 +934,7 @@ class Repository
committer = user_to_committer(user)
create_commit(message: commit.message,
create_commit(message: commit.cherry_pick_message(user),
author: {
email: commit.author_email,
name: commit.author_name,
......
app/models/snippet.rb
View file @ 7f7edbcc
......@@ -11,6 +11,8 @@ class Snippet < ActiveRecord::Base
include Spammable
include Editable
extend Gitlab::CurrentSettings
cache_markdown_field :title, pipeline: :single_line
cache_markdown_field :description
cache_markdown_field :content
......
app/models/user.rb
View file @ 7f7edbcc
......@@ -2,6 +2,7 @@ require 'carrierwave/orm/activerecord'
class User < ActiveRecord::Base
extend Gitlab::ConfigHelper
extend Gitlab::CurrentSettings
include Gitlab::ConfigHelper
include Gitlab::CurrentSettings
......@@ -621,7 +622,7 @@ class User < ActiveRecord::Base
end
def require_personal_access_token_creation_for_git_auth?
return false if allow_password_authentication? || ldap_user?
return false if current_application_settings.password_authentication_enabled? || ldap_user?
PersonalAccessTokensFinder.new(user: self, impersonation: false, state: 'active').execute.none?
end
......
app/models/wiki_page.rb
View file @ 7f7edbcc
......@@ -84,7 +84,7 @@ class WikiPage
# The formatted title of this page.
def title
if @attributes[:title]
self.class.unhyphenize(@attributes[:title])
CGI.unescape_html(self.class.unhyphenize(@attributes[:title]))
else
""
end
......
app/policies/base_policy.rb
View file @ 7f7edbcc
require_dependency 'declarative_policy'
class BasePolicy < DeclarativePolicy::Base
include Gitlab::CurrentSettings
desc "User is an instance admin"
with_options scope: :user, score: 0
condition(:admin) { @user&.admin? }
......@@ -15,7 +13,7 @@ class BasePolicy < DeclarativePolicy::Base
desc "The application is restricted from public visibility"
condition(:restricted_public_level, scope: :global) do
current_application_settings.restricted_visibility_levels.include?(Gitlab::VisibilityLevel::PUBLIC)
Gitlab::CurrentSettings.current_application_settings.restricted_visibility_levels.include?(Gitlab::VisibilityLevel::PUBLIC)
end
# EE Extensions
......
app/services/akismet_service.rb
View file @ 7f7edbcc
class AkismetService
include Gitlab::CurrentSettings
attr_accessor :owner, :text, :options
def initialize(owner, text, options = {})
......
app/services/auth/container_registry_authentication_service.rb
View file @ 7f7edbcc
module Auth
class ContainerRegistryAuthenticationService < BaseService
include Gitlab::CurrentSettings
extend Gitlab::CurrentSettings
AUDIENCE = 'container_registry'.freeze
......
app/services/ci/create_pipeline_service.rb
View file @ 7f7edbcc
......@@ -12,7 +12,8 @@ module Ci
tag: tag?,
trigger_requests: Array(trigger_request),
user: current_user,
pipeline_schedule: schedule
pipeline_schedule: schedule,
protected: project.protected_for?(ref)
)
result = validate(current_user,
......
app/services/ci/register_job_service.rb
View file @ 7f7edbcc
......@@ -78,7 +78,9 @@ module Ci
end
def new_builds
Ci::Build.pending.unstarted
builds = Ci::Build.pending.unstarted
builds = builds.ref_protected if runner.ref_protected?
builds
end
def shared_runner_build_limits_feature_enabled?
......
app/services/ci/retry_build_service.rb
View file @ 7f7edbcc
......@@ -3,7 +3,7 @@ module Ci
CLONE_ACCESSORS = %i[pipeline project ref tag options commands name
allow_failure stage_id stage stage_idx trigger_request
yaml_variables when environment coverage_regex
description tag_list].freeze
description tag_list protected].freeze
def execute(build)
reprocess!(build).tap do |new_build|
......
app/services/geo/node_status_service.rb
View file @ 7f7edbcc
......@@ -35,6 +35,8 @@ module Geo
Array([message, details].compact.join("\n"))
end
rescue OpenSSL::Cipher::CipherError
['Error decrypting the Geo secret from the database. Check that the primary uses the correct db_key_base.']
rescue HTTParty::Error, Timeout::Error, SocketError, Errno::ECONNRESET, Errno::ECONNREFUSED => e
[e.message]
end
......
app/services/issuable_base_service.rb
View file @ 7f7edbcc
......@@ -58,6 +58,7 @@ class IssuableBaseService < BaseService
params.delete(:assignee_id)
params.delete(:due_date)
params.delete(:canonical_issue_id)
params.delete(:project)
end
filter_assignee(issuable)
......
app/services/issues/update_service.rb
View file @ 7f7edbcc
......@@ -6,7 +6,7 @@ module Issues
handle_move_between_ids(issue)
filter_spam_check_params
change_issue_duplicate(issue)
update(issue)
move_issue_to_new_project(issue) || update(issue)
end
def before_update(issue)
......@@ -74,6 +74,17 @@ module Issues
end
end
def move_issue_to_new_project(issue)
target_project = params.delete(:target_project)
return unless target_project &&
issue.can_move?(current_user, target_project) &&
target_project != issue.project
update(issue)
Issues::MoveService.new(project, current_user).execute(issue, target_project)
end
private
def get_issue_if_allowed(id)
......
app/services/projects/after_import_service.rb
View file @ 7f7edbcc
module Projects
class AfterImportService
RESERVED_REFS_REGEXP =
%r{\Arefs/(?:#{Regexp.union(*Repository::RESERVED_REFS_NAMES)})/}
RESERVED_REF_PREFIXES = Repository::RESERVED_REFS_NAMES.map { |n| File.join('refs', n, '/') }
def initialize(project)
@project = project
......@@ -9,7 +8,7 @@ module Projects
def execute
Projects::HousekeepingService.new(@project).execute do
repository.delete_refs(*garbage_refs)
repository.delete_all_refs_except(RESERVED_REF_PREFIXES)
end
rescue Projects::HousekeepingService::LeaseTaken => e
Rails.logger.info(
......@@ -18,10 +17,6 @@ module Projects
private
def garbage_refs
@garbage_refs ||= repository.all_ref_names_except(RESERVED_REFS_REGEXP)
end
def repository
@repository ||= @project.repository
end
......
app/services/projects/create_service.rb
View file @ 7f7edbcc
......@@ -28,9 +28,6 @@ module Projects
return @project
end
# EE-only: Repository size limit comes as MB from the view
set_repository_size_limit_as_bytes
set_project_name_from_path
# get namespace id
......@@ -107,11 +104,6 @@ module Projects
system_hook_service.execute_hooks_for(@project, :create)
setup_authorizations
# EE-only
create_predefined_push_rule
@project.group&.refresh_members_authorized_projects
end
# Refresh the current user's authorizations inline (so they can access the
......@@ -161,11 +153,6 @@ module Projects
end
end
def set_repository_size_limit_as_bytes
limit = params.delete(:repository_size_limit)
@project.repository_size_limit = Gitlab::Utils.try_megabytes_to_bytes(limit) if limit
end
def set_project_name_from_path
# Set project name from path
if @project.name.present? && @project.path.present?
......@@ -179,16 +166,5 @@ module Projects
@project.path = @project.name.dup.parameterize
end
end
def create_predefined_push_rule
return unless project.feature_available?(:push_rules)
predefined_push_rule = PushRule.find_by(is_sample: true)
if predefined_push_rule
push_rule = predefined_push_rule.dup.tap { |gh| gh.is_sample = false }
project.push_rule = push_rule
end
end
end
end
app/services/projects/update_pages_service.rb
View file @ 7f7edbcc
module Projects
class UpdatePagesService < BaseService
include Gitlab::CurrentSettings
BLOCK_SIZE = 32.kilobytes
MAX_SIZE = 1.terabyte
SITE_PATH = 'public/'.freeze
......
app/services/quick_actions/interpret_service.rb
View file @ 7f7edbcc
......@@ -506,6 +506,24 @@ module QuickActions
end
end
desc 'Move this issue to another project.'
explanation do |path_to_project|
"Moves this issue to #{path_to_project}."
end
params 'path/to/project'
condition do
issuable.is_a?(Issue) &&
issuable.persisted? &&
current_user.can?(:"admin_#{issuable.to_ability_name}", project)
end
command :move do |target_project_path|
target_project = Project.find_by_full_path(target_project_path)
if target_project.present?
@updates[:target_project] = target_project
end
end
def extract_users(params)
return [] if params.nil?
......
app/services/slash_commands/global_slack_handler.rb
View file @ 7f7edbcc
......@@ -36,7 +36,8 @@ module SlashCommands
def valid_token?
ActiveSupport::SecurityUtils.variable_size_secure_compare(
current_application_settings.slack_app_verification_token,
Gitlab::CurrentSettings.current_application_settings
.slack_app_verification_token,
params[:token]
)
end
......
app/services/upload_service.rb
View file @ 7f7edbcc
class UploadService
include Gitlab::CurrentSettings
def initialize(model, file, uploader_class = FileUploader)
@model, @file, @uploader_class = model, file, uploader_class
end
......
app/services/users/build_service.rb
View file @ 7f7edbcc
module Users
class BuildService < BaseService
prepend ::EE::Users::BuildService
include Gitlab::CurrentSettings
def initialize(current_user, params = {})
@current_user = current_user
......
app/validators/addressable_url_validator.rb
View file @ 7f7edbcc
This diff is collapsed.
app/validators/key_restriction_validator.rb 0 → 100644
View file @ 7f7edbcc
This diff is collapsed.
app/views/admin/applications/edit.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/admin/cohorts/index.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/admin/dashboard/index.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/admin/groups/show.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/admin/hooks/edit.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/admin/jobs/index.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/admin/labels/edit.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/admin/projects/show.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/admin/runners/index.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/admin/services/edit.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/admin/users/show.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/ci/variables/_content.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/ci/variables/_index.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/ci/variables/_show.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/dashboard/_groups_head.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/dashboard/issues.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/groups/edit.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/groups/hooks/index.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/groups/issues.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/groups/labels/index.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/groups/merge_requests.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/groups/milestones/index.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/groups/projects.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/groups/show.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/groups/subgroups.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/layouts/_head.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/layouts/_page.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/layouts/admin.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/layouts/application.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/layouts/group.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/layouts/header/_default.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/layouts/header/_new.html.haml deleted 100644 → 0
View file @ 379f4841
This diff is collapsed.
app/views/layouts/header/_new_dropdown.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/layouts/nav/_admin.html.haml deleted 100644 → 0
View file @ 379f4841
This diff is collapsed.
app/views/layouts/nav/_admin_settings.html.haml deleted 100644 → 0
View file @ 379f4841
This diff is collapsed.
app/views/layouts/nav/_dashboard.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/layouts/nav/_explore.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/layouts/nav/_group.html.haml deleted 100644 → 0
View file @ 379f4841
This diff is collapsed.
app/views/layouts/nav/_new_dashboard.html.haml deleted 100644 → 0
View file @ 379f4841
This diff is collapsed.
app/views/layouts/nav/_new_explore.html.haml deleted 100644 → 0
View file @ 379f4841
This diff is collapsed.
app/views/layouts/nav/_profile.html.haml deleted 100644 → 0
View file @ 379f4841
This diff is collapsed.
app/views/layouts/nav/_project.html.haml deleted 100644 → 0
View file @ 379f4841
This diff is collapsed.
app/views/layouts/profile.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/layouts/project.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/profiles/keys/_key.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/profiles/passwords/edit.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/profiles/show.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/projects/activity.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/projects/branches/index.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/projects/commit/show.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/projects/commits/show.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/projects/compare/index.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/projects/compare/show.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/projects/edit.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/projects/empty.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/projects/graphs/charts.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/projects/graphs/show.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/projects/issues/index.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/projects/issues/show.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/projects/jobs/index.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/projects/jobs/show.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/projects/labels/index.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/projects/network/show.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/projects/pipelines/show.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/projects/releases/edit.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/projects/runners/_form.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/projects/runners/show.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/projects/services/edit.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/projects/settings/_head.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/projects/show.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/projects/snippets/edit.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/projects/snippets/index.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/projects/snippets/new.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/projects/snippets/show.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/projects/tags/index.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/projects/tags/show.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/projects/wikis/pages.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/projects/wikis/show.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/shared/boards/_show.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/shared/icons/_icon_arrow_right.svg.erb 0 → 100644
View file @ 7f7edbcc
This diff is collapsed.
app/views/shared/icons/_icon_group_webhook.svg 0 → 100644
View file @ 7f7edbcc
This diff is collapsed.
app/views/shared/issuable/_form.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/shared/snippets/_header.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/views/snippets/show.html.haml
View file @ 7f7edbcc
This diff is collapsed.
app/workers/geo/repository_sync_worker.rb
View file @ 7f7edbcc
This diff is collapsed.
changelogs/unreleased-ee/37197-approved-gap.yml 0 → 100644
View file @ 7f7edbcc
This diff is collapsed.
changelogs/unreleased-ee/missing-indexes-to-geo-event-log.yml 0 → 100644
View file @ 7f7edbcc
This diff is collapsed.
changelogs/unreleased-ee/tc-fix-retrying-same-repos.yml 0 → 100644
View file @ 7f7edbcc
This diff is collapsed.
changelogs/unreleased-ee/tc-geo-faulty-primary-db-key.yml 0 → 100644
View file @ 7f7edbcc
This diff is collapsed.
changelogs/unreleased/34261-move-move-to-sidebar.yml 0 → 100644
View file @ 7f7edbcc
This diff is collapsed.
changelogs/unreleased/35686-unescape-wiki-title.yml 0 → 100644
View file @ 7f7edbcc
This diff is collapsed.
changelogs/unreleased/36061-mr-ref-instrument.yml 0 → 100644
View file @ 7f7edbcc
This diff is collapsed.
changelogs/unreleased/36860-migrate-issues-author.yml 0 → 100644
View file @ 7f7edbcc
This diff is collapsed.
changelogs/unreleased/add_message_to_the_404_page.yml 0 → 100644
View file @ 7f7edbcc
This diff is collapsed.
changelogs/unreleased/collapsable-pipeline-settings.yml 0 → 100644
View file @ 7f7edbcc
This diff is collapsed.
changelogs/unreleased/fix-npm-security-updates.yml 0 → 100644
View file @ 7f7edbcc
This diff is collapsed.
changelogs/unreleased/gitaly-post-upload-pack-mandatory.yml 0 → 100644
View file @ 7f7edbcc
This diff is collapsed.
changelogs/unreleased/issue_36820.yml 0 → 100644
View file @ 7f7edbcc
This diff is collapsed.
changelogs/unreleased/move-action.yml 0 → 100644
View file @ 7f7edbcc
This diff is collapsed.
changelogs/unreleased/rouge-2-2-1.yml 0 → 100644
View file @ 7f7edbcc
This diff is collapsed.
changelogs/unreleased/sh-filter-csrf-params.yml 0 → 100644
View file @ 7f7edbcc
This diff is collapsed.
changelogs/unreleased/sidebar-cache-updates.yml 0 → 100644
View file @ 7f7edbcc
This diff is collapsed.
changelogs/unreleased/zj-disable-pages-in-subgroups.yml 0 → 100644
View file @ 7f7edbcc
This diff is collapsed.
config/application.rb
View file @ 7f7edbcc
This diff is collapsed.
config/initializers/8_metrics.rb
View file @ 7f7edbcc
This diff is collapsed.
config/initializers/sentry.rb
View file @ 7f7edbcc
This diff is collapsed.
config/initializers/session_store.rb
View file @ 7f7edbcc
This diff is collapsed.
config/routes/project.rb
View file @ 7f7edbcc
This diff is collapsed.
db/migrate/20170816133938_add_access_level_to_ci_runners.rb 0 → 100644
View file @ 7f7edbcc
This diff is collapsed.
db/migrate/20170816133940_add_protected_to_ci_builds.rb 0 → 100644
View file @ 7f7edbcc
This diff is collapsed.
db/migrate/20170816143940_add_protected_to_ci_pipelines.rb 0 → 100644
View file @ 7f7edbcc
This diff is collapsed.
db/migrate/20170816153940_add_index_on_ci_builds_protected.rb 0 → 100644
View file @ 7f7edbcc
This diff is collapsed.
db/migrate/20170825104051_migrate_issues_to_ghost_user.rb 0 → 100644
View file @ 7f7edbcc
This diff is collapsed.
db/migrate/20170901071411_add_foreign_key_to_issue_author.rb 0 → 100644
View file @ 7f7edbcc
This diff is collapsed.
db/schema.rb
View file @ 7f7edbcc
This diff is collapsed.
doc/README.md
View file @ 7f7edbcc
This diff is collapsed.
doc/administration/integration/koding.md
View file @ 7f7edbcc
This diff is collapsed.
doc/api/projects.md
View file @ 7f7edbcc
This diff is collapsed.
doc/api/runners.md
View file @ 7f7edbcc
This diff is collapsed.
doc/api/settings.md
View file @ 7f7edbcc
This diff is collapsed.
doc/ci/environments.md
View file @ 7f7edbcc
This diff is collapsed.
doc/ci/runners/README.md
View file @ 7f7edbcc
This diff is collapsed.
doc/ci/runners/img/protected_runners_check_box.png 0 → 100644
View file @ 7f7edbcc
This diff is collapsed.
doc/ci/ssh_keys/README.md
View file @ 7f7edbcc
This diff is collapsed.
doc/development/ee_features.md
View file @ 7f7edbcc
This diff is collapsed.
doc/install/kubernetes/gitlab_chart.md
View file @ 7f7edbcc
This diff is collapsed.
doc/install/kubernetes/gitlab_omnibus.md
View file @ 7f7edbcc
This diff is collapsed.
doc/install/kubernetes/index.md
View file @ 7f7edbcc
This diff is collapsed.
doc/integration/README.md
View file @ 7f7edbcc
This diff is collapsed.
doc/security/README.md
View file @ 7f7edbcc
This diff is collapsed.
doc/security/img/ssh_keys_restrictions_settings.png 0 → 100644
View file @ 7f7edbcc
This diff is collapsed.
doc/security/ssh_keys_restrictions.md 0 → 100644
View file @ 7f7edbcc
This diff is collapsed.
doc/user/project/index.md
View file @ 7f7edbcc
This diff is collapsed.
doc/user/project/issues/img/sidebar_move_issue.png 0 → 100644
View file @ 7f7edbcc
This diff is collapsed.
doc/user/project/issues/index.md
View file @ 7f7edbcc
This diff is collapsed.
doc/user/project/issues/moving_issues.md 0 → 100644
View file @ 7f7edbcc
This diff is collapsed.
doc/user/project/koding.md
View file @ 7f7edbcc
This diff is collapsed.
doc/user/project/quick_actions.md
View file @ 7f7edbcc
This diff is collapsed.
ee/app/models/ee/project.rb
View file @ 7f7edbcc
This diff is collapsed.
ee/app/models/ssh_host_key.rb
View file @ 7f7edbcc
This diff is collapsed.
ee/app/policies/ee/group_policy.rb
View file @ 7f7edbcc
This diff is collapsed.
ee/app/workers/ee/post_receive.rb
View file @ 7f7edbcc
This diff is collapsed.
features/steps/explore/projects.rb
View file @ 7f7edbcc
This diff is collapsed.
features/steps/project/pages.rb
View file @ 7f7edbcc
This diff is collapsed.
features/steps/project/redirects.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/api/access_requests.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/api/award_emoji.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/api/boards.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/api/commit_statuses.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/api/deploy_keys.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/api/deployments.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/api/entities.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/api/environments.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/api/events.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/api/group_milestones.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/api/group_variables.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/api/groups.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/api/helpers/internal_helpers.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/api/helpers/runner.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/api/internal.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/api/issues.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/api/jobs.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/api/labels.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/api/members.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/api/merge_request_diffs.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/api/merge_requests.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/api/notes.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/api/notification_settings.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/api/pipeline_schedules.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/api/pipelines.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/api/project_hooks.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/api/project_milestones.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/api/project_snippets.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/api/projects.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/api/repositories.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/api/runners.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/api/services.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/api/settings.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/api/subscriptions.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/api/todos.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/api/triggers.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/api/variables.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/email_template_interceptor.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/gitlab/asciidoc.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/gitlab/auth.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/gitlab/ci/stage/seed.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/gitlab/current_settings.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/gitlab/git/repository.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/gitlab/git_access.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/gitlab/gon_helper.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/gitlab/key_fingerprint.rb deleted 100644 → 0
View file @ 379f4841
This diff is collapsed.
lib/gitlab/metrics/influx_db.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/gitlab/middleware/readonly_geo.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/gitlab/mirror.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/gitlab/performance_bar.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/gitlab/polling_interval.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/gitlab/protocol_access.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/gitlab/recaptcha.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/gitlab/reference_counter.rb 0 → 100644
View file @ 7f7edbcc
This diff is collapsed.
lib/gitlab/sentry.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/gitlab/shell.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/gitlab/ssh_public_key.rb 0 → 100644
View file @ 7f7edbcc
This diff is collapsed.
lib/gitlab/url_sanitizer.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/gitlab/usage_data.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/gitlab/workhorse.rb
View file @ 7f7edbcc
This diff is collapsed.
lib/tasks/gitlab/artifacts.rake
View file @ 7f7edbcc
This diff is collapsed.
lib/tasks/gitlab/info.rake
View file @ 7f7edbcc
This diff is collapsed.
lib/tasks/import.rake
View file @ 7f7edbcc
This diff is collapsed.
locale/bg/gitlab.po
View file @ 7f7edbcc
This diff is collapsed.
locale/de/gitlab.po
View file @ 7f7edbcc
This diff is collapsed.
locale/eo/gitlab.po
View file @ 7f7edbcc
This diff is collapsed.
locale/es/gitlab.po
View file @ 7f7edbcc
This diff is collapsed.
locale/fr/gitlab.po
View file @ 7f7edbcc
This diff is collapsed.
locale/gitlab.pot
View file @ 7f7edbcc
This diff is collapsed.
locale/it/gitlab.po
View file @ 7f7edbcc
This diff is collapsed.
locale/ja/gitlab.po
View file @ 7f7edbcc
This diff is collapsed.
locale/ko/gitlab.po
View file @ 7f7edbcc
This diff is collapsed.
locale/pt_BR/gitlab.po
View file @ 7f7edbcc
This diff is collapsed.
locale/ru/gitlab.po
View file @ 7f7edbcc
This diff is collapsed.
locale/uk/gitlab.po
View file @ 7f7edbcc
This diff is collapsed.
locale/zh_CN/gitlab.po
View file @ 7f7edbcc
This diff is collapsed.
locale/zh_HK/gitlab.po
View file @ 7f7edbcc
This diff is collapsed.
locale/zh_TW/gitlab.po
View file @ 7f7edbcc
This diff is collapsed.
package.json
View file @ 7f7edbcc
This diff is collapsed.
public/404.html
View file @ 7f7edbcc
This diff is collapsed.
spec/ee/spec/features/issues/form_spec.rb
View file @ 7f7edbcc
This diff is collapsed.
spec/ee/spec/models/ee/project_spec.rb
View file @ 7f7edbcc
This diff is collapsed.
spec/ee/spec/models/ssh_host_key_spec.rb
View file @ 7f7edbcc
This diff is collapsed.
spec/factories/ci/builds.rb
View file @ 7f7edbcc
This diff is collapsed.
spec/factories/ci/pipelines.rb
View file @ 7f7edbcc
This diff is collapsed.
spec/factories/ci/runners.rb
View file @ 7f7edbcc
This diff is collapsed.
spec/factories/keys.rb
View file @ 7f7edbcc
This diff is collapsed.
spec/factories/projects.rb
View file @ 7f7edbcc
This diff is collapsed.
spec/features/admin/admin_settings_spec.rb
View file @ 7f7edbcc
This diff is collapsed.
spec/features/issues/form_spec.rb
View file @ 7f7edbcc
This diff is collapsed.
spec/features/issues/issue_detail_spec.rb
View file @ 7f7edbcc
This diff is collapsed.
spec/features/issues/move_spec.rb
View file @ 7f7edbcc
This diff is collapsed.
spec/features/merge_requests/form_spec.rb
View file @ 7f7edbcc
This diff is collapsed.
spec/features/profiles/keys_spec.rb
View file @ 7f7edbcc
This diff is collapsed.
spec/features/profiles/password_spec.rb
View file @ 7f7edbcc
This diff is collapsed.
spec/features/projects/mirror_spec.rb
View file @ 7f7edbcc
This diff is collapsed.
spec/features/projects_spec.rb
View file @ 7f7edbcc
This diff is collapsed.
spec/features/promotion_spec.rb
View file @ 7f7edbcc
This diff is collapsed.
spec/features/runners_spec.rb
View file @ 7f7edbcc
This diff is collapsed.
spec/helpers/groups_helper_spec.rb
View file @ 7f7edbcc
This diff is collapsed.
spec/helpers/version_check_helper_spec.rb
View file @ 7f7edbcc
This diff is collapsed.
spec/javascripts/gl_dropdown_spec.js
View file @ 7f7edbcc
This diff is collapsed.
spec/javascripts/pretty_time_spec.js
View file @ 7f7edbcc
This diff is collapsed.
spec/javascripts/project_title_spec.js deleted 100644 → 0
View file @ 379f4841
This diff is collapsed.
spec/javascripts/sidebar/mock_data.js
View file @ 7f7edbcc
This diff is collapsed.
spec/javascripts/sidebar/sidebar_move_issue_spec.js 0 → 100644
View file @ 7f7edbcc
This diff is collapsed.
spec/lib/gitlab/auth_spec.rb
View file @ 7f7edbcc
This diff is collapsed.
spec/lib/gitlab/ci/stage/seed_spec.rb
View file @ 7f7edbcc
This diff is collapsed.
spec/lib/gitlab/git_access_spec.rb
View file @ 7f7edbcc
This diff is collapsed.
spec/lib/gitlab/key_fingerprint_spec.rb deleted 100644 → 0
View file @ 379f4841
This diff is collapsed.
spec/lib/gitlab/reference_counter_spec.rb 0 → 100644
View file @ 7f7edbcc
This diff is collapsed.
spec/lib/gitlab/ssh_public_key_spec.rb 0 → 100644
View file @ 7f7edbcc
This diff is collapsed.
spec/lib/gitlab/url_sanitizer_spec.rb
View file @ 7f7edbcc
This diff is collapsed.
spec/lib/gitlab/workhorse_spec.rb
View file @ 7f7edbcc
This diff is collapsed.
spec/migrations/migrate_issues_to_ghost_user_spec.rb 0 → 100644
View file @ 7f7edbcc
This diff is collapsed.
spec/models/application_setting_spec.rb
View file @ 7f7edbcc
This diff is collapsed.
spec/models/ci/build_spec.rb
View file @ 7f7edbcc
This diff is collapsed.
spec/models/ci/runner_spec.rb
View file @ 7f7edbcc
This diff is collapsed.
spec/models/commit_spec.rb
View file @ 7f7edbcc
This diff is collapsed.
spec/models/issue_spec.rb
View file @ 7f7edbcc
This diff is collapsed.
spec/models/key_spec.rb
View file @ 7f7edbcc
This diff is collapsed.
spec/models/merge_request_spec.rb
View file @ 7f7edbcc
This diff is collapsed.
spec/models/project_spec.rb
View file @ 7f7edbcc
This diff is collapsed.
spec/models/repository_spec.rb
View file @ 7f7edbcc
This diff is collapsed.
spec/models/wiki_page_spec.rb
View file @ 7f7edbcc
This diff is collapsed.
spec/requests/api/commit_statuses_spec.rb
View file @ 7f7edbcc
This diff is collapsed.
spec/requests/api/commits_spec.rb
View file @ 7f7edbcc
This diff is collapsed.
spec/requests/api/internal_spec.rb
View file @ 7f7edbcc
This diff is collapsed.
spec/requests/api/runners_spec.rb
View file @ 7f7edbcc
This diff is collapsed.
spec/requests/api/settings_spec.rb
View file @ 7f7edbcc
This diff is collapsed.
spec/requests/api/v3/commits_spec.rb
View file @ 7f7edbcc
This diff is collapsed.
spec/requests/lfs_http_spec.rb
View file @ 7f7edbcc
This diff is collapsed.
spec/services/issues/update_service_spec.rb
View file @ 7f7edbcc
This diff is collapsed.
spec/support/cycle_analytics_helpers.rb
View file @ 7f7edbcc
This diff is collapsed.
spec/support/stub_env.rb
View file @ 7f7edbcc
This diff is collapsed.
spec/views/help/index.html.haml_spec.rb
View file @ 7f7edbcc
This diff is collapsed.
spec/views/layouts/_head.html.haml_spec.rb
View file @ 7f7edbcc
This diff is collapsed.
spec/views/projects/edit.html.haml_spec.rb
View file @ 7f7edbcc
This diff is collapsed.
yarn.lock
View file @ 7f7edbcc
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