Skip to content

G
gitlab-ce
Commit d6e7c693 authored by Valery Sizov's avatar Valery Sizov
Browse files
Options

Merge CE to EE with all the conflicts [ckip ci]

parents 726ae97f 14046b9c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 6113 additions and 2784 deletions
.eslintignore
View file @ d6e7c693
/coverage/
/coverage-javascript/
/public/
/tmp/
......
.eslintrc
View file @ d6e7c693
{
"env": {
"jquery": true,
"browser": true,
"es6": true
},
"extends": "airbnb",
"extends": "airbnb-base",
"globals": {
"$": false,
"_": false,
"gl": false,
"gon": false,
"jQuery": false
"gon": false
},
"plugins": [
"filenames"
......
.gitlab-ci.yml
View file @ d6e7c693
......@@ -227,6 +227,29 @@ rake brakeman: *exec
rake flay: *exec
license_finder: *exec
rake downtime_check: *exec
<<<<<<< HEAD
=======
rake ee_compat_check:
<<: *exec
only:
- branches@gitlab-org/gitlab-ce
except:
- master
- tags
- /^[\d-]+-stable(-ee)?$/
allow_failure: yes
cache:
key: "ruby231-ee_compat_check_repo"
paths:
- ee_compat_check/repo/
- vendor/ruby
artifacts:
name: "${CI_BUILD_NAME}_${CI_BUILD_REF_NAME}_${CI_BUILD_REF}"
when: on_failure
expire_in: 10d
paths:
- ee_compat_check/patches/*.patch
>>>>>>> 14046b9c734e5e6506d63276f39f3f9d770c3699
rake db:migrate:reset:
stage: test
......
Gemfile
View file @ d6e7c693
......@@ -73,7 +73,7 @@ gem 'github-linguist', '~> 4.7.0', require: 'linguist'
# API
gem 'grape', '~> 0.15.0'
gem 'grape-entity', '~> 0.4.2'
gem 'grape-entity', '~> 0.6.0'
gem 'rack-cors', '~> 0.4.0', require: 'rack/cors'
# Pagination
......@@ -90,10 +90,8 @@ gem 'dropzonejs-rails', '~> 0.7.1'
# for backups
gem 'fog-aws', '~> 0.9'
gem 'fog-azure', '~> 0.0'
gem 'fog-core', '~> 1.40'
gem 'fog-local', '~> 0.3'
gem 'fog-google', '~> 0.3'
gem 'fog-openstack', '~> 0.1'
gem 'fog-rackspace', '~> 0.1.1'
......@@ -145,7 +143,7 @@ gem 'acts-as-taggable-on', '~> 4.0'
# Background jobs
gem 'sidekiq', '~> 4.2'
gem 'sidekiq-cron', '~> 0.4.0'
gem 'sidekiq-cron', '~> 0.4.4'
gem 'redis-namespace', '~> 1.5.2'
gem 'sidekiq-limit_fetch', '~> 3.4'
......@@ -322,6 +320,8 @@ group :development, :test do
gem 'knapsack', '~> 1.11.0'
gem 'activerecord_sane_schema_dumper', '0.2'
gem 'stackprof', '~> 0.2.10'
end
group :test do
......
Gemfile.lock
View file @ d6e7c693
......@@ -66,21 +66,6 @@ GEM
descendants_tracker (~> 0.0.4)
ice_nine (~> 0.11.0)
thread_safe (~> 0.3, >= 0.3.1)
azure (0.7.5)
addressable (~> 2.3)
azure-core (~> 0.1)
faraday (~> 0.9)
faraday_middleware (~> 0.10)
json (~> 1.8)
mime-types (>= 1, < 3.0)
nokogiri (~> 1.6)
systemu (~> 2.6)
thor (~> 0.19)
uuid (~> 2.0)
azure-core (0.1.2)
faraday (~> 0.9)
faraday_middleware (~> 0.10)
nokogiri (~> 1.6)
babel-source (5.8.35)
babel-transpiler (0.7.0)
babel-source (>= 4.0, < 6)
......@@ -230,19 +215,10 @@ GEM
fog-json (~> 1.0)
fog-xml (~> 0.1)
ipaddress (~> 0.8)
fog-azure (0.0.2)
azure (~> 0.6)
fog-core (~> 1.27)
fog-json (~> 1.0)
fog-xml (~> 0.1)
fog-core (1.42.0)
builder
excon (~> 0.49)
formatador (~> 0.2)
fog-google (0.3.2)
fog-core
fog-json
fog-xml
fog-json (1.0.2)
fog-core (~> 1.0)
multi_json (~> 1.10)
......@@ -338,7 +314,7 @@ GEM
rack-accept
rack-mount
virtus (>= 1.0.0)
grape-entity (0.4.8)
grape-entity (0.6.0)
activesupport
multi_json (>= 1.3.2)
gssapi (1.2.0)
......@@ -421,8 +397,6 @@ GEM
rb-inotify (>= 0.9)
loofah (2.0.3)
nokogiri (>= 1.5.9)
macaddr (1.7.1)
systemu (~> 2.6.2)
mail (2.6.4)
mime-types (>= 1.16, < 4)
mail_room (0.9.0)
......@@ -700,10 +674,10 @@ GEM
connection_pool (~> 2.2, >= 2.2.0)
rack-protection (~> 1.5)
redis (~> 3.2, >= 3.2.1)
sidekiq-cron (0.4.0)
sidekiq-cron (0.4.4)
redis-namespace (>= 1.5.2)
rufus-scheduler (>= 2.0.24)
sidekiq (>= 4.0.0)
sidekiq (>= 4.2.1)
sidekiq-limit_fetch (3.4.0)
sidekiq (>= 4)
simplecov (0.12.0)
......@@ -741,6 +715,7 @@ GEM
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
stackprof (0.2.10)
state_machines (0.4.0)
state_machines-activemodel (0.4.0)
activemodel (>= 4.1, < 5.1)
......@@ -752,7 +727,6 @@ GEM
sys-filesystem (1.1.6)
ffi
sysexits (1.2.0)
systemu (2.6.5)
teaspoon (1.1.5)
railties (>= 3.2.5, < 6)
teaspoon-jasmine (2.2.0)
......@@ -792,11 +766,14 @@ GEM
get_process_mem (~> 0)
unicorn (>= 4, < 6)
uniform_notifier (1.10.0)
<<<<<<< HEAD
uuid (2.3.8)
macaddr (~> 1.0)
validates_hostname (1.0.5)
activerecord (>= 3.0)
activesupport (>= 3.0)
=======
>>>>>>> 14046b9c734e5e6506d63276f39f3f9d770c3699
version_sorter (2.1.0)
virtus (1.0.5)
axiom-types (~> 0.1)
......@@ -878,9 +855,7 @@ DEPENDENCIES
ffaker (~> 2.0.0)
flay (~> 2.6.1)
fog-aws (~> 0.9)
fog-azure (~> 0.0)
fog-core (~> 1.40)
fog-google (~> 0.3)
fog-local (~> 0.3)
fog-openstack (~> 0.1)
fog-rackspace (~> 0.1.1)
......@@ -900,8 +875,12 @@ DEPENDENCIES
gollum-rugged_adapter (~> 0.4.2)
gon (~> 6.1.0)
grape (~> 0.15.0)
<<<<<<< HEAD
grape-entity (~> 0.4.2)
gssapi
=======
grape-entity (~> 0.6.0)
>>>>>>> 14046b9c734e5e6506d63276f39f3f9d770c3699
haml_lint (~> 0.18.2)
hamlit (~> 2.6.1)
health_check (~> 2.2.0)
......@@ -989,7 +968,7 @@ DEPENDENCIES
sham_rack (~> 1.3.6)
shoulda-matchers (~> 2.8.0)
sidekiq (~> 4.2)
sidekiq-cron (~> 0.4.0)
sidekiq-cron (~> 0.4.4)
sidekiq-limit_fetch (~> 3.4)
simplecov (= 0.12.0)
slack-notifier (~> 1.2.0)
......@@ -1001,6 +980,7 @@ DEPENDENCIES
spring-commands-teaspoon (~> 0.0.2)
sprockets (~> 3.7.0)
sprockets-es6 (~> 0.9.2)
stackprof (~> 0.2.10)
state_machines-activerecord (~> 0.4.0)
sys-filesystem (~> 1.1.6)
teaspoon (~> 1.1.0)
......
README.md
View file @ d6e7c693
# GitLab
[![Build status](https://gitlab.com/gitlab-org/gitlab-ce/badges/master/build.svg)](https://gitlab.com/gitlab-org/gitlab-ce/commits/master)
[![CE coverage report](https://gitlab.com/gitlab-org/gitlab-ce/badges/master/coverage.svg?job=coverage)](http://gitlab-org.gitlab.io/gitlab-ce/coverage-ruby)
[![CE coverage report](https://gitlab.com/gitlab-org/gitlab-ce/badges/master/coverage.svg?job=coverage)](https://gitlab-org.gitlab.io/gitlab-ce/coverage-ruby)
[![Code Climate](https://codeclimate.com/github/gitlabhq/gitlabhq.svg)](https://codeclimate.com/github/gitlabhq/gitlabhq)
[![Core Infrastructure Initiative Best Practices](https://bestpractices.coreinfrastructure.org/projects/42/badge)](https://bestpractices.coreinfrastructure.org/projects/42)
......@@ -114,7 +114,7 @@ For more information please see the [architecture documentation](https://docs.gi
## UX design
Please adhere to the [UX Guide](doc/development/ux_guide/readme.md) when creating designs and implementing code.
Please adhere to the [UX Guide](doc/development/ux_guide/index.md) when creating designs and implementing code.
## Third-party applications
......
app/assets/javascripts/application.js
View file @ d6e7c693
......@@ -58,32 +58,11 @@
(function () {
document.addEventListener('page:fetch', gl.utils.cleanupBeforeFetch);
window.addEventListener('hashchange', gl.utils.shiftWindow);
// automatically adjust scroll position for hash urls taking the height of the navbar into account
// https://github.com/twitter/bootstrap/issues/1768
window.adjustScroll = function() {
var navbar = document.querySelector('.navbar-gitlab');
var subnav = document.querySelector('.layout-nav');
var fixedTabs = document.querySelector('.js-tabs-affix');
adjustment = 0;
if (navbar) adjustment -= navbar.offsetHeight;
if (subnav) adjustment -= subnav.offsetHeight;
if (fixedTabs) adjustment -= fixedTabs.offsetHeight;
return scrollBy(0, adjustment);
};
window.addEventListener("hashchange", adjustScroll);
window.onload = function () {
// Scroll the window to avoid the topnav bar
// https://github.com/twitter/bootstrap/issues/1768
if (location.hash) {
return setTimeout(adjustScroll, 100);
}
};
window.addEventListener('hashchange', gl.utils.handleLocationHash);
window.addEventListener('load', function onLoad() {
window.removeEventListener('load', onLoad, false);
gl.utils.handleLocationHash();
}, false);
$(function () {
var $body = $('body');
......
app/assets/javascripts/boards/components/board_list.js.es6
View file @ d6e7c693
......@@ -80,6 +80,7 @@
},
mounted () {
const options = gl.issueBoards.getBoardSortableDefaultOptions({
scroll: document.querySelectorAll('.boards-list')[0],
group: 'issues',
sort: false,
disabled: this.disabled,
......@@ -88,13 +89,13 @@
const card = this.$refs.issue[e.oldIndex];
card.showDetail = false;
Store.moving.issue = card.issue;
Store.moving.list = card.list;
Store.moving.issue = Store.moving.list.findIssue(+e.item.dataset.issueId);
gl.issueBoards.onStart();
},
onAdd: (e) => {
gl.issueBoards.BoardsStore.moveIssueToList(Store.moving.list, this.list, Store.moving.issue);
gl.issueBoards.BoardsStore.moveIssueToList(Store.moving.list, this.list, Store.moving.issue, e.newIndex);
this.$nextTick(() => {
e.item.remove();
......
app/assets/javascripts/boards/components/board_sidebar.js.es6
View file @ d6e7c693
......@@ -47,7 +47,7 @@
new gl.DueDateSelectors();
new LabelsSelect();
new Sidebar();
new Subscription('.subscription');
gl.Subscription.bindAll('.subscription');
}
});
})();
app/assets/javascripts/boards/models/list.js.es6
View file @ d6e7c693
......@@ -106,9 +106,13 @@ class List {
});
}
addIssue (issue, listFrom) {
addIssue (issue, listFrom, newIndex) {
if (!this.findIssue(issue.id)) {
this.issues.push(issue);
if (newIndex !== undefined) {
this.issues.splice(newIndex, 0, issue);
} else {
this.issues.push(issue);
}
if (this.label) {
issue.addLabel(this.label);
......
app/assets/javascripts/boards/stores/boards_store.js.es6
View file @ d6e7c693
......@@ -94,14 +94,14 @@
});
listFrom.update();
},
moveIssueToList (listFrom, listTo, issue) {
moveIssueToList (listFrom, listTo, issue, newIndex) {
const issueTo = listTo.findIssue(issue.id),
issueLists = issue.getLists(),
listLabels = issueLists.map( listIssue => listIssue.label );
// Add to new lists issues if it doesn't already exist
if (!issueTo) {
listTo.addIssue(issue, listFrom);
listTo.addIssue(issue, listFrom, newIndex);
}
if (listTo.type === 'done' && listFrom.type !== 'backlog') {
......
app/assets/javascripts/commits.js
View file @ d6e7c693
/* eslint-disable func-names, space-before-function-paren, wrap-iife, quotes, consistent-return, no-undef, no-return-assign, no-param-reassign, one-var, no-var, one-var-declaration-per-line, no-unused-vars, prefer-template, object-shorthand, comma-dangle, padded-blocks, max-len */
/* eslint-disable func-names, space-before-function-paren, wrap-iife, quotes, consistent-return, no-undef, no-return-assign, no-param-reassign, one-var, no-var, one-var-declaration-per-line, no-unused-vars, prefer-template, object-shorthand, comma-dangle, padded-blocks, max-len, prefer-arrow-callback */
(function() {
this.CommitsList = (function() {
function CommitsList() {}
......@@ -13,7 +13,9 @@
return false;
}
});
Pager.init(limit, false);
Pager.init(limit, false, false, function() {
gl.utils.localTimeAgo($('.js-timeago'));
});
this.content = $("#commits-list");
this.searchField = $("#commits-search");
return this.initSearch();
......
app/assets/javascripts/cycle_analytics/components/total_time_component.js.es6
View file @ d6e7c693
......@@ -10,10 +10,15 @@
},
template: `
<span class="total-time">
<template v-if="time.days">{{ time.days }} <span>{{ time.days === 1 ? 'day' : 'days' }}</span></template>
<template v-if="time.hours">{{ time.hours }} <span>hr</span></template>
<template v-if="time.mins && !time.days">{{ time.mins }} <span>mins</span></template>
<template v-if="time.seconds && Object.keys(time).length === 1 || time.seconds === 0">{{ time.seconds }} <span>s</span></template>
<template v-if="Object.keys(time).length">
<template v-if="time.days">{{ time.days }} <span>{{ time.days === 1 ? 'day' : 'days' }}</span></template>
<template v-if="time.hours">{{ time.hours }} <span>hr</span></template>
<template v-if="time.mins && !time.days">{{ time.mins }} <span>mins</span></template>
<template v-if="time.seconds && Object.keys(time).length === 1 || time.seconds === 0">{{ time.seconds }} <span>s</span></template>
</template>
<template v-else>
--
</template>
</span>
`,
});
......
app/assets/javascripts/cycle_analytics/cycle_analytics_store.js.es6
View file @ d6e7c693
......@@ -62,9 +62,11 @@
this.state.events = this.decorateEvents(events);
},
decorateEvents(events) {
const newEvents = events;
const newEvents = [];
events.forEach((item) => {
if (!item) return;
newEvents.forEach((item) => {
item.totalTime = item.total_time;
item.author.webUrl = item.author.web_url;
item.author.avatarUrl = item.author.avatar_url;
......@@ -79,6 +81,8 @@
delete item.created_at;
delete item.short_sha;
delete item.commit_url;
newEvents.push(item);
});
return newEvents;
......
app/assets/javascripts/diff_notes/models/discussion.js.es6
View file @ d6e7c693
......@@ -57,14 +57,17 @@ class DiscussionModel {
}
updateHeadline (data) {
const $discussionHeadline = $(`.discussion[data-discussion-id="${this.id}"] .js-discussion-headline`);
const discussionSelector = `.discussion[data-discussion-id="${this.id}"]`;
const $discussionHeadline = $(`${discussionSelector} .js-discussion-headline`);
if (data.discussion_headline_html) {
if ($discussionHeadline.length) {
$discussionHeadline.replaceWith(data.discussion_headline_html);
} else {
$(`.discussion[data-discussion-id="${this.id}"] .discussion-header`).append(data.discussion_headline_html);
$(`${discussionSelector} .discussion-header`).append(data.discussion_headline_html);
}
gl.utils.localTimeAgo($('.js-timeago', `${discussionSelector}`));
} else {
$discussionHeadline.remove();
}
......@@ -74,7 +77,7 @@ class DiscussionModel {
if (!this.canResolve) {
return false;
}
for (const noteId in this.notes) {
const note = this.notes[noteId];
......
app/assets/javascripts/dispatcher.js.es6
View file @ d6e7c693
......@@ -136,8 +136,18 @@
new TreeView();
}
break;
case 'projects:pipelines:builds':
case 'projects:pipelines:show':
new gl.Pipelines();
const { controllerAction } = document.querySelector('.js-pipeline-container').dataset;
new gl.Pipelines({
initTabs: true,
tabsOptions: {
action: controllerAction,
defaultAction: 'pipelines',
parentEl: '.pipelines-tabs',
},
});
break;
case 'groups:activity':
new gl.Activities();
......@@ -216,6 +226,9 @@
new gl.ProtectedBranchCreate();
new gl.ProtectedBranchEditList();
break;
case 'projects:variables:index':
new gl.ProjectVariables();
break;
}
switch (path.first()) {
case 'admin':
......@@ -270,7 +283,7 @@
new NotificationsDropdown();
break;
case 'wikis':
new Wikis();
new gl.Wikis();
shortcut_handler = new ShortcutsNavigation();
new ZenMode();
new GLForm($('.wiki-form'));
......
app/assets/javascripts/environments/components/environment.js.es6
View file @ d6e7c693
......@@ -181,7 +181,7 @@
<div class="environments-container">
<div class="environments-list-loading text-center" v-if="isLoading">
<i class="fa fa-spinner spin"></i>
<i class="fa fa-spinner fa-spin"></i>
</div>
<div class="blank-state blank-state-no-icon"
......
app/assets/javascripts/environments/components/environment_item.js.es6
View file @ d6e7c693
......@@ -23,6 +23,7 @@
window.gl = window.gl || {};
window.gl.environmentsList = window.gl.environmentsList || {};
window.gl.environmentsList.timeagoInstance = new timeago(); // eslint-disable-line
gl.environmentsList.EnvironmentItem = Vue.component('environment-item', {
......@@ -147,15 +148,26 @@
this.model.last_deployment.deployable;
},
/**
* Verifies if the date to be shown is present.
*
* @returns {Boolean|Undefined}
*/
canShowDate() {
return this.model.last_deployment &&
this.model.last_deployment.deployable &&
this.model.last_deployment.deployable !== undefined;
},
/**
* Human readable date.
*
* @returns {String}
*/
createdDate() {
const timeagoInstance = new timeago(); // eslint-disable-line
return timeagoInstance.format(this.model.created_at);
return window.gl.environmentsList.timeagoInstance.format(
this.model.last_deployment.deployable.created_at,
);
},
/**
......@@ -453,7 +465,7 @@
<td>
<span
v-if="!isFolder && model.last_deployment"
v-if="!isFolder && canShowDate"
class="environment-created-date-timeago">
{{createdDate}}
</span>
......
app/assets/javascripts/extensions/array.js → app/assets/javascripts/extensions/array.js.es6
View file @ d6e7c693
......@@ -6,3 +6,19 @@ Array.prototype.first = function() {
Array.prototype.last = function() {
return this[this.length-1];
}
Array.prototype.find = Array.prototype.find || function(predicate, ...args) {
if (!this) throw new TypeError('Array.prototype.find called on null or undefined');
if (typeof predicate !== 'function') throw new TypeError('predicate must be a function');
const list = Object(this);
const thisArg = args[1];
let value = {};
for (let i = 0; i < list.length; i += 1) {
value = list[i];
if (predicate.call(thisArg, value, i, list)) return value;
}
return undefined;
};
app/assets/javascripts/extensions/element.js.es6
View file @ d6e7c693
/* global Element */
/* eslint-disable consistent-return, max-len */
Element.prototype.matches = Element.prototype.matches || Element.prototype.msMatchesSelector;
/* eslint-disable consistent-return, max-len, no-empty, no-plusplus, func-names */
Element.prototype.closest = Element.prototype.closest || function closest(selector, selectedElement = this) {
if (!selectedElement) return;
return selectedElement.matches(selector) ? selectedElement : Element.prototype.closest(selector, selectedElement.parentElement);
};
Element.prototype.matches = Element.prototype.matches ||
Element.prototype.matchesSelector ||
Element.prototype.mozMatchesSelector ||
Element.prototype.msMatchesSelector ||
Element.prototype.oMatchesSelector ||
Element.prototype.webkitMatchesSelector ||
function (s) {
const matches = (this.document || this.ownerDocument).querySelectorAll(s);
let i = matches.length;
while (--i >= 0 && matches.item(i) !== this) {}
return i > -1;
};
app/assets/javascripts/gfm_auto_complete.js.es6
View file @ d6e7c693
......@@ -53,6 +53,27 @@
} else {
return value;
}
},
matcher: function (flag, subtext) {
// The below is taken from At.js source
// Tweaked to commands to start without a space only if char before is a non-word character
// https://github.com/ichord/At.js
var _a, _y, regexp, match;
subtext = subtext.split(' ').pop();
flag = flag.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
_a = decodeURI("%C3%80");
_y = decodeURI("%C3%BF");
regexp = new RegExp("(?:\\B|\\W|\\s)" + flag + "(?!\\W)([A-Za-z" + _a + "-" + _y + "0-9_\'\.\+\-]*)|([^\\x00-\\xff]*)$", 'gi');
match = regexp.exec(subtext);
if (match) {
return match[2] || match[1];
} else {
return null;
}
}
},
setup: _.debounce(function(input) {
......@@ -91,10 +112,12 @@
})(this),
insertTpl: ':${name}:',
data: ['loading'],
startWithSpace: false,
callbacks: {
sorter: this.DefaultOptions.sorter,
filter: this.DefaultOptions.filter,
beforeInsert: this.DefaultOptions.beforeInsert
beforeInsert: this.DefaultOptions.beforeInsert,
matcher: this.DefaultOptions.matcher
}
});
// Team Members
......@@ -112,11 +135,13 @@
insertTpl: '${atwho-at}${username}',
searchKey: 'search',
data: ['loading'],
startWithSpace: false,
alwaysHighlightFirst: true,
callbacks: {
sorter: this.DefaultOptions.sorter,
filter: this.DefaultOptions.filter,
beforeInsert: this.DefaultOptions.beforeInsert,
matcher: this.DefaultOptions.matcher,
beforeSave: function(members) {
return $.map(members, function(m) {
let title = '';
......@@ -157,10 +182,12 @@
})(this),
data: ['loading'],
insertTpl: '${atwho-at}${id}',
startWithSpace: false,
callbacks: {
sorter: this.DefaultOptions.sorter,
filter: this.DefaultOptions.filter,
beforeInsert: this.DefaultOptions.beforeInsert,
matcher: this.DefaultOptions.matcher,
beforeSave: function(issues) {
return $.map(issues, function(i) {
if (i.title == null) {
......@@ -190,7 +217,9 @@
})(this),
insertTpl: '${atwho-at}"${title}"',
data: ['loading'],
startWithSpace: false,
callbacks: {
matcher: this.DefaultOptions.matcher,
sorter: this.DefaultOptions.sorter,
beforeSave: function(milestones) {
return $.map(milestones, function(m) {
......@@ -220,11 +249,13 @@
};
})(this),
data: ['loading'],
startWithSpace: false,
insertTpl: '${atwho-at}${id}',
callbacks: {
sorter: this.DefaultOptions.sorter,
filter: this.DefaultOptions.filter,
beforeInsert: this.DefaultOptions.beforeInsert,
matcher: this.DefaultOptions.matcher,
beforeSave: function(merges) {
return $.map(merges, function(m) {
if (m.title == null) {
......@@ -245,7 +276,9 @@
searchKey: 'search',
displayTpl: this.Labels.template,
insertTpl: '${atwho-at}${title}',
startWithSpace: false,
callbacks: {
matcher: this.DefaultOptions.matcher,
sorter: this.DefaultOptions.sorter,
beforeSave: function(merges) {
var sanitizeLabelTitle;
......
app/assets/javascripts/labels_select.js
View file @ d6e7c693
/* eslint-disable func-names, space-before-function-paren, wrap-iife, no-var, no-underscore-dangle, prefer-arrow-callback, max-len, one-var, no-unused-vars, one-var-declaration-per-line, prefer-template, no-new, consistent-return, object-shorthand, comma-dangle, no-shadow, no-param-reassign, brace-style, vars-on-top, quotes, no-lonely-if, no-else-return, no-undef, semi, dot-notation, no-empty, no-return-assign, camelcase, prefer-spread, padded-blocks, max-len */
/* eslint-disable no-useless-return, func-names, space-before-function-paren, wrap-iife, no-var, no-underscore-dangle, prefer-arrow-callback, max-len, one-var, no-unused-vars, one-var-declaration-per-line, prefer-template, no-new, consistent-return, object-shorthand, comma-dangle, no-shadow, no-param-reassign, brace-style, vars-on-top, quotes, no-lonely-if, no-else-return, no-undef, semi, dot-notation, no-empty, no-return-assign, camelcase, prefer-spread, padded-blocks, max-len */
(function() {
this.LabelsSelect = (function() {
function LabelsSelect() {
......
app/assets/javascripts/lib/utils/bootstrap_linked_tabs.js.es6 0 → 100644
View file @ d6e7c693
/**
* Linked Tabs
*
* Handles persisting and restores the current tab selection and content.
* Reusable component for static content.
*
* ### Example Markup
*
* <ul class="nav-links tab-links">
* <li class="active">
* <a data-action="tab1" data-target="#tab1" data-toggle="tab" href="/path/tab1">
* Tab 1
* </a>
* </li>
* <li class="groups-tab">
* <a data-action="tab2" data-target="#tab2" data-toggle="tab" href="/path/tab2">
* Tab 2
* </a>
* </li>
*
*
* <div class="tab-content">
* <div class="tab-pane" id="tab1">
* Tab 1 Content
* </div>
* <div class="tab-pane" id="tab2">
* Tab 2 Content
* </div>
* </div>
*
*
* ### How to use
*
* new window.gl.LinkedTabs({
* action: "#{controller.action_name}",
* defaultAction: 'tab1',
* parentEl: '.tab-links'
* });
*/
(() => {
window.gl = window.gl || {};
window.gl.LinkedTabs = class LinkedTabs {
/**
* Binds the events and activates de default tab.
*
* @param {Object} options
*/
constructor(options) {
this.options = options || {};
this.defaultAction = this.options.defaultAction;
this.action = this.options.action || this.defaultAction;
if (this.action === 'show') {
this.action = this.defaultAction;
}
this.currentLocation = window.location;
const tabSelector = `${this.options.parentEl} a[data-toggle="tab"]`;
// since this is a custom event we need jQuery :(
$(document)
.off('shown.bs.tab', tabSelector)
.on('shown.bs.tab', tabSelector, e => this.tabShown(e));
this.activateTab(this.action);
}
/**
* Handles the `shown.bs.tab` event to set the currect url action.
*
* @param {type} evt
* @return {Function}
*/
tabShown(evt) {
const source = evt.target.getAttribute('href');
return this.setCurrentAction(source);
}
/**
* Updates the URL with the path that matched the given action.
*
* @param {String} source
* @return {String}
*/
setCurrentAction(source) {
const copySource = source;
copySource.replace(/\/+$/, '');
const newState = `${copySource}${this.currentLocation.search}${this.currentLocation.hash}`;
history.replaceState({
turbolinks: true,
url: newState,
}, document.title, newState);
return newState;
}
/**
* Given the current action activates the correct tab.
* http://getbootstrap.com/javascript/#tab-show
* Note: Will trigger `shown.bs.tab`
*/
activateTab() {
return $(`${this.options.parentEl} a[data-action='${this.action}']`).tab('show');
}
};
})();
app/assets/javascripts/lib/utils/common_utils.js
View file @ d6e7c693
/* eslint-disable func-names, space-before-function-paren, wrap-iife, no-var, no-unused-expressions, no-param-reassign, no-else-return, quotes, object-shorthand, comma-dangle, camelcase, one-var, vars-on-top, one-var-declaration-per-line, no-return-assign, consistent-return, padded-blocks, max-len */
/* eslint-disable func-names, space-before-function-paren, wrap-iife, no-var, no-unused-expressions, no-param-reassign, no-else-return, quotes, object-shorthand, comma-dangle, camelcase, one-var, vars-on-top, one-var-declaration-per-line, no-return-assign, consistent-return, padded-blocks, max-len, prefer-template */
(function() {
(function(w) {
var base;
......@@ -94,10 +94,35 @@
return $(document).off('scroll');
};
w.gl.utils.shiftWindow = function() {
return w.scrollBy(0, -100);
};
// automatically adjust scroll position for hash urls taking the height of the navbar into account
// https://github.com/twitter/bootstrap/issues/1768
w.gl.utils.handleLocationHash = function() {
var hash = w.gl.utils.getLocationHash();
if (!hash) return;
var navbar = document.querySelector('.navbar-gitlab');
var subnav = document.querySelector('.layout-nav');
var fixedTabs = document.querySelector('.js-tabs-affix');
var adjustment = 0;
if (navbar) adjustment -= navbar.offsetHeight;
if (subnav) adjustment -= subnav.offsetHeight;
// scroll to user-generated markdown anchor if we cannot find a match
if (document.getElementById(hash) === null) {
var target = document.getElementById('user-content-' + hash);
if (target && target.scrollIntoView) {
target.scrollIntoView(true);
window.scrollBy(0, adjustment);
}
} else {
// only adjust for fixedTabs when not targeting user-generated content
if (fixedTabs) {
adjustment -= fixedTabs.offsetHeight;
}
window.scrollBy(0, adjustment);
}
};
gl.utils.updateTooltipTitle = function($tooltipEl, newTitle) {
return $tooltipEl.tooltip('destroy').attr('title', newTitle).tooltip('fixTitle');
......
app/assets/javascripts/notes.js
View file @ d6e7c693
/* eslint-disable func-names, space-before-function-paren, no-var, space-before-blocks, prefer-rest-params, wrap-iife, no-use-before-define, camelcase, no-unused-expressions, quotes, max-len, one-var, one-var-declaration-per-line, default-case, prefer-template, no-undef, consistent-return, no-alert, no-return-assign, no-param-reassign, prefer-arrow-callback, no-else-return, comma-dangle, no-new, brace-style, no-lonely-if, vars-on-top, no-unused-vars, semi, indent, no-sequences, no-shadow, newline-per-chained-call, no-useless-escape, radix, padded-blocks, max-len */
/* eslint-disable no-restricted-properties, func-names, space-before-function-paren, no-var, space-before-blocks, prefer-rest-params, wrap-iife, no-use-before-define, camelcase, no-unused-expressions, quotes, max-len, one-var, one-var-declaration-per-line, default-case, prefer-template, no-undef, consistent-return, no-alert, no-return-assign, no-param-reassign, prefer-arrow-callback, no-else-return, comma-dangle, no-new, brace-style, no-lonely-if, vars-on-top, no-unused-vars, semi, indent, no-sequences, no-shadow, newline-per-chained-call, no-useless-escape, radix, padded-blocks, max-len */
/*= require autosave */
/*= require autosize */
......@@ -333,7 +333,7 @@
gl.diffNotesCompileComponents();
}
gl.utils.localTimeAgo($('.js-timeago', note_html), false);
gl.utils.localTimeAgo($('.js-timeago'), false);
return this.updateNotesCount(1);
};
......
app/assets/javascripts/pipelines.js.es6
View file @ d6e7c693
//= require lib/utils/bootstrap_linked_tabs
/* eslint-disable */
((global) => {
class Pipelines {
constructor() {
constructor(options) {
if (options.initTabs && options.tabsOptions) {
new global.LinkedTabs(options.tabsOptions);
}
this.addMarginToBuildColumns();
}
......
app/assets/javascripts/project_variables.js.es6 0 → 100644
View file @ d6e7c693
(() => {
const HIDDEN_VALUE_TEXT = '******';
class ProjectVariables {
constructor() {
this.$revealBtn = $('.js-btn-toggle-reveal-values');
this.$revealBtn.on('click', this.toggleRevealState.bind(this));
}
toggleRevealState(e) {
e.preventDefault();
const oldStatus = this.$revealBtn.attr('data-status');
let newStatus = 'hidden';
let newAction = 'Reveal Values';
if (oldStatus === 'hidden') {
newStatus = 'revealed';
newAction = 'Hide Values';
}
this.$revealBtn.attr('data-status', newStatus);
const $variables = $('.variable-value');
$variables.each((_, variable) => {
const $variable = $(variable);
let newText = HIDDEN_VALUE_TEXT;
if (newStatus === 'revealed') {
newText = $variable.attr('data-value');
}
$variable.text(newText);
});
this.$revealBtn.text(newAction);
}
}
window.gl = window.gl || {};
window.gl.ProjectVariables = ProjectVariables;
})();
app/assets/javascripts/subscription.js deleted 100644 → 0
View file @ 726ae97f
/* eslint-disable func-names, space-before-function-paren, no-var, space-before-blocks, prefer-rest-params, wrap-iife, vars-on-top, no-unused-vars, one-var, one-var-declaration-per-line, camelcase, consistent-return, no-undef, padded-blocks, max-len */
(function() {
var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
this.Subscription = (function() {
function Subscription(container) {
this.toggleSubscription = bind(this.toggleSubscription, this);
var $container;
this.$container = $(container);
this.url = this.$container.attr('data-url');
this.subscribe_button = this.$container.find('.js-subscribe-button');
this.subscription_status = this.$container.find('.subscription-status');
this.subscribe_button.unbind('click').click(this.toggleSubscription);
}
Subscription.prototype.toggleSubscription = function(event) {
var action, btn, current_status;
btn = $(event.currentTarget);
action = btn.find('span').text();
current_status = this.subscription_status.attr('data-status');
btn.addClass('disabled');
if ($('html').hasClass('issue-boards-page')) {
this.url = this.$container.attr('data-url');
}
return $.post(this.url, (function(_this) {
return function() {
var status;
btn.removeClass('disabled');
if ($('html').hasClass('issue-boards-page')) {
Vue.set(gl.issueBoards.BoardsStore.detail.issue, 'subscribed', !gl.issueBoards.BoardsStore.detail.issue.subscribed);
} else {
status = current_status === 'subscribed' ? 'unsubscribed' : 'subscribed';
_this.subscription_status.attr('data-status', status);
action = status === 'subscribed' ? 'Unsubscribe' : 'Subscribe';
btn.find('span').text(action);
_this.subscription_status.find('>div').toggleClass('hidden');
if (btn.attr('data-original-title')) {
return btn.tooltip('hide').attr('data-original-title', action).tooltip('fixTitle');
}
}
};
})(this));
};
return Subscription;
})();
}).call(this);
app/assets/javascripts/subscription.js.es6 0 → 100644
View file @ d6e7c693
/* global Vue */
(() => {
class Subscription {
constructor(containerElm) {
this.containerElm = containerElm;
const subscribeButton = containerElm.querySelector('.js-subscribe-button');
if (subscribeButton) {
// remove class so we don't bind twice
subscribeButton.classList.remove('js-subscribe-button');
subscribeButton.addEventListener('click', this.toggleSubscription.bind(this));
}
}
toggleSubscription(event) {
const button = event.currentTarget;
const buttonSpan = button.querySelector('span');
if (!buttonSpan || button.classList.contains('disabled')) {
return;
}
button.classList.add('disabled');
const isSubscribed = buttonSpan.innerHTML.trim().toLowerCase() !== 'subscribe';
const toggleActionUrl = this.containerElm.dataset.url;
$.post(toggleActionUrl, () => {
button.classList.remove('disabled');
// hack to allow this to work with the issue boards Vue object
if (document.querySelector('html').classList.contains('issue-boards-page')) {
Vue.set(
gl.issueBoards.BoardsStore.detail.issue,
'subscribed',
!gl.issueBoards.BoardsStore.detail.issue.subscribed,
);
} else {
buttonSpan.innerHTML = isSubscribed ? 'Subscribe' : 'Unsubscribe';
}
});
}
static bindAll(selector) {
[].forEach.call(document.querySelectorAll(selector), elm => new Subscription(elm));
}
}
window.gl = window.gl || {};
window.gl.Subscription = Subscription;
})();
app/assets/javascripts/wikis.js deleted 100644 → 0
View file @ 726ae97f
/* eslint-disable func-names, space-before-function-paren, no-var, space-before-blocks, prefer-rest-params, wrap-iife, consistent-return, one-var, one-var-declaration-per-line, no-undef, prefer-template, padded-blocks, max-len */
/*= require latinise */
(function() {
var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
this.Wikis = (function() {
function Wikis() {
this.slugify = bind(this.slugify, this);
$('.new-wiki-page').on('submit', (function(_this) {
return function(e) {
var field, path, slug;
$('[data-error~=slug]').addClass('hidden');
field = $('#new_wiki_path');
slug = _this.slugify(field.val());
if (slug.length > 0) {
path = field.attr('data-wikis-path');
location.href = path + '/' + slug;
return e.preventDefault();
}
};
})(this));
}
Wikis.prototype.dasherize = function(value) {
return value.replace(/[_\s]+/g, '-');
};
Wikis.prototype.slugify = function(value) {
return this.dasherize(value.trim().toLowerCase().latinise());
};
return Wikis;
})();
}).call(this);
app/assets/javascripts/wikis.js.es6 0 → 100644
View file @ d6e7c693
/* eslint-disable no-param-reassign */
/* global Breakpoints */
/*= require latinise */
/*= require breakpoints */
/*= require jquery.nicescroll */
((global) => {
const dasherize = str => str.replace(/[_\s]+/g, '-');
const slugify = str => dasherize(str.trim().toLowerCase().latinise());
class Wikis {
constructor() {
this.bp = Breakpoints.get();
this.sidebarEl = document.querySelector('.js-wiki-sidebar');
this.sidebarExpanded = false;
$(this.sidebarEl).niceScroll();
const sidebarToggles = document.querySelectorAll('.js-sidebar-wiki-toggle');
for (let i = 0; i < sidebarToggles.length; i += 1) {
sidebarToggles[i].addEventListener('click', e => this.handleToggleSidebar(e));
}
this.newWikiForm = document.querySelector('form.new-wiki-page');
if (this.newWikiForm) {
this.newWikiForm.addEventListener('submit', e => this.handleNewWikiSubmit(e));
}
window.addEventListener('resize', () => this.renderSidebar());
this.renderSidebar();
}
handleNewWikiSubmit(e) {
if (!this.newWikiForm) return;
const slugInput = this.newWikiForm.querySelector('#new_wiki_path');
const slug = slugify(slugInput.value);
if (slug.length > 0) {
const wikisPath = slugInput.getAttribute('data-wikis-path');
window.location.href = `${wikisPath}/${slug}`;
e.preventDefault();
}
}
handleToggleSidebar(e) {
e.preventDefault();
this.sidebarExpanded = !this.sidebarExpanded;
this.renderSidebar();
}
sidebarCanCollapse() {
const bootstrapBreakpoint = this.bp.getBreakpointSize();
return bootstrapBreakpoint === 'xs' || bootstrapBreakpoint === 'sm';
}
renderSidebar() {
if (!this.sidebarEl) return;
const { classList } = this.sidebarEl;
if (this.sidebarExpanded || !this.sidebarCanCollapse()) {
if (!classList.contains('right-sidebar-expanded')) {
classList.remove('right-sidebar-collapsed');
classList.add('right-sidebar-expanded');
}
} else if (classList.contains('right-sidebar-expanded')) {
classList.add('right-sidebar-collapsed');
classList.remove('right-sidebar-expanded');
}
}
}
global.Wikis = Wikis;
})(window.gl || (window.gl = {}));
app/assets/stylesheets/framework/avatar.scss
View file @ d6e7c693
......@@ -80,6 +80,7 @@
border-radius: 0;
border: none;
height: auto;
width: 100%;
margin: 0;
align-self: center;
}
......
app/assets/stylesheets/framework/buttons.scss
View file @ d6e7c693
......@@ -15,7 +15,7 @@
@include btn-default;
}
@mixin btn-outline($background, $text, $border, $hover-background, $hover-text, $hover-border) {
@mixin btn-outline($background, $text, $border, $hover-background, $hover-text, $hover-border, $active-background, $active-border) {
background-color: $background;
color: $text;
border-color: $border;
......@@ -23,8 +23,14 @@
&:hover,
&:focus {
background-color: $hover-background;
color: $hover-text;
border-color: $hover-border;
color: $hover-text;
}
&:active {
background-color: $active-background;
border-color: $active-border;
color: $hover-text;
}
}
......@@ -82,11 +88,11 @@
}
@mixin btn-gray {
@include btn-color($gray-light, $border-gray-light, $gray-normal, $border-gray-light, $gray-dark, $border-gray-dark, $gl-gray-dark);
@include btn-color($gray-light, $border-gray-light, $gray-normal, $border-gray-normal, $gray-dark, $border-gray-dark, $gl-gray-dark);
}
@mixin btn-white {
@include btn-color($white-light, $border-color, $white-normal, $border-white-normal, $white-dark, $border-white-dark, $btn-white-active);
@include btn-color($white-light, $border-color, $white-normal, $border-white-normal, $white-dark, $border-white-dark, $gl-text-color);
}
@mixin btn-with-margin {
......@@ -139,11 +145,11 @@
&.btn-new,
&.btn-create,
&.btn-save {
@include btn-outline($white-light, $green-normal, $green-normal, $green-light, $white-light, $green-light);
@include btn-outline($white-light, $border-green-light, $border-green-light, $green-light, $white-light, $border-green-light, $green-normal, $border-green-normal);
}
&.btn-remove {
@include btn-outline($white-light, $red-normal, $red-normal, $red-light, $white-light, $red-light);
@include btn-outline($white-light, $border-red-light, $border-red-light, $red-light, $white-light, $border-red-light, $red-normal, $border-red-normal);
}
}
......@@ -165,11 +171,11 @@
}
&.btn-close {
@include btn-outline($white-light, $orange-normal, $orange-normal, $orange-light, $white-light, $orange-light);
@include btn-outline($white-light, $border-orange-light, $border-orange-light, $orange-light, $white-light, $border-orange-light, $orange-normal, $border-orange-normal);
}
&.btn-spam {
@include btn-outline($white-light, $red-normal, $red-normal, $red-light, $white-light, $red-light);
@include btn-outline($white-light, $border-red-light, $border-red-light, $red-light, $white-light, $border-red-light, $red-normal, $border-red-normal);
}
&.btn-danger,
......@@ -199,7 +205,7 @@
}
.fa-caret-down,
.fa-caret-up {
.fa-chevron-down {
margin-left: 5px;
}
......@@ -351,7 +357,7 @@
.btn-inverted {
&-secondary {
@include btn-outline($white-light, $blue-normal, $blue-normal, $blue-light, $white-light, $blue-light);
@include btn-outline($white-light, $border-blue-light, $border-blue-light, $blue-light, $white-light, $border-blue-light, $blue-normal, $border-blue-normal);
}
}
......
app/assets/stylesheets/framework/calendar.scss
View file @ d6e7c693
......@@ -2,7 +2,7 @@
padding-left: 0;
padding-right: 0;
@media (min-width: $screen-sm-min) and (max-width: $screen-lg-min) {
@media (min-width: $screen-sm-min) and (max-width: $screen-md-max) {
overflow-x: scroll;
}
}
......
app/assets/stylesheets/framework/dropdowns.scss
View file @ d6e7c693
......@@ -8,6 +8,12 @@
}
}
@mixin chevron-active {
.fa-chevron-down {
color: $dropdown-toggle-hover-icon-color;
}
}
.open {
.dropdown-menu,
.dropdown-menu-nav {
......@@ -19,53 +25,27 @@
}
}
.dropdown-toggle,
.dropdown-menu-toggle {
@include chevron-active;
border-color: $dropdown-toggle-hover-border-color;
.fa {
color: $dropdown-toggle-hover-icon-color;
}
}
}
.dropdown-menu-toggle {
position: relative;
width: 160px;
padding: 6px 20px 6px 10px;
.dropdown-toggle {
padding: 6px 8px 6px 10px;
background-color: $dropdown-toggle-bg;
color: $dropdown-toggle-color;
font-size: 15px;
text-align: left;
border: 1px solid $border-color;
border-radius: $border-radius-base;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
.fa {
position: absolute;
top: 10px;
right: 8px;
color: $dropdown-toggle-icon-color;
&.fa-spinner {
font-size: 16px;
margin-top: -8px;
}
}
&.no-outline {
outline: 0;
}
&:hover, {
border-color: $dropdown-toggle-hover-border-color;
.fa {
color: $dropdown-toggle-hover-icon-color;
}
}
&.large {
width: 200px;
}
......@@ -86,6 +66,51 @@
max-width: 100%;
padding-right: 25px;
}
.fa {
color: $dropdown-toggle-icon-color;
}
.fa-chevron-down {
font-size: $dropdown-chevron-size;
position: relative;
top: -3px;
margin-left: 5px;
}
&:hover {
@include chevron-active;
border-color: $dropdown-toggle-hover-border-color;
}
&:focus:active {
@include chevron-active;
border-color: $dropdown-toggle-active-border-color;
}
}
.dropdown-menu-toggle {
@extend .dropdown-toggle;
padding-right: 20px;
position: relative;
width: 160px;
text-overflow: ellipsis;
overflow: hidden;
.fa {
position: absolute;
&.fa-spinner {
font-size: 16px;
margin-top: -8px;
}
}
.fa-chevron-down {
position: absolute;
top: 11px;
right: 8px;
}
}
.dropdown-menu,
......
app/assets/stylesheets/framework/flash.scss
View file @ d6e7c693
......@@ -38,7 +38,7 @@
}
}
@media (max-width: $screen-md-min) {
@media (max-width: $screen-sm-max) {
ul.notes {
.flash-container.timeline-content {
margin-left: 0;
......
app/assets/stylesheets/framework/forms.scss
View file @ d6e7c693
......@@ -98,7 +98,7 @@ label {
}
}
@media(max-width: $screen-sm-min) {
@media(max-width: $screen-xs-max) {
padding: 0 $gl-padding;
.control-label,
......
app/assets/stylesheets/framework/gitlab-theme.scss
View file @ d6e7c693
......@@ -21,7 +21,6 @@
background: $color-darker;
}
.sidebar-header,
.sidebar-action-buttons {
color: $color-light;
background-color: lighten($color-darker, 5%);
......
app/assets/stylesheets/framework/header.scss
View file @ d6e7c693
......@@ -228,7 +228,7 @@ header {
}
.page-sidebar-pinned.right-sidebar-expanded {
@media (max-width: $screen-lg-min) {
@media (max-width: $screen-md-max) {
.header-content .title {
width: 300px;
}
......
app/assets/stylesheets/framework/markdown_area.scss
View file @ d6e7c693
......@@ -56,16 +56,9 @@
.md-header {
.nav-links {
.active {
a {
border-bottom-color: #000;
}
}
a {
padding-top: 0;
line-height: 19px;
border-bottom: 1px solid $border-color;
&.btn.btn-xs {
padding: 2px 5px;
......
app/assets/stylesheets/framework/nav.scss
View file @ d6e7c693
......@@ -51,19 +51,26 @@
margin-bottom: -1px;
font-size: 15px;
line-height: 28px;
color: #959494;
color: $note-toolbar-color;
border-bottom: 2px solid transparent;
&:hover,
&:active,
&:focus {
text-decoration: none;
border-bottom: 2px solid $gray-darkest;
color: $black;
.badge {
color: $black;
}
}
}
&.active a {
border-bottom: 2px solid $link-underline-blue;
color: $black;
font-weight: 600;
}
.badge {
......@@ -85,14 +92,20 @@
li {
&.active a {
border-bottom: none;
color: $link-underline-blue;
}
a {
margin: 0;
padding: 11px 10px 9px;
}
&.active a {
border-bottom: none;
color: $link-underline-blue;
&:hover,
&:active,
&:focus {
border-bottom: none;
}
}
}
}
......@@ -110,7 +123,7 @@
line-height: 28px;
/* Small devices (phones, tablets, 768px and lower) */
@media (max-width: $screen-sm-min) {
@media (max-width: $screen-xs-max) {
width: 100%;
}
}
......@@ -310,37 +323,9 @@
height: 51px;
li {
a {
padding-top: 10px;
}
a,
i {
color: $layout-link-gray;
}
&.active {
a,
i {
color: $black;
}
svg {
path,
polygon {
fill: $black;
}
}
}
&:hover {
a,
i {
color: $black;
}
}
}
}
}
......
app/assets/stylesheets/framework/pagination.scss
View file @ d6e7c693
......@@ -43,7 +43,7 @@
/**
* Small screen pagination
*/
@media (max-width: $screen-xs) {
@media (max-width: $screen-xs-min) {
.gl-pagination {
.pagination li a {
padding: 6px 10px;
......@@ -62,7 +62,7 @@
/**
* Medium screen pagination
*/
@media (min-width: $screen-xs) and (max-width: $screen-md-max) {
@media (min-width: $screen-xs-min) and (max-width: $screen-md-max) {
.gl-pagination {
.page {
display: none;
......
app/assets/stylesheets/framework/sidebar.scss
View file @ d6e7c693
......@@ -59,11 +59,6 @@
padding: 0 !important;
}
.sidebar-header {
padding: 11px 22px 12px;
font-size: 20px;
}
li {
&.separate-item {
padding-top: 10px;
......@@ -220,7 +215,7 @@ header.header-sidebar-pinned {
padding-right: 0;
@media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
&:not(.build-sidebar) {
&:not(.build-sidebar):not(.wiki-sidebar) {
padding-right: $sidebar_collapsed_width;
}
}
......
app/assets/stylesheets/framework/typography.scss
View file @ d6e7c693
......@@ -182,6 +182,7 @@
left: -16px;
position: absolute;
text-decoration: none;
outline: none;
&::after {
content: image-url('icon_anchor.svg');
......
app/assets/stylesheets/framework/variables.scss
View file @ d6e7c693
......@@ -12,67 +12,71 @@ $sidebar-breakpoint: 1024px;
/*
* Color schema
*/
$darken-normal-factor: 7%;
$darken-dark-factor: 10%;
$darken-border-factor: 5%;
$white-light: #fff;
$white-normal: #ededed;
$white-dark: #ececec;
$white-normal: darken($white-light, $darken-normal-factor);
$white-dark: darken($white-light, $darken-dark-factor);
$gray-lightest: #fdfdfd;
$gray-light: #fafafa;
$gray-lighter: #f9f9f9;
$gray-normal: #f5f5f5;
$gray-dark: #ededed;
$gray-normal: darken($gray-light, $darken-normal-factor);
$gray-dark: darken($gray-light, $darken-dark-factor);
$gray-darker: #eee;
$gray-darkest: #c9c9c9;
$green-light: #38ae67;
$green-normal: #2faa60;
$green-dark: #2ca05b;
$green-light: #3cbd70;
$green-normal: darken($green-light, $darken-normal-factor);
$green-dark: darken($green-light, $darken-dark-factor);
$blue-light: #2ea8e5;
$blue-normal: #2d9fd8;
$blue-dark: #2897ce;
$blue-normal: darken($blue-light, $darken-normal-factor);
$blue-dark: darken($blue-light, $darken-dark-factor);
$blue-medium-light: #3498cb;
$blue-medium: #2f8ebf;
$blue-medium-dark: #2d86b4;
$blue-medium: darken($blue-medium-light, $darken-normal-factor);
$blue-medium-dark: darken($blue-medium-light, $darken-dark-factor);
$blue-light-transparent: rgba(44, 159, 216, 0.05);
$orange-light: #fc8a51;
$orange-normal: #e75e40;
$orange-dark: #ce5237;
$orange-normal: darken($orange-light, $darken-normal-factor);
$orange-dark: darken($orange-light, $darken-dark-factor);
$red-light: #e52c5a;
$red-normal: #d22852;
$red-dark: darken($red-normal, 5%);
$red-normal: darken($red-light, $darken-normal-factor);
$red-dark: darken($red-light, $darken-dark-factor);
$black: #000;
$black-transparent: rgba(0, 0, 0, 0.3);
$border-white-light: #f1f2f4;
$border-white-normal: #d6dae2;
$border-white-dark: #c6cacf;
$border-white-light: darken($white-light, $darken-border-factor);
$border-white-normal: darken($white-normal, $darken-border-factor);
$border-white-dark: darken($white-dark, $darken-border-factor);
$border-gray-light: #dcdcdc;
$border-gray-normal: #d7d7d7;
$border-gray-dark: #c6cacf;
$border-gray-light: darken($gray-light, $darken-border-factor);
$border-gray-normal: darken($gray-normal, $darken-border-factor);
$border-gray-dark: darken($gray-dark, $darken-border-factor);
$border-green-extra-light: #9adb84;
$border-green-light: #2faa60;
$border-green-normal: #2ca05b;
$border-green-dark: #279654;
$border-green-light: darken($green-light, $darken-border-factor);
$border-green-normal: darken($green-normal, $darken-border-factor);
$border-green-dark: darken($green-dark, $darken-border-factor);
$border-blue-light: #2d9fd8;
$border-blue-normal: #2897ce;
$border-blue-dark: #258dc1;
$border-blue-light: darken($blue-light, $darken-border-factor);
$border-blue-normal: darken($blue-normal, $darken-border-factor);
$border-blue-dark: darken($blue-dark, $darken-border-factor);
$border-orange-light: #fc6d26;
$border-orange-normal: #ce5237;
$border-orange-dark: #c14e35;
$border-orange-light: darken($orange-light, $darken-border-factor);
$border-orange-normal: darken($orange-normal, $darken-border-factor);
$border-orange-dark: darken($orange-dark, $darken-border-factor);
$border-red-light: #d22852;
$border-red-normal: #ca264f;
$border-red-dark: darken($border-red-normal, 5%);
$border-red-light: darken($red-light, $darken-border-factor);
$border-red-normal: darken($red-normal, $darken-border-factor);
$border-red-dark: darken($red-dark, $darken-border-factor);
$help-well-bg: $gray-light;
$help-well-border: #e5e5e5;
......@@ -217,7 +221,7 @@ $dropdown-bg: #fff;
$dropdown-link-color: #555;
$dropdown-link-hover-bg: $row-hover;
$dropdown-empty-row-bg: rgba(#000, .04);
$dropdown-border-color: rgba(#000, .1);
$dropdown-border-color: $border-color;
$dropdown-shadow-color: rgba(#000, .1);
$dropdown-divider-color: rgba(#000, .1);
$dropdown-header-color: #959494;
......@@ -226,13 +230,15 @@ $dropdown-input-color: #555;
$dropdown-input-focus-border: $focus-border-color;
$dropdown-input-focus-shadow: rgba($dropdown-input-focus-border, .4);
$dropdown-loading-bg: rgba(#fff, .6);
$dropdown-chevron-size: 10px;
$dropdown-toggle-bg: #fff;
$dropdown-toggle-color: #626262;
$dropdown-toggle-border-color: #eaeaea;
$dropdown-toggle-hover-border-color: darken($dropdown-toggle-border-color, 15%);
$dropdown-toggle-color: #5c5c5c;
$dropdown-toggle-border-color: #e5e5e5;
$dropdown-toggle-hover-border-color: darken($dropdown-toggle-border-color, 13%);
$dropdown-toggle-active-border-color: darken($dropdown-toggle-border-color, 14%);
$dropdown-toggle-icon-color: #c4c4c4;
$dropdown-toggle-hover-icon-color: $dropdown-toggle-hover-border-color;
$dropdown-toggle-hover-icon-color: darken($dropdown-toggle-icon-color, 7%);
/*
* Buttons
......@@ -256,7 +262,7 @@ $search-input-border-color: rgba(#4688f1, .8);
$search-input-focus-shadow-color: $dropdown-input-focus-shadow;
$search-input-width: 220px;
$location-badge-color: #aaa;
$location-badge-bg: $gray-normal;
$location-badge-bg: $dark-background-color;
$location-badge-active-bg: #4f91f8;
$location-icon-color: #e7e9ed;
$location-icon-active-color: #807e7e;
......
app/assets/stylesheets/pages/boards.scss
View file @ d6e7c693
......@@ -359,7 +359,6 @@
}
.issuable-header-text {
width: 100%;
padding-right: 35px;
> strong {
......
app/assets/stylesheets/pages/cycle_analytics.scss
View file @ d6e7c693
......@@ -53,7 +53,7 @@
border-bottom: none;
position: relative;
@media (max-width: $screen-sm-min) {
@media (max-width: $screen-xs-max) {
padding: 6px 0 24px;
}
}
......@@ -61,7 +61,7 @@
.column {
text-align: center;
@media (max-width: $screen-sm-min) {
@media (max-width: $screen-xs-max) {
padding: 15px 0;
}
......@@ -78,7 +78,7 @@
}
&:last-child {
@media (max-width: $screen-sm-min) {
@media (max-width: $screen-xs-max) {
text-align: center;
}
}
......@@ -156,7 +156,7 @@
}
.inner-content {
@media (max-width: $screen-sm-min) {
@media (max-width: $screen-xs-max) {
padding: 0 28px;
text-align: center;
}
......
app/assets/stylesheets/pages/environments.scss
View file @ d6e7c693
......@@ -8,7 +8,7 @@
font-size: 34px;
}
@media (max-width: $screen-sm-min) {
@media (max-width: $screen-xs-max) {
.environments-container {
width: 100%;
overflow: auto;
......
app/assets/stylesheets/pages/groups.scss
View file @ d6e7c693
......@@ -60,14 +60,14 @@
padding: 50px 100px;
overflow: hidden;
@media (max-width: $screen-md-min) {
@media (max-width: $screen-sm-max) {
padding: 50px 0;
}
svg {
float: right;
@media (max-width: $screen-md-min) {
@media (max-width: $screen-sm-max) {
float: none;
display: block;
width: 250px;
......@@ -82,7 +82,7 @@
width: 460px;
margin-top: 120px;
@media (max-width: $screen-md-min) {
@media (max-width: $screen-sm-max) {
float: none;
margin-top: 60px;
width: auto;
......
app/assets/stylesheets/pages/issuable.scss
View file @ d6e7c693
......@@ -132,7 +132,7 @@
display: none;
}
.btn-clipboard {
.btn-clipboard:hover {
color: $gl-gray;
}
}
......@@ -235,6 +235,10 @@
padding-bottom: 10px;
color: $sidebar-collapsed-icon-color;
&:hover {
color: $gl-gray;
}
span {
display: block;
margin-top: 0;
......@@ -244,15 +248,24 @@
display: none;
}
.avatar:hover {
border-color: #999;
}
.btn-clipboard {
border: none;
color: #999;
&:hover {
background: transparent;
<<<<<<< HEAD
}
i {
color: $sidebar-collapsed-icon-color;
=======
color: $gl-gray;
>>>>>>> 14046b9c734e5e6506d63276f39f3f9d770c3699
}
}
}
......
app/assets/stylesheets/pages/milestone.scss
View file @ d6e7c693
......@@ -123,7 +123,7 @@
padding: 20px 0;
}
@media (max-width: $screen-sm-min) {
@media (max-width: $screen-xs-max) {
.milestone-actions {
@include clearfix();
padding-top: $gl-vert-padding;
......
app/assets/stylesheets/pages/note_form.scss
View file @ d6e7c693
......@@ -111,7 +111,7 @@
text-align: center;
font-size: 13px;
@media (max-width: $screen-md-min) {
@media (max-width: $screen-sm-max) {
// On smaller devices the warning becomes the fourth item in the list,
// rather than centering, and grows to span the full width of the
// comment area.
......
app/assets/stylesheets/pages/notes.scss
View file @ d6e7c693
......@@ -90,14 +90,14 @@ ul.notes {
}
&.system-note-commit-list {
max-height: 63px;
max-height: 70px;
overflow: hidden;
display: block;
ul {
margin: 3px 0 3px 15px !important;
margin: 3px 0 3px 16px !important;
li {
.gfm-commit {
font-family: $monospace_font;
font-size: 12px;
}
......@@ -172,6 +172,10 @@ ul.notes {
&.timeline-entry {
padding: 14px 10px;
}
.system-note {
padding: 0;
}
}
&.is-editting {
......@@ -249,7 +253,7 @@ ul.notes {
}
.page-sidebar-pinned.right-sidebar-expanded {
@media (max-width: $screen-lg-min) {
@media (max-width: $screen-md-max) {
.note-header {
.note-headline-light {
display: block;
......
app/assets/stylesheets/pages/profile.scss
View file @ d6e7c693
......@@ -180,7 +180,7 @@
.modal-dialog {
width: 380px;
@media (max-width: $screen-sm-min) {
@media (max-width: $screen-xs-max) {
width: auto;
}
......@@ -261,4 +261,4 @@ table.u2f-registrations {
td:not(:last-child) {
border-right: solid 1px transparent;
}
}
\ No newline at end of file
}
app/assets/stylesheets/pages/projects.scss
View file @ d6e7c693
......@@ -189,7 +189,7 @@
}
.download-button {
@media (max-width: $screen-lg-min) {
@media (max-width: $screen-md-max) {
margin-left: 0;
}
}
......@@ -909,3 +909,11 @@ a.allowed-to-push {
pointer-events: none;
}
}
.variables-table {
table-layout: fixed;
.variable-key {
width: 30%;
}
}
app/assets/stylesheets/pages/stat_graph.scss
View file @ d6e7c693
......@@ -37,7 +37,7 @@
@include make-md-column(6);
margin-top: 10px;
@media (max-width: $screen-sm-min) {
@media (max-width: $screen-xs-max) {
width: 100%;
}
}
......
app/assets/stylesheets/pages/tree.scss
View file @ d6e7c693
......@@ -31,7 +31,7 @@
.last-commit {
@include str-truncated(506px);
@media (min-width: $screen-sm-max) and (max-width: $screen-md-max) {
@media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
@include str-truncated(450px);
}
......
app/assets/stylesheets/pages/wiki.scss
View file @ d6e7c693
......@@ -4,3 +4,128 @@
margin-right: auto;
padding-right: 7px;
}
.wiki-page-header {
@extend .top-area;
position: relative;
.wiki-page-title {
margin: 0;
font-size: 22px;
}
.wiki-last-edit-by {
color: $gl-gray-light;
strong {
color: $gl-text-color;
}
}
.light {
font-weight: normal;
color: $gl-gray-light;
}
.git-access-header {
padding: 16px 40px 11px 0;
line-height: 28px;
font-size: 18px;
}
.git-clone-holder {
width: 100%;
padding-bottom: 40px;
}
button.sidebar-toggle {
position: absolute;
right: 0;
top: 11px;
display: block;
}
@media (min-width: $screen-sm-min) {
&.has-sidebar-toggle {
padding-right: 40px;
}
.git-clone-holder {
width: 480px;
}
.nav-controls {
width: auto;
min-width: 50%;
white-space: nowrap;
}
}
@media (min-width: $screen-md-min) {
&.has-sidebar-toggle {
padding-right: 0;
}
button.sidebar-toggle {
display: none;
}
}
}
.wiki-git-access {
margin: $gl-padding 0;
h3 {
font-size: 22px;
font-weight: normal;
margin-top: 1.4em;
}
}
.right-sidebar.wiki-sidebar {
padding: $gl-padding 0;
&.right-sidebar-collapsed {
display: none;
}
.blocks-container {
padding: 0 $gl-padding;
}
.block {
width: 100%;
}
a {
color: $layout-link-gray;
&:hover,
&.active {
color: $black;
}
}
.active > a {
color: $black;
}
ul.wiki-pages,
ul.wiki-pages li {
list-style: none;
padding: 0;
margin: 0;
}
ul.wiki-pages li {
margin: 5px 0 10px;
}
.wiki-sidebar-header {
padding: 0 $gl-padding $gl-padding;
.gutter-toggle {
margin-top: 0;
}
}
}
app/controllers/admin/application_settings_controller.rb
View file @ d6e7c693
......@@ -123,6 +123,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
:koding_enabled,
:koding_url,
:email_author_in_body,
:html_emails_enabled,
:repository_checks_enabled,
:metrics_packet_size,
:send_user_confirmation_email,
......
app/controllers/autocomplete_controller.rb
View file @ d6e7c693
......@@ -11,7 +11,7 @@ class AutocompleteController < ApplicationController
@users = @users.reorder(:name)
@users = load_users_by_ability || @users.page(params[:page])
if params[:todo_filter].present?
if params[:todo_filter].present? && current_user
@users = @users.todo_authors(current_user.id, params[:todo_state_filter])
end
......
app/helpers/lfs_helper.rb → app/controllers/concerns/lfs_request.rb
View file @ d6e7c693
module LfsHelper
include Gitlab::Routing.url_helpers
# This concern assumes:
# - a `#project` accessor
# - a `#user` accessor
# - a `#authentication_result` accessor
# - a `#can?(object, action, subject)` method
# - a `#ci?` method
# - a `#download_request?` method
# - a `#upload_request?` method
# - a `#has_authentication_ability?(ability)` method
module LfsRequest
extend ActiveSupport::Concern
included do
before_action :require_lfs_enabled!
before_action :lfs_check_access!
end
private
def require_lfs_enabled!
return if Gitlab.config.lfs.enabled
......@@ -17,17 +33,23 @@ module LfsHelper
return if download_request? && lfs_download_access?
return if upload_request? && lfs_upload_access?
<<<<<<< HEAD:app/helpers/lfs_helper.rb
if project.public? || (user && user.can?(:read_project, project))
if project.above_size_limit? || objects_exceed_repo_limit?
render_size_error
else
render_lfs_forbidden
end
=======
if project.public? || can?(user, :read_project, project)
lfs_forbidden!
>>>>>>> 14046b9c734e5e6506d63276f39f3f9d770c3699:app/controllers/concerns/lfs_request.rb
else
render_lfs_not_found
end
end
<<<<<<< HEAD:app/helpers/lfs_helper.rb
def lfs_download_access?
return false unless project.lfs_enabled?
......@@ -51,6 +73,10 @@ module LfsHelper
return false if project.above_size_limit? || objects_exceed_repo_limit?
has_authentication_ability?(:push_code) && can?(user, :push_code, project)
=======
def lfs_forbidden!
render_lfs_forbidden
>>>>>>> 14046b9c734e5e6506d63276f39f3f9d770c3699:app/controllers/concerns/lfs_request.rb
end
def objects_exceed_repo_limit?
......@@ -84,6 +110,7 @@ module LfsHelper
)
end
<<<<<<< HEAD:app/helpers/lfs_helper.rb
def render_size_error
render(
json: {
......@@ -93,6 +120,30 @@ module LfsHelper
content_type: "application/vnd.git-lfs+json",
status: 406
)
=======
def lfs_download_access?
return false unless project.lfs_enabled?
ci? || lfs_deploy_token? || user_can_download_code? || build_can_download_code?
end
def lfs_upload_access?
return false unless project.lfs_enabled?
has_authentication_ability?(:push_code) && can?(user, :push_code, project)
end
def lfs_deploy_token?
authentication_result.lfs_deploy_token?(project)
end
def user_can_download_code?
has_authentication_ability?(:download_code) && can?(user, :download_code, project)
end
def build_can_download_code?
has_authentication_ability?(:build_download_code) && can?(user, :build_download_code, project)
>>>>>>> 14046b9c734e5e6506d63276f39f3f9d770c3699:app/controllers/concerns/lfs_request.rb
end
def storage_project
......@@ -107,4 +158,8 @@ module LfsHelper
result
end
end
def objects
@objects ||= (params[:objects] || []).to_a
end
end
app/controllers/concerns/toggle_award_emoji.rb
View file @ d6e7c693
module ToggleAwardEmoji
extend ActiveSupport::Concern
included do
before_action :authenticate_user!, only: [:toggle_award_emoji]
end
def toggle_award_emoji
authenticate_user!
name = params.require(:name)
if awardable.user_can_award?(current_user, name)
......
app/controllers/concerns/workhorse_request.rb 0 → 100644
View file @ d6e7c693
module WorkhorseRequest
extend ActiveSupport::Concern
included do
before_action :verify_workhorse_api!
end
private
def verify_workhorse_api!
Gitlab::Workhorse.verify_api_request!(request.headers)
end
end
app/controllers/help_controller.rb
View file @ d6e7c693
......@@ -6,9 +6,11 @@ class HelpController < ApplicationController
def index
@help_index = File.read(Rails.root.join('doc', 'README.md'))
# Prefix Markdown links with `help/` unless they already have been
# See http://rubular.com/r/ie2MlpdUMq
@help_index.gsub!(/(\]\()(\/?help\/)?([^\)\(]+\))/, '\1/help/\3')
# Prefix Markdown links with `help/` unless they are external links
# See http://rubular.com/r/X3baHTbPO2
@help_index.gsub!(%r{(?<delim>\]\()(?!.+://)(?!/)(?<link>[^\)\(]+\))}) do
"#{$~[:delim]}#{Gitlab.config.gitlab.relative_url_root}/help/#{$~[:link]}"
end
end
def show
......
app/controllers/profiles/avatars_controller.rb
View file @ d6e7c693
......@@ -4,7 +4,6 @@ class Profiles::AvatarsController < Profiles::ApplicationController
@user.remove_avatar!
@user.save
@user.reset_events_cache
redirect_to profile_path
end
......
app/controllers/projects/avatars_controller.rb
View file @ d6e7c693
......@@ -20,7 +20,6 @@ class Projects::AvatarsController < Projects::ApplicationController
@project.remove_avatar!
@project.save
@project.reset_events_cache
redirect_to edit_project_path(@project)
end
......
app/controllers/projects/blob_controller.rb
View file @ d6e7c693
......@@ -13,7 +13,6 @@ class Projects::BlobController < Projects::ApplicationController
before_action :assign_blob_vars
before_action :commit, except: [:new, :create]
before_action :blob, except: [:new, :create]
before_action :from_merge_request, only: [:edit, :update]
before_action :require_branch_head, only: [:edit, :update]
before_action :editor_variables, except: [:show, :preview, :diff]
before_action :validate_diff_params, only: :diff
......@@ -39,14 +38,6 @@ class Projects::BlobController < Projects::ApplicationController
def update
@path = params[:file_path] if params[:file_path].present?
after_edit_path =
if from_merge_request && @target_branch == @ref
diffs_namespace_project_merge_request_path(from_merge_request.target_project.namespace, from_merge_request.target_project, from_merge_request) +
"##{hexdigest(@path)}"
else
namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @path))
end
create_commit(Files::UpdateService, success_path: after_edit_path,
failure_view: :edit,
failure_path: namespace_project_blob_path(@project.namespace, @project, @id))
......@@ -124,9 +115,14 @@ class Projects::BlobController < Projects::ApplicationController
render_404
end
def from_merge_request
# If blob edit was initiated from merge request page
@from_merge_request ||= MergeRequest.find_by(id: params[:from_merge_request_id])
def after_edit_path
from_merge_request = MergeRequestsFinder.new(current_user, project_id: @project.id).execute.find_by(iid: params[:from_merge_request_iid])
if from_merge_request && @target_branch == @ref
diffs_namespace_project_merge_request_path(from_merge_request.target_project.namespace, from_merge_request.target_project, from_merge_request) +
"##{hexdigest(@path)}"
else
namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @path))
end
end
def editor_variables
......
app/controllers/projects/branches_controller.rb
View file @ d6e7c693
......@@ -36,7 +36,7 @@ class Projects::BranchesController < Projects::ApplicationController
execute(branch_name, ref)
if params[:issue_iid]
issue = @project.issues.find_by(iid: params[:issue_iid])
issue = IssuesFinder.new(current_user, project_id: @project.id).find_by(iid: params[:issue_iid])
SystemNoteService.new_issue_branch(issue, @project, current_user, branch_name) if issue
end
......
app/controllers/projects/cycle_analytics_controller.rb
View file @ d6e7c693
......@@ -6,7 +6,7 @@ class Projects::CycleAnalyticsController < Projects::ApplicationController
before_action :authorize_read_cycle_analytics!
def show
@cycle_analytics = ::CycleAnalytics.new(@project, from: start_date(cycle_analytics_params))
@cycle_analytics = ::CycleAnalytics.new(@project, current_user, from: start_date(cycle_analytics_params))
stats_values, cycle_analytics_json = generate_cycle_analytics_data
......
app/controllers/projects/git_http_client_controller.rb
View file @ d6e7c693
......@@ -18,6 +18,14 @@ class Projects::GitHttpClientController < Projects::ApplicationController
private
def download_request?
raise NotImplementedError
end
def upload_request?
raise NotImplementedError
end
def authenticate_user
@authentication_result = Gitlab::Auth::Result.new
......@@ -130,10 +138,6 @@ class Projects::GitHttpClientController < Projects::ApplicationController
authentication_result.ci?(project)
end
def lfs_deploy_token?
authentication_result.lfs_deploy_token?(project)
end
def authentication_has_download_access?
has_authentication_ability?(:download_code) || has_authentication_ability?(:build_download_code)
end
......@@ -149,8 +153,4 @@ class Projects::GitHttpClientController < Projects::ApplicationController
def authentication_project
authentication_result.project
end
def verify_workhorse_api!
Gitlab::Workhorse.verify_api_request!(request.headers)
end
end
app/controllers/projects/git_http_controller.rb
View file @ d6e7c693
# This file should be identical in GitLab Community Edition and Enterprise Edition
class Projects::GitHttpController < Projects::GitHttpClientController
before_action :verify_workhorse_api!
include WorkhorseRequest
# GET /foo/bar.git/info/refs?service=git-upload-pack (git pull)
# GET /foo/bar.git/info/refs?service=git-receive-pack (git push)
......@@ -69,16 +67,25 @@ class Projects::GitHttpController < Projects::GitHttpClientController
end
def render_denied
<<<<<<< HEAD
if user && user.can?(:read_project, project)
message = project.above_size_limit? ? access_check.message : 'Access denied'
render plain: message, status: :forbidden
=======
if user && can?(user, :read_project, project)
render plain: access_denied_message, status: :forbidden
>>>>>>> 14046b9c734e5e6506d63276f39f3f9d770c3699
else
# Do not leak information about project existence
render_not_found
end
end
def access_denied_message
'Access denied'
end
def upload_pack_allowed?
return false unless Gitlab.config.gitlab_shell.upload_pack
......
app/controllers/projects/lfs_api_controller.rb
View file @ d6e7c693
class Projects::LfsApiController < Projects::GitHttpClientController
include LfsHelper
include LfsRequest
before_action :require_lfs_enabled!
before_action :lfs_check_access!, except: [:deprecated]
skip_before_action :lfs_check_access!, only: [:deprecated]
def batch
unless objects.present?
......@@ -31,6 +30,14 @@ class Projects::LfsApiController < Projects::GitHttpClientController
private
def download_request?
params[:operation] == 'download'
end
def upload_request?
params[:operation] == 'upload'
end
def existing_oids
@existing_oids ||= begin
storage_project.lfs_objects.where(oid: objects.map { |o| o['oid'].to_s }).pluck(:oid)
......@@ -79,12 +86,4 @@ class Projects::LfsApiController < Projects::GitHttpClientController
}
}
end
def download_request?
params[:operation] == 'download'
end
def upload_request?
params[:operation] == 'upload'
end
end
app/controllers/projects/lfs_storage_controller.rb
View file @ d6e7c693
class Projects::LfsStorageController < Projects::GitHttpClientController
include LfsHelper
include LfsRequest
include WorkhorseRequest
before_action :require_lfs_enabled!
before_action :lfs_check_access!
before_action :verify_workhorse_api!, only: [:upload_authorize]
skip_before_action :verify_workhorse_api!, only: [:download, :upload_finalize]
def download
lfs_object = LfsObject.find_by_oid(oid)
......
app/controllers/projects/merge_requests_controller.rb
View file @ d6e7c693
......@@ -343,16 +343,16 @@ class Projects::MergeRequestsController < Projects::ApplicationController
@merge_request.update(merge_error: nil)
if params[:merge_when_build_succeeds].present?
unless @merge_request.pipeline
unless @merge_request.head_pipeline
@status = :failed
return
end
if @merge_request.pipeline.active?
if @merge_request.head_pipeline.active?
MergeRequests::MergeWhenBuildSucceedsService.new(@project, current_user, merge_params)
.execute(@merge_request)
@status = :merge_when_build_succeeds
elsif @merge_request.pipeline.success?
elsif @merge_request.head_pipeline.success?
# This can be triggered when a user clicks the auto merge button while
# the tests finish at about the same time
MergeWorker.perform_async(@merge_request.id, current_user.id, params)
......@@ -423,7 +423,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController
end
def ci_status
pipeline = @merge_request.pipeline
pipeline = @merge_request.head_pipeline
if pipeline
status = pipeline.status
coverage = pipeline.try(:coverage)
......@@ -528,7 +529,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
def validates_merge_request
# Show git not found page
# if there is no saved commits between source & target branch
if @merge_request.commits.blank?
if @merge_request.has_no_commits?
# and if target branch doesn't exist
return invalid_mr unless @merge_request.target_branch_exists?
end
......@@ -536,7 +537,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
def define_show_vars
@noteable = @merge_request
@commits_count = @merge_request.commits.count
@commits_count = @merge_request.commits_count
if @merge_request.locked_long_ago?
@merge_request.unlock_mr
......@@ -571,7 +572,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
end
def define_widget_vars
@pipeline = @merge_request.pipeline
@pipeline = @merge_request.head_pipeline
end
def define_commit_vars
......@@ -600,8 +601,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController
def define_pipelines_vars
@pipelines = @merge_request.all_pipelines
@pipeline = @merge_request.pipeline
@statuses = @pipeline.statuses.relevant if @pipeline.present?
@pipeline = @merge_request.head_pipeline
@statuses_count = @pipeline.present? ? @pipeline.statuses.relevant.count : 0
end
def define_new_vars
......@@ -695,7 +696,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
def merge_when_build_succeeds_active?
params[:merge_when_build_succeeds].present? &&
@merge_request.pipeline && @merge_request.pipeline.active?
@merge_request.head_pipeline && @merge_request.head_pipeline.active?
end
def build_merge_request
......
app/controllers/projects/pipelines_controller.rb
View file @ d6e7c693
class Projects::PipelinesController < Projects::ApplicationController
before_action :pipeline, except: [:index, :new, :create]
before_action :commit, only: [:show]
before_action :commit, only: [:show, :builds]
before_action :authorize_read_pipeline!
before_action :authorize_create_pipeline!, only: [:new, :create]
before_action :authorize_update_pipeline!, only: [:retry, :cancel]
......@@ -32,6 +32,14 @@ class Projects::PipelinesController < Projects::ApplicationController
def show
end
def builds
respond_to do |format|
format.html do
render 'show'
end
end
end
def retry
pipeline.retry_failed(current_user)
......
app/controllers/projects/todos_controller.rb
View file @ d6e7c693
......@@ -16,13 +16,7 @@ class Projects::TodosController < Projects::ApplicationController
@issuable ||= begin
case params[:issuable_type]
when "issue"
issue = @project.issues.find(params[:issuable_id])
if can?(current_user, :read_issue, issue)
issue
else
render_404
end
IssuesFinder.new(current_user, project_id: @project.id).find(params[:issuable_id])
when "merge_request"
@project.merge_requests.find(params[:issuable_id])
end
......
app/controllers/projects/wikis_controller.rb
View file @ d6e7c693
......@@ -124,6 +124,8 @@ class Projects::WikisController < Projects::ApplicationController
# Call #wiki to make sure the Wiki Repo is initialized
@project_wiki.wiki
@sidebar_wiki_pages = @project_wiki.pages.first(15)
rescue ProjectWiki::CouldNotCreateWikiError
flash[:notice] = "Could not create Wiki Repository at this time. Please try again later."
redirect_to project_path(@project)
......
app/finders/issuable_finder.rb
View file @ d6e7c693
......@@ -16,14 +16,12 @@
# label_name: string
# sort: string
#
require_relative 'projects_finder'
class IssuableFinder
NONE = '0'
attr_accessor :current_user, :params
def initialize(current_user, params)
def initialize(current_user, params = {})
@current_user = current_user
@params = params
end
......@@ -44,6 +42,40 @@ class IssuableFinder
sort(items)
end
def find(*params)
execute.find(*params)
end
def find_by(*params)
execute.find_by(*params)
end
# We often get counts for each state by running a query per state, and
# counting those results. This is typically slower than running one query
# (even if that query is slower than any of the individual state queries) and
# grouping and counting within that query.
#
def count_by_state
count_params = params.merge(state: nil, sort: nil)
labels_count = label_names.any? ? label_names.count : 1
finder = self.class.new(current_user, count_params)
counts = Hash.new(0)
# Searching by label includes a GROUP BY in the query, but ours will be last
# because it is added last. Searching by multiple labels also includes a row
# per issuable, so we have to count those in Ruby - which is bad, but still
# better than performing multiple queries.
#
finder.execute.reorder(nil).group(:state).count.each do |key, value|
counts[Array(key).last.to_sym] += value / labels_count
end
counts[:all] = counts.values.sum
counts[:opened] += counts[:reopened]
counts
end
def group
return @group if defined?(@group)
......
app/finders/notes_finder.rb
View file @ d6e7c693
......@@ -12,7 +12,7 @@ class NotesFinder
when "commit"
project.notes.for_commit_id(target_id).non_diff_notes
when "issue"
project.issues.visible_to_user(current_user).find(target_id).notes.inc_author
IssuesFinder.new(current_user, project_id: project.id).find(target_id).notes.inc_author
when "merge_request"
project.merge_requests.find(target_id).mr_and_commit_notes.inc_author
when "snippet", "project_snippet"
......
app/helpers/dropdowns_helper.rb
View file @ d6e7c693
......@@ -47,7 +47,7 @@ module DropdownsHelper
default_label = data_attr[:default_label]
content_tag(:button, class: "dropdown-menu-toggle #{options[:toggle_class] if options.has_key?(:toggle_class)}", id: (options[:id] if options.has_key?(:id)), type: "button", data: data_attr) do
output = content_tag(:span, toggle_text, class: "dropdown-toggle-text #{'is-default' if toggle_text == default_label}")
output << icon('caret-down')
output << icon('chevron-down')
output.html_safe
end
end
......
app/helpers/issuables_helper.rb
View file @ d6e7c693
......@@ -158,8 +158,12 @@ module IssuablesHelper
:author_id,
:assignee_id,
:milestone_title,
<<<<<<< HEAD
:label_name,
:weight
=======
:label_name
>>>>>>> 14046b9c734e5e6506d63276f39f3f9d770c3699
]
end
......@@ -190,12 +194,18 @@ module IssuablesHelper
end
def issuables_count_for_state(issuable_type, state)
<<<<<<< HEAD
issuables_finder = public_send("#{issuable_type}_finder")
params = issuables_finder.params.merge(state: state)
finder = issuables_finder.class.new(issuables_finder.current_user, params)
finder.execute.page(1).total_count
=======
@counts ||= {}
@counts[issuable_type] ||= public_send("#{issuable_type}_finder").count_by_state
@counts[issuable_type][state]
>>>>>>> 14046b9c734e5e6506d63276f39f3f9d770c3699
end
IRRELEVANT_PARAMS_FOR_CACHE_KEY = %i[utf8 sort page]
......@@ -205,6 +215,7 @@ module IssuablesHelper
opts = params.with_indifferent_access
opts[:state] = state
opts.except!(*IRRELEVANT_PARAMS_FOR_CACHE_KEY)
opts.delete_if { |_, value| value.blank? }
hexdigest(['issuables_count', issuable_type, opts.sort].flatten.join('-'))
end
......
app/helpers/nav_helper.rb
View file @ d6e7c693
......@@ -20,6 +20,11 @@ module NavHelper
end
elsif current_path?('builds#show')
"page-gutter build-sidebar right-sidebar-expanded"
elsif current_path?('wikis#show') ||
current_path?('wikis#edit') ||
current_path?('wikis#history') ||
current_path?('wikis#git_access')
"page-gutter wiki-sidebar right-sidebar-expanded"
end
end
......
app/mailers/emails/notes.rb
View file @ d6e7c693
......@@ -4,6 +4,7 @@ module Emails
setup_note_mail(note_id, recipient_id)
@commit = @note.noteable
@discussion = @note.to_discussion if @note.diff_note?
@target_url = namespace_project_commit_url(*note_target_url_options)
mail_answer_thread(@commit,
......@@ -24,6 +25,7 @@ module Emails
setup_note_mail(note_id, recipient_id)
@merge_request = @note.noteable
@discussion = @note.to_discussion if @note.diff_note?
@target_url = namespace_project_merge_request_url(*note_target_url_options)
mail_answer_thread(@merge_request, note_thread_options(recipient_id))
end
......
app/models/ci/build.rb
View file @ d6e7c693
......@@ -203,7 +203,7 @@ module Ci
.reorder(iid: :asc)
merge_requests.find do |merge_request|
merge_request.commits.any? { |ci| ci.id == pipeline.sha }
merge_request.commits_sha.include?(pipeline.sha)
end
end
......
app/models/ci/pipeline.rb
View file @ d6e7c693
......@@ -161,23 +161,27 @@ module Ci
end
def retryable?
builds.latest.any? do |build|
(build.failed? || build.canceled?) && build.retryable?
end
builds.latest.failed_or_canceled.any?(&:retryable?)
end
def cancelable?
builds.running_or_pending.any?
statuses.cancelable.any?
end
def cancel_running
builds.running_or_pending.each(&:cancel)
Gitlab::OptimisticLocking.retry_lock(
statuses.cancelable) do |cancelable|
cancelable.each(&:cancel)
end
end
def retry_failed(user)
builds.latest.failed.select(&:retryable?).each do |build|
Ci::Build.retry(build, user)
end
Gitlab::OptimisticLocking.retry_lock(
builds.latest.failed_or_canceled) do |failed_or_canceled|
failed_or_canceled.select(&:retryable?).each do |build|
Ci::Build.retry(build, user)
end
end
end
def mark_as_processable_after_stage(stage_idx)
......@@ -313,7 +317,7 @@ module Ci
def merge_requests
@merge_requests ||= project.merge_requests
.where(source_branch: self.ref)
.select { |merge_request| merge_request.pipeline.try(:id) == self.id }
.select { |merge_request| merge_request.head_pipeline.try(:id) == self.id }
end
private
......
app/models/commit.rb
View file @ d6e7c693
......@@ -48,6 +48,10 @@ class Commit
max_lines: DIFF_HARD_LIMIT_LINES,
}
end
def from_hash(hash, project)
new(Gitlab::Git::Commit.new(hash), project)
end
end
attr_accessor :raw
......
app/models/concerns/has_status.rb
View file @ d6e7c693
......@@ -73,6 +73,11 @@ module HasStatus
scope :skipped, -> { where(status: 'skipped') }
scope :running_or_pending, -> { where(status: [:running, :pending]) }
scope :finished, -> { where(status: [:success, :failed, :canceled]) }
scope :failed_or_canceled, -> { where(status: [:failed, :canceled]) }
scope :cancelable, -> do
where(status: [:running, :pending, :created])
end
end
def started?
......
app/models/concerns/protected_branch_access.rb
View file @ d6e7c693
......@@ -2,12 +2,17 @@ module ProtectedBranchAccess
extend ActiveSupport::Concern
included do
<<<<<<< HEAD
validates_uniqueness_of :group_id, scope: :protected_branch, allow_nil: true
validates_uniqueness_of :user_id, scope: :protected_branch, allow_nil: true
validates_uniqueness_of :access_level,
scope: :protected_branch,
unless: Proc.new { |access_level| access_level.user_id? || access_level.group_id? },
conditions: -> { where(user_id: nil, group_id: nil) }
=======
belongs_to :protected_branch
delegate :project, to: :protected_branch
>>>>>>> 14046b9c734e5e6506d63276f39f3f9d770c3699
scope :master, -> { where(access_level: Gitlab::Access::MASTER) }
scope :developer, -> { where(access_level: Gitlab::Access::DEVELOPER) }
......@@ -29,4 +34,10 @@ module ProtectedBranchAccess
self.class.human_access_levels[self.access_level]
end
def check_access(user)
return true if user.is_admin?
project.team.max_member_access(user.id) >= access_level
end
end
app/models/cycle_analytics.rb
View file @ d6e7c693
class CycleAnalytics
STAGES = %i[issue plan code test review staging production].freeze
def initialize(project, from:)
def initialize(project, current_user, from:)
@project = project
@current_user = current_user
@from = from
@fetcher = Gitlab::CycleAnalytics::MetricsFetcher.new(project: project, from: from, branch: nil)
end
def summary
@summary ||= Summary.new(@project, from: @from)
@summary ||= Summary.new(@project, @current_user, from: @from)
end
def permissions(user:)
......
app/models/cycle_analytics/summary.rb
View file @ d6e7c693
class CycleAnalytics
class Summary
def initialize(project, from:)
def initialize(project, current_user, from:)
@project = project
@current_user = current_user
@from = from
end
def new_issues
@project.issues.created_after(@from).count
IssuesFinder.new(@current_user, project_id: @project.id).execute.created_after(@from).count
end
def commits
......
app/models/discussion.rb
View file @ d6e7c693
......@@ -25,7 +25,12 @@ class Discussion
to: :last_resolved_note,
allow_nil: true
delegate :blob, :highlighted_diff_lines, to: :diff_file, allow_nil: true
delegate :blob,
:highlighted_diff_lines,
:diff_lines,
to: :diff_file,
allow_nil: true
def self.for_notes(notes)
notes.group_by(&:discussion_id).values.map { |notes| new(notes) }
......@@ -159,10 +164,11 @@ class Discussion
end
# Returns an array of at most 16 highlighted lines above a diff note
def truncated_diff_lines
def truncated_diff_lines(highlight: true)
lines = highlight ? highlighted_diff_lines : diff_lines
prev_lines = []
highlighted_diff_lines.each do |line|
lines.each do |line|
if line.meta?
prev_lines.clear
else
......
app/models/event.rb
View file @ d6e7c693
......@@ -48,12 +48,6 @@ class Event < ActiveRecord::Base
scope :merged, -> { where(action: MERGED) }
class << self
def reset_event_cache_for(target)
Event.where(target_id: target.id, target_type: target.class.to_s).
order('id DESC').limit(100).
update_all(updated_at: Time.now)
end
# Update Gitlab::ContributionsCalendar#activity_dates if this changes
def contributions
where("action = ? OR (target_type in (?) AND action in (?))",
......@@ -358,6 +352,10 @@ class Event < ActiveRecord::Base
update_all(last_activity_at: created_at)
end
def authored_by?(user)
user ? author_id == user.id : false
end
private
def recent_update?
......
app/models/issue.rb
View file @ d6e7c693
......@@ -192,18 +192,6 @@ class Issue < ActiveRecord::Base
branches_with_iid - branches_with_merge_request
end
# Reset issue events cache
#
# Since we do cache @event we need to reset cache in special cases:
# * when an issue is updated
# Events cache stored like events/23-20130109142513.
# The cache key includes updated_at timestamp.
# Thus it will automatically generate a new fragment
# when the event is updated because the key changes.
def reset_events_cache
Event.reset_event_cache_for(self)
end
# To allow polymorphism with MergeRequest.
def source_project
project
......
app/models/merge_request.rb
View file @ d6e7c693
......@@ -27,7 +27,8 @@ class MergeRequest < ActiveRecord::Base
after_create :ensure_merge_request_diff, unless: :importing?
after_update :reload_diff_if_branch_changed
delegate :commits, :real_size, to: :merge_request_diff, prefix: nil
delegate :commits, :real_size, :commits_sha, :commits_count,
to: :merge_request_diff, prefix: nil
# When this attribute is true some MR validation is ignored
# It allows us to close or modify broken merge requests
......@@ -628,18 +629,6 @@ class MergeRequest < ActiveRecord::Base
self.target_project.repository.branch_names.include?(self.target_branch)
end
# Reset merge request events cache
#
# Since we do cache @event we need to reset cache in special cases:
# * when a merge request is updated
# Events cache stored like events/23-20130109142513.
# The cache key includes updated_at timestamp.
# Thus it will automatically generate a new fragment
# when the event is updated because the key changes.
def reset_events_cache
Event.reset_event_cache_for(self)
end
def merge_commit_message
message = "Merge branch '#{source_branch}' into '#{target_branch}'\n\n"
message << "#{title}\n\n"
......@@ -697,7 +686,7 @@ class MergeRequest < ActiveRecord::Base
end
def broken?
self.commits.blank? || branch_missing? || cannot_be_merged?
has_no_commits? || branch_missing? || cannot_be_merged?
end
def can_be_merged_by?(user)
......@@ -713,7 +702,7 @@ class MergeRequest < ActiveRecord::Base
def mergeable_ci_state?
return true unless project.only_allow_merge_if_build_succeeds?
!pipeline || pipeline.success? || pipeline.skipped?
!head_pipeline || head_pipeline.success? || head_pipeline.skipped?
end
def environments
......@@ -833,18 +822,14 @@ class MergeRequest < ActiveRecord::Base
diverged_commits_count > 0
end
def commits_sha
commits.map(&:sha)
end
def pipeline
def head_pipeline
return unless diff_head_sha && source_project
@pipeline ||= source_project.pipeline_for(source_branch, diff_head_sha)
@head_pipeline ||= source_project.pipeline_for(source_branch, diff_head_sha)
end
def all_pipelines
return unless source_project
return Ci::Pipeline.none unless source_project
@all_pipelines ||= source_project.pipelines
.where(sha: all_commits_sha, ref: source_branch)
......@@ -934,4 +919,12 @@ class MergeRequest < ActiveRecord::Base
@conflicts_can_be_resolved_in_ui = false
end
end
def has_commits?
commits_count > 0
end
def has_no_commits?
!has_commits?
end
end
app/models/merge_request_diff.rb
View file @ d6e7c693
......@@ -127,11 +127,7 @@ class MergeRequestDiff < ActiveRecord::Base
end
def commits_sha
if @commits
commits.map(&:sha)
else
st_commits.map { |commit| commit[:id] }
end
st_commits.map { |commit| commit[:id] }
end
def diff_refs
......@@ -176,6 +172,10 @@ class MergeRequestDiff < ActiveRecord::Base
CompareService.new.execute(project, head_commit_sha, project, sha, straight: straight)
end
def commits_count
st_commits.count
end
private
# Old GitLab implementations may have generated diffs as ["--broken-diff"].
......
app/models/note.rb
View file @ d6e7c693
......@@ -207,19 +207,6 @@ class Note < ActiveRecord::Base
super(noteable_type.to_s.classify.constantize.base_class.to_s)
end
# Reset notes events cache
#
# Since we do cache @event we need to reset cache in special cases:
# * when a note is updated
# * when a note is removed
# Events cache stored like events/23-20130109142513.
# The cache key includes updated_at timestamp.
# Thus it will automatically generate a new fragment
# when the event is updated because the key changes.
def reset_events_cache
Event.reset_event_cache_for(self)
end
def editable?
!system?
end
......
app/models/project.rb
View file @ d6e7c693
......@@ -783,9 +783,9 @@ class Project < ActiveRecord::Base
self.id
end
def get_issue(issue_id)
def get_issue(issue_id, current_user)
if default_issues_tracker?
issues.find_by(iid: issue_id)
IssuesFinder.new(current_user, project_id: id).find_by(iid: issue_id)
else
ExternalIssue.new(issue_id, self)
end
......@@ -1086,7 +1086,6 @@ class Project < ActiveRecord::Base
begin
gitlab_shell.mv_repository(repository_storage_path, "#{old_path_with_namespace}.wiki", "#{new_path_with_namespace}.wiki")
send_move_instructions(old_path_with_namespace)
reset_events_cache
@old_path_with_namespace = old_path_with_namespace
......@@ -1154,22 +1153,6 @@ class Project < ActiveRecord::Base
attrs
end
# Reset events cache related to this project
#
# Since we do cache @event we need to reset cache in special cases:
# * when project was moved
# * when project was renamed
# * when the project avatar changes
# Events cache stored like events/23-20130109142513.
# The cache key includes updated_at timestamp.
# Thus it will automatically generate a new fragment
# when the event is updated because the key changes.
def reset_events_cache
Event.where(project_id: self.id).
order('id DESC').limit(100).
update_all(updated_at: Time.now)
end
def project_member(user)
project_members.find_by(user_id: user)
end
......
app/models/project_services/jira_service.rb
View file @ d6e7c693
......@@ -9,6 +9,9 @@ class JiraService < IssueTrackerService
before_update :reset_password
# This is confusing, but JiraService does not really support these events.
# The values here are required to display correct options in the service
# configuration screen.
def supported_events
%w(commit merge_request)
end
......@@ -105,18 +108,29 @@ class JiraService < IssueTrackerService
"#{url}/secure/CreateIssue.jspa"
end
def execute(push, issue = nil)
if issue.nil?
# No specific issue, that means
# we just want to test settings
test_settings
else
jira_issue = jira_request { client.Issue.find(issue.iid) }
def execute(push)
# This method is a no-op, because currently JiraService does not
# support any events.
end
return false unless jira_issue.present?
def close_issue(entity, external_issue)
issue = jira_request { client.Issue.find(external_issue.iid) }
close_issue(push, jira_issue)
end
return if issue.nil? || issue.resolution.present? || !jira_issue_transition_id.present?
commit_id = if entity.is_a?(Commit)
entity.id
elsif entity.is_a?(MergeRequest)
entity.diff_head_sha
end
commit_url = build_entity_url(:commit, commit_id)
# Depending on the JIRA project's workflow, a comment during transition
# may or may not be allowed. Refresh the issue after transition and check
# if it is closed, so we don't have one comment for every commit.
issue = jira_request { client.Issue.find(issue.key) } if transition_issue(issue)
add_issue_solved_comment(issue, commit_id, commit_url) if issue.resolution
end
def create_cross_reference_note(mentioned, noteable, author)
......@@ -156,6 +170,11 @@ class JiraService < IssueTrackerService
"Please fill in Password and Username."
end
def test(_)
result = test_settings
{ success: result.present?, result: result }
end
def can_test?
username.present? && password.present?
end
......@@ -182,24 +201,6 @@ class JiraService < IssueTrackerService
end
end
def close_issue(entity, issue)
return if issue.nil? || issue.resolution.present? || !jira_issue_transition_id.present?
commit_id = if entity.is_a?(Commit)
entity.id
elsif entity.is_a?(MergeRequest)
entity.diff_head_sha
end
commit_url = build_entity_url(:commit, commit_id)
# Depending on the JIRA project's workflow, a comment during transition
# may or may not be allowed. Refresh the issue after transition and check
# if it is closed, so we don't have one comment for every commit.
issue = jira_request { client.Issue.find(issue.key) } if transition_issue(issue)
add_issue_solved_comment(issue, commit_id, commit_url) if issue.resolution
end
def transition_issue(issue)
issue.transitions.build.save(transition: { id: jira_issue_transition_id })
end
......
app/models/repository.rb
View file @ d6e7c693
This diff is collapsed.
app/models/user.rb
View file @ d6e7c693
This diff is collapsed.
app/policies/project_policy.rb
View file @ d6e7c693
This diff is collapsed.
app/serializers/analytics_build_entity.rb
View file @ d6e7c693
This diff is collapsed.
app/serializers/build_entity.rb
View file @ d6e7c693
This diff is collapsed.
app/serializers/entity_date_helper.rb
View file @ d6e7c693
This diff is collapsed.
app/services/ci/create_pipeline_service.rb
View file @ d6e7c693
This diff is collapsed.
app/services/ci/process_pipeline_service.rb
View file @ d6e7c693
This diff is collapsed.
app/services/git_hooks_service.rb
View file @ d6e7c693
This diff is collapsed.
app/services/git_push_service.rb
View file @ d6e7c693
This diff is collapsed.
app/services/issuable_base_service.rb
View file @ d6e7c693
This diff is collapsed.
app/services/issues/close_service.rb
View file @ d6e7c693
This diff is collapsed.
app/services/merge_requests/base_service.rb
View file @ d6e7c693
This diff is collapsed.
app/services/notes/delete_service.rb
View file @ d6e7c693
This diff is collapsed.
app/services/notes/update_service.rb
View file @ d6e7c693
This diff is collapsed.
app/services/projects/transfer_service.rb
View file @ d6e7c693
This diff is collapsed.
app/services/system_note_service.rb
View file @ d6e7c693
This diff is collapsed.
app/uploaders/avatar_uploader.rb
View file @ d6e7c693
This diff is collapsed.
app/views/dashboard/todos/index.html.haml
View file @ d6e7c693
This diff is collapsed.
app/views/discussions/_discussion.html.haml
View file @ d6e7c693
This diff is collapsed.
app/views/errors/access_denied.html.haml
View file @ d6e7c693
This diff is collapsed.
app/views/errors/encoding.html.haml
View file @ d6e7c693
This diff is collapsed.
app/views/errors/git_not_found.html.haml
View file @ d6e7c693
This diff is collapsed.
app/views/errors/not_found.html.haml
View file @ d6e7c693
This diff is collapsed.
app/views/errors/omniauth_error.html.haml
View file @ d6e7c693
This diff is collapsed.
app/views/events/_event.html.haml
View file @ d6e7c693
This diff is collapsed.
app/views/events/event/_push.html.haml
View file @ d6e7c693
This diff is collapsed.
app/views/explore/groups/index.html.haml
View file @ d6e7c693
This diff is collapsed.
app/views/invites/show.html.haml
View file @ d6e7c693
This diff is collapsed.
app/views/layouts/_head.html.haml
View file @ d6e7c693
This diff is collapsed.
app/views/layouts/_user_styles.html.haml deleted 100644 → 0
View file @ 726ae97f
This diff is collapsed.
app/views/layouts/errors.html.haml
View file @ d6e7c693
This diff is collapsed.
app/views/layouts/nav/_dashboard.html.haml
View file @ d6e7c693
This diff is collapsed.
app/views/layouts/nav/_project.html.haml
View file @ d6e7c693
This diff is collapsed.
app/views/notify/_note_message.text.erb 0 → 100644
View file @ d6e7c693
This diff is collapsed.
app/views/notify/_note_mr_or_commit_email.html.haml 0 → 100644
View file @ d6e7c693
This diff is collapsed.
app/views/notify/_note_mr_or_commit_email.text.erb 0 → 100644
View file @ d6e7c693
This diff is collapsed.
app/views/notify/_simple_diff.text.erb 0 → 100644
View file @ d6e7c693
This diff is collapsed.
app/views/notify/note_commit_email.text.erb
View file @ d6e7c693
This diff is collapsed.
app/views/profiles/update_username.js.haml
View file @ d6e7c693
This diff is collapsed.
app/views/projects/blob/edit.html.haml
View file @ d6e7c693
This diff is collapsed.
app/views/projects/branches/index.html.haml
View file @ d6e7c693
This diff is collapsed.
app/views/projects/diffs/_file.html.haml
View file @ d6e7c693
This diff is collapsed.
app/views/projects/diffs/_line.html.haml
View file @ d6e7c693
This diff is collapsed.
app/views/projects/forks/index.html.haml
View file @ d6e7c693
This diff is collapsed.
app/views/projects/pipelines/show.html.haml
View file @ d6e7c693
This diff is collapsed.
app/views/projects/tags/index.html.haml
View file @ d6e7c693
This diff is collapsed.
app/views/projects/wikis/_form.html.haml
View file @ d6e7c693
This diff is collapsed.
app/views/projects/wikis/_nav.html.haml deleted 100644 → 0
View file @ 726ae97f
This diff is collapsed.
app/views/projects/wikis/_sidebar.html.haml 0 → 100644
View file @ d6e7c693
This diff is collapsed.
app/views/projects/wikis/edit.html.haml
View file @ d6e7c693
This diff is collapsed.
app/views/projects/wikis/history.html.haml
View file @ d6e7c693
This diff is collapsed.
app/views/projects/wikis/pages.html.haml
View file @ d6e7c693
This diff is collapsed.
app/views/projects/wikis/show.html.haml
View file @ d6e7c693
This diff is collapsed.
app/views/search/_filter.html.haml
View file @ d6e7c693
This diff is collapsed.
app/views/shared/_group_form.html.haml
View file @ d6e7c693
This diff is collapsed.
app/views/shared/_issues.html.haml
View file @ d6e7c693
This diff is collapsed.
app/views/shared/_merge_requests.html.haml
View file @ d6e7c693
This diff is collapsed.
app/views/shared/_sort_dropdown.html.haml
View file @ d6e7c693
This diff is collapsed.
app/views/shared/issuable/_filter.html.haml
View file @ d6e7c693
This diff is collapsed.
app/views/shared/issuable/_form.html.haml
View file @ d6e7c693
This diff is collapsed.
app/workers/authorized_projects_worker.rb
View file @ d6e7c693
This diff is collapsed.
app/workers/process_commit_worker.rb
View file @ d6e7c693
This diff is collapsed.
bin/rspec-stackprof 0 → 100755
View file @ d6e7c693
This diff is collapsed.
changelogs/unreleased/18546-update-wiki-page-design.yml 0 → 100644
View file @ d6e7c693
This diff is collapsed.
changelogs/unreleased/22781-user-generated-permalinks.yml 0 → 100644
View file @ d6e7c693
This diff is collapsed.
changelogs/unreleased/24150-consistent-dropdown-styles.yml 0 → 100644
View file @ d6e7c693
This diff is collapsed.
changelogs/unreleased/24814-pipeline-tabs.yml 0 → 100644
View file @ d6e7c693
This diff is collapsed.
changelogs/unreleased/24844-environments-date.yml 0 → 100644
View file @ d6e7c693
This diff is collapsed.
changelogs/unreleased/24999-fix-project-avatar-alignment.yml 0 → 100644
View file @ d6e7c693
This diff is collapsed.
changelogs/unreleased/25002-sentence-case-dashboard-tabs.yml 0 → 100644
View file @ d6e7c693
This diff is collapsed.
changelogs/unreleased/25199-fix-broken-urls-in-help-page.yml 0 → 100644
View file @ d6e7c693
This diff is collapsed.
changelogs/unreleased/4269-public-api.yml 0 → 100644
View file @ d6e7c693
This diff is collapsed.
changelogs/unreleased/api-branch-status.yml 0 → 100644
View file @ d6e7c693
This diff is collapsed.
changelogs/unreleased/comments-fixture.yml 0 → 100644
View file @ d6e7c693
This diff is collapsed.
changelogs/unreleased/disable-calendar-deselection.yml deleted 100644 → 0
View file @ 726ae97f
This diff is collapsed.
changelogs/unreleased/fix-cancelling-pipelines.yml 0 → 100644
View file @ d6e7c693
This diff is collapsed.
changelogs/unreleased/fix-github-branch-formatter.yml 0 → 100644
View file @ d6e7c693
This diff is collapsed.
changelogs/unreleased/improve-invite-accept-page.yml 0 → 100644
View file @ d6e7c693
This diff is collapsed.
changelogs/unreleased/issuable_filters_present-refactor.yml 0 → 100644
View file @ d6e7c693
This diff is collapsed.
changelogs/unreleased/issue-24534.yml 0 → 100644
View file @ d6e7c693
This diff is collapsed.
changelogs/unreleased/issue_24363.yml 0 → 100644
View file @ d6e7c693
This diff is collapsed.
changelogs/unreleased/issue_24748.yml 0 → 100644
View file @ d6e7c693
This diff is collapsed.
changelogs/unreleased/issue_24958.yml 0 → 100644
View file @ d6e7c693
This diff is collapsed.
changelogs/unreleased/jej-22869.yml 0 → 100644
View file @ d6e7c693
This diff is collapsed.
changelogs/unreleased/process-commit-worker-improvements.yml 0 → 100644
View file @ d6e7c693
This diff is collapsed.
changelogs/unreleased/readme-link-fix.yml 0 → 100644
View file @ d6e7c693
This diff is collapsed.
changelogs/unreleased/remove-backup-strategies.yml 0 → 100644
View file @ d6e7c693
This diff is collapsed.
changelogs/unreleased/remove-jsx-react-eslint-plugins.yml 0 → 100644
View file @ d6e7c693
This diff is collapsed.
changelogs/unreleased/removing_unnecessary_indexes.yml 0 → 100644
View file @ d6e7c693
This diff is collapsed.
changelogs/unreleased/right-sidebar-fixture.yml 0 → 100644
View file @ d6e7c693
This diff is collapsed.
changelogs/unreleased/shortcuts-issuable-fixture.yml 0 → 100644
View file @ d6e7c693
This diff is collapsed.
changelogs/unreleased/use-st-commits-where-possible.yml 0 → 100644
View file @ d6e7c693
This diff is collapsed.
changelogs/unreleased/zen-mode-fixture.yml 0 → 100644
View file @ d6e7c693
This diff is collapsed.
changelogs/unreleased/zj-expose-coverage-pipelines.yml 0 → 100644
View file @ d6e7c693
This diff is collapsed.
changelogs/unreleased/zj-fix-label-creation-non-members.yml 0 → 100644
View file @ d6e7c693
This diff is collapsed.
changelogs/unreleased/zj-issue-search-slash-command.yml 0 → 100644
View file @ d6e7c693
This diff is collapsed.
config/initializers/ar_monkey_patch.rb
View file @ d6e7c693
This diff is collapsed.
config/initializers/email_template_interceptor.rb 0 → 100644
View file @ d6e7c693
This diff is collapsed.
config/initializers/sidekiq.rb
View file @ d6e7c693
This diff is collapsed.
config/routes/project.rb
View file @ d6e7c693
This diff is collapsed.
db/fixtures/development/04_project.rb
View file @ d6e7c693
This diff is collapsed.
db/fixtures/development/06_teams.rb
View file @ d6e7c693
This diff is collapsed.
db/fixtures/support/serialized_transaction.rb deleted 100644 → 0
View file @ 726ae97f
This diff is collapsed.
db/migrate/20161128142110_remove_unnecessary_indexes.rb 0 → 100644
View file @ d6e7c693
This diff is collapsed.
db/schema.rb
View file @ d6e7c693
This diff is collapsed.
doc/administration/auth/ldap.md
View file @ d6e7c693
This diff is collapsed.
doc/administration/build_artifacts.md
View file @ d6e7c693
This diff is collapsed.
doc/api/access_requests.md
View file @ d6e7c693
This diff is collapsed.
doc/api/award_emoji.md
View file @ d6e7c693
This diff is collapsed.
doc/api/boards.md
View file @ d6e7c693
This diff is collapsed.
doc/api/branches.md
View file @ d6e7c693
This diff is collapsed.
doc/api/broadcast_messages.md
View file @ d6e7c693
This diff is collapsed.
doc/api/issues.md
View file @ d6e7c693
This diff is collapsed.
doc/api/labels.md
View file @ d6e7c693
This diff is collapsed.
doc/api/members.md
View file @ d6e7c693
This diff is collapsed.
doc/api/merge_requests.md
View file @ d6e7c693
This diff is collapsed.
doc/api/notes.md
View file @ d6e7c693
This diff is collapsed.
doc/api/pipelines.md
View file @ d6e7c693
This diff is collapsed.
doc/api/projects.md
View file @ d6e7c693
This diff is collapsed.
doc/api/repository_files.md
View file @ d6e7c693
This diff is collapsed.
doc/api/system_hooks.md
View file @ d6e7c693
This diff is collapsed.
doc/api/tags.md
View file @ d6e7c693
This diff is collapsed.
doc/api/users.md
View file @ d6e7c693
This diff is collapsed.
doc/ci/triggers/README.md
View file @ d6e7c693
This diff is collapsed.
doc/development/doc_styleguide.md
View file @ d6e7c693
This diff is collapsed.
doc/development/gotchas.md
View file @ d6e7c693
This diff is collapsed.
doc/development/performance.md
View file @ d6e7c693
This diff is collapsed.
doc/development/ux_guide/components.md
View file @ d6e7c693
This diff is collapsed.
doc/install/installation.md
View file @ d6e7c693
This diff is collapsed.
doc/raketasks/backup_restore.md
View file @ d6e7c693
This diff is collapsed.
doc/update/8.12-to-8.13.md
View file @ d6e7c693
This diff is collapsed.
doc/update/8.13-to-8.14.md
View file @ d6e7c693
This diff is collapsed.
doc/update/8.14-to-8.15.md 0 → 100644
View file @ d6e7c693
This diff is collapsed.
doc/update/patch_versions.md
View file @ d6e7c693
This diff is collapsed.
doc/web_hooks/ssl.png
View file @ d6e7c693
This diff is collapsed.
doc/web_hooks/web_hooks.md
View file @ d6e7c693
This diff is collapsed.
doc/workflow/img/todos_add_todo_sidebar.png
View file @ d6e7c693
This diff is collapsed.
doc/workflow/img/todos_mark_done_sidebar.png
View file @ d6e7c693
This diff is collapsed.
doc/workflow/todos.md
View file @ d6e7c693
This diff is collapsed.
features/project/wiki.feature
View file @ d6e7c693
This diff is collapsed.
features/steps/project/wiki.rb
View file @ d6e7c693
This diff is collapsed.
features/steps/shared/issuable.rb
View file @ d6e7c693
This diff is collapsed.
features/steps/shared/markdown.rb
View file @ d6e7c693
This diff is collapsed.
features/support/capybara.rb
View file @ d6e7c693
This diff is collapsed.
lib/api/entities.rb
View file @ d6e7c693
This diff is collapsed.
lib/api/files.rb
View file @ d6e7c693
This diff is collapsed.
lib/api/groups.rb
View file @ d6e7c693
This diff is collapsed.
lib/api/helpers.rb
View file @ d6e7c693
This diff is collapsed.
lib/api/helpers/members_helpers.rb
View file @ d6e7c693
This diff is collapsed.
lib/api/issues.rb
View file @ d6e7c693
This diff is collapsed.
lib/api/merge_requests.rb
View file @ d6e7c693
This diff is collapsed.
lib/api/projects.rb
View file @ d6e7c693
This diff is collapsed.
lib/api/services.rb
View file @ d6e7c693
This diff is collapsed.
lib/api/triggers.rb
View file @ d6e7c693
This diff is collapsed.
lib/backup/manager.rb
View file @ d6e7c693
This diff is collapsed.
lib/email_template_interceptor.rb 0 → 100644
View file @ d6e7c693
This diff is collapsed.
lib/gitlab/chat_commands/base_command.rb
View file @ d6e7c693
This diff is collapsed.
lib/gitlab/chat_commands/command.rb
View file @ d6e7c693
This diff is collapsed.
lib/gitlab/chat_commands/issue_command.rb
View file @ d6e7c693
This diff is collapsed.
lib/gitlab/chat_commands/issue_search.rb 0 → 100644
View file @ d6e7c693
This diff is collapsed.
lib/gitlab/chat_commands/issue_show.rb
View file @ d6e7c693
This diff is collapsed.
lib/gitlab/database.rb
View file @ d6e7c693
This diff is collapsed.
lib/gitlab/git_access.rb
View file @ d6e7c693
This diff is collapsed.
lib/gitlab/git_access_wiki.rb
View file @ d6e7c693
This diff is collapsed.
lib/gitlab/o_auth/user.rb
View file @ d6e7c693
This diff is collapsed.
lib/gitlab/search_results.rb
View file @ d6e7c693
This diff is collapsed.
lib/tasks/gitlab/helpers.rake 0 → 100644
View file @ d6e7c693
This diff is collapsed.
lib/tasks/gitlab/shell.rake
View file @ d6e7c693
This diff is collapsed.
lib/tasks/gitlab/task_helpers.rake deleted 100644 → 0
View file @ 726ae97f
This diff is collapsed.
lib/tasks/gitlab/task_helpers.rb 0 → 100644
View file @ d6e7c693
This diff is collapsed.
lib/tasks/gitlab/workhorse.rake 0 → 100644
View file @ d6e7c693
This diff is collapsed.
package.json
View file @ d6e7c693
This diff is collapsed.
public/404.html
View file @ d6e7c693
This diff is collapsed.
public/422.html
View file @ d6e7c693
This diff is collapsed.
public/500.html
View file @ d6e7c693
This diff is collapsed.
public/502.html
View file @ d6e7c693
This diff is collapsed.
public/503.html
View file @ d6e7c693
This diff is collapsed.
spec/controllers/help_controller_spec.rb
View file @ d6e7c693
This diff is collapsed.
spec/factories/ci/builds.rb
View file @ d6e7c693
This diff is collapsed.
spec/factories/ci/pipelines.rb
View file @ d6e7c693
This diff is collapsed.
spec/factories/commit_statuses.rb
View file @ d6e7c693
This diff is collapsed.
spec/features/boards/sidebar_spec.rb
View file @ d6e7c693
This diff is collapsed.
spec/features/help_pages_spec.rb
View file @ d6e7c693
This diff is collapsed.
spec/features/issues/gfm_autocomplete_spec.rb 0 → 100644
View file @ d6e7c693
This diff is collapsed.
spec/features/issues/todo_spec.rb
View file @ d6e7c693
This diff is collapsed.
spec/features/profiles/preferences_spec.rb
View file @ d6e7c693
This diff is collapsed.
spec/features/projects/blobs/edit_spec.rb 0 → 100644
View file @ d6e7c693
This diff is collapsed.
spec/features/projects/pipelines/pipeline_spec.rb 0 → 100644
View file @ d6e7c693
This diff is collapsed.
spec/features/snippets/create_snippet_spec.rb 0 → 100644
View file @ d6e7c693
This diff is collapsed.
spec/features/variables_spec.rb
View file @ d6e7c693
This diff is collapsed.
spec/finders/labels_finder_spec.rb
View file @ d6e7c693
This diff is collapsed.
spec/javascripts/bootstrap_linked_tabs_spec.js.es6 0 → 100644
View file @ d6e7c693
This diff is collapsed.
spec/javascripts/build_spec.js.es6
View file @ d6e7c693
This diff is collapsed.
spec/javascripts/fixtures/build.html.haml deleted 100644 → 0
View file @ 726ae97f
This diff is collapsed.
spec/javascripts/fixtures/builds.rb 0 → 100644
View file @ d6e7c693
This diff is collapsed.
spec/javascripts/fixtures/comments.html.haml deleted 100644 → 0
View file @ 726ae97f
This diff is collapsed.
spec/javascripts/fixtures/issuable.html.haml deleted 100644 → 0
View file @ 726ae97f
This diff is collapsed.
spec/javascripts/fixtures/issue_note.html.haml deleted 100644 → 0
View file @ 726ae97f
This diff is collapsed.
spec/javascripts/fixtures/issues.rb
View file @ d6e7c693
This diff is collapsed.
spec/javascripts/fixtures/linked_tabs.html.haml 0 → 100644
View file @ d6e7c693
This diff is collapsed.
spec/javascripts/fixtures/right_sidebar.html.haml deleted 100644 → 0
View file @ 726ae97f
This diff is collapsed.
spec/javascripts/fixtures/zen_mode.html.haml deleted 100644 → 0
View file @ 726ae97f
This diff is collapsed.
spec/javascripts/issue_spec.js
View file @ d6e7c693
This diff is collapsed.
spec/javascripts/notes_spec.js
View file @ d6e7c693
This diff is collapsed.
spec/javascripts/right_sidebar_spec.js
View file @ d6e7c693
This diff is collapsed.
spec/javascripts/shortcuts_issuable_spec.js
View file @ d6e7c693
This diff is collapsed.
spec/javascripts/smart_interval_spec.js.es6
View file @ d6e7c693
This diff is collapsed.
spec/javascripts/spec_helper.js
View file @ d6e7c693
This diff is collapsed.
spec/javascripts/zen_mode_spec.js
View file @ d6e7c693
This diff is collapsed.
spec/lib/gitlab/chat_commands/issue_search_spec.rb 0 → 100644
View file @ d6e7c693
This diff is collapsed.
spec/lib/gitlab/git_access_wiki_spec.rb
View file @ d6e7c693
This diff is collapsed.
spec/lib/gitlab/search_results_spec.rb
View file @ d6e7c693
This diff is collapsed.
spec/mailers/notify_spec.rb
View file @ d6e7c693
This diff is collapsed.
spec/migrations/migrate_process_commit_worker_jobs_spec.rb 0 → 100644
View file @ d6e7c693
This diff is collapsed.
spec/models/build_spec.rb
View file @ d6e7c693
This diff is collapsed.
spec/models/ci/pipeline_spec.rb
View file @ d6e7c693
This diff is collapsed.
spec/models/commit_spec.rb
View file @ d6e7c693
This diff is collapsed.
spec/models/concerns/has_status_spec.rb
View file @ d6e7c693
This diff is collapsed.
spec/models/cycle_analytics/code_spec.rb
View file @ d6e7c693
This diff is collapsed.
spec/models/cycle_analytics/issue_spec.rb
View file @ d6e7c693
This diff is collapsed.
spec/models/cycle_analytics/plan_spec.rb
View file @ d6e7c693
This diff is collapsed.
spec/models/cycle_analytics/review_spec.rb
View file @ d6e7c693
This diff is collapsed.
spec/models/cycle_analytics/staging_spec.rb
View file @ d6e7c693
This diff is collapsed.
spec/models/cycle_analytics/summary_spec.rb
View file @ d6e7c693
This diff is collapsed.
spec/models/cycle_analytics/test_spec.rb
View file @ d6e7c693
This diff is collapsed.
spec/models/discussion_spec.rb
View file @ d6e7c693
This diff is collapsed.
spec/models/event_spec.rb
View file @ d6e7c693
This diff is collapsed.
spec/models/merge_request_diff_spec.rb
View file @ d6e7c693
This diff is collapsed.
spec/models/merge_request_spec.rb
View file @ d6e7c693
This diff is collapsed.
spec/models/project_spec.rb
View file @ d6e7c693
This diff is collapsed.
spec/models/repository_spec.rb
View file @ d6e7c693
This diff is collapsed.
spec/models/user_spec.rb
View file @ d6e7c693
This diff is collapsed.
spec/policies/project_policy_spec.rb
View file @ d6e7c693
This diff is collapsed.
spec/rake_helper.rb
View file @ d6e7c693
This diff is collapsed.
spec/requests/api/api_helpers_spec.rb
View file @ d6e7c693
This diff is collapsed.
spec/requests/api/branches_spec.rb
View file @ d6e7c693
This diff is collapsed.
spec/requests/api/issues_spec.rb
View file @ d6e7c693
This diff is collapsed.
spec/requests/api/merge_requests_spec.rb
View file @ d6e7c693
This diff is collapsed.
spec/requests/api/pipelines_spec.rb
View file @ d6e7c693
This diff is collapsed.
spec/requests/api/projects_spec.rb
View file @ d6e7c693
This diff is collapsed.
spec/requests/api/services_spec.rb
View file @ d6e7c693
This diff is collapsed.
spec/serializers/build_entity_spec.rb
View file @ d6e7c693
This diff is collapsed.
spec/services/git_push_service_spec.rb
View file @ d6e7c693
This diff is collapsed.
spec/services/issues/update_service_spec.rb
View file @ d6e7c693
This diff is collapsed.
spec/services/notification_service_spec.rb
View file @ d6e7c693
This diff is collapsed.
spec/spec_helper.rb
View file @ d6e7c693
This diff is collapsed.
spec/support/capybara.rb
View file @ d6e7c693
This diff is collapsed.
spec/support/carrierwave.rb
View file @ d6e7c693
This diff is collapsed.
spec/support/javascript_fixtures_helpers.rb
View file @ d6e7c693
This diff is collapsed.
spec/support/matchers/markdown_matchers.rb
View file @ d6e7c693
This diff is collapsed.
spec/support/rake_helpers.rb
View file @ d6e7c693
This diff is collapsed.
spec/support/setup_builds_storage.rb
View file @ d6e7c693
This diff is collapsed.
spec/tasks/gitlab/backup_rake_spec.rb
View file @ d6e7c693
This diff is collapsed.
spec/tasks/gitlab/task_helpers_spec.rb 0 → 100644
View file @ d6e7c693
This diff is collapsed.
spec/tasks/gitlab/users_rake_spec.rb
View file @ d6e7c693
This diff is collapsed.
spec/tasks/gitlab/workhorse_rake_spec.rb 0 → 100644
View file @ d6e7c693
This diff is collapsed.
spec/views/layouts/_head.html.haml_spec.rb
View file @ d6e7c693
This diff is collapsed.
spec/workers/build_email_worker_spec.rb
View file @ d6e7c693
This diff is collapsed.
spec/workers/emails_on_push_worker_spec.rb
View file @ d6e7c693
This diff is collapsed.
spec/workers/process_commit_worker_spec.rb
View file @ d6e7c693
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