Skip to content

G
gitlab-ce
Commit 024e3860 authored by Drew Blessing's avatar Drew Blessing
Browse files
Options

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

parents f0f3821b c60cb393
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 60919 additions and 7207 deletions
CHANGELOG.md
View file @ 024e3860
......@@ -2,6 +2,19 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
## 11.1.4 (2018-07-30)
### Fixed (4 changes, 1 of them is from the community)
- Rework some projects table indexes around repository_storage field. !20377
- Don't overflow project/group dropdown results. !20704 (gfyoung)
- Fixed IDE not opening JSON files. !20798
- Disable Gitaly timeouts when creating or restoring backups. !20810
## 11.1.3 (2018-07-27)
- Not released.
## 11.1.2 (2018-07-26)
### Security (4 changes)
......
Gemfile
View file @ 024e3860
......@@ -306,7 +306,7 @@ group :metrics do
gem 'influxdb', '~> 0.2', require: false
# Prometheus
gem 'prometheus-client-mmap', '~> 0.9.3'
gem 'prometheus-client-mmap', '~> 0.9.4'
gem 'raindrops', '~> 0.18'
end
......
Gemfile.lock
View file @ 024e3860
......@@ -635,7 +635,7 @@ GEM
parser
unparser
procto (0.0.3)
prometheus-client-mmap (0.9.3)
prometheus-client-mmap (0.9.4)
pry (0.10.4)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
......@@ -1126,7 +1126,7 @@ DEPENDENCIES
peek-sidekiq (~> 1.0.3)
pg (~> 0.18.2)
premailer-rails (~> 1.9.7)
prometheus-client-mmap (~> 0.9.3)
prometheus-client-mmap (~> 0.9.4)
pry-byebug (~> 3.4.1)
pry-rails (~> 0.3.4)
rack-attack (~> 4.4.1)
......
Gemfile.rails5.lock
View file @ 024e3860
......@@ -639,7 +639,7 @@ GEM
parser
unparser
procto (0.0.3)
prometheus-client-mmap (0.9.3)
prometheus-client-mmap (0.9.4)
pry (0.10.4)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
......@@ -1136,7 +1136,7 @@ DEPENDENCIES
peek-sidekiq (~> 1.0.3)
pg (~> 0.18.2)
premailer-rails (~> 1.9.7)
prometheus-client-mmap (~> 0.9.3)
prometheus-client-mmap (~> 0.9.4)
pry-byebug (~> 3.4.1)
pry-rails (~> 0.3.4)
rack-attack (~> 4.4.1)
......
app/assets/javascripts/autosave.js
View file @ 024e3860
......@@ -53,8 +53,4 @@ export default class Autosave {
return window.localStorage.removeItem(this.key);
}
dispose() {
this.field.off('input');
}
}
app/assets/javascripts/boards/components/board.js
View file @ 024e3860
......@@ -2,6 +2,9 @@
import Sortable from 'sortablejs';
import Vue from 'vue';
import { n__ } from '~/locale';
import Icon from '~/vue_shared/components/icon.vue';
import Tooltip from '~/vue_shared/directives/tooltip';
import AccessorUtilities from '../../lib/utils/accessor';
import boardList from './board_list.vue';
import BoardBlankState from './board_blank_state.vue';
......@@ -17,6 +20,10 @@ gl.issueBoards.Board = Vue.extend({
boardList,
'board-delete': gl.issueBoards.BoardDelete,
BoardBlankState,
Icon,
},
directives: {
Tooltip,
},
props: {
list: {
......@@ -46,6 +53,12 @@ gl.issueBoards.Board = Vue.extend({
filter: Store.filter,
};
},
computed: {
counterTooltip() {
const { issuesSize } = this.list;
return `${n__('%d issue', '%d issues', issuesSize)}`;
},
},
watch: {
filter: {
handler() {
......
app/assets/javascripts/boards/components/board_new_issue.vue
View file @ 024e3860
......@@ -115,6 +115,7 @@ export default {
:id="list.id + '-title'"
class="form-control"
type="text"
name="issue_title"
autocomplete="off"
/>
<project-select
......
app/assets/javascripts/boards/components/project_select.vue
View file @ 024e3860
......@@ -46,7 +46,7 @@ export default {
selectable: true,
data: (term, callback) => {
this.loading = true;
return Api.groupProjects(this.groupId, term, projects => {
return Api.groupProjects(this.groupId, term, {}, projects => {
this.loading = false;
callback(projects);
});
......
app/assets/javascripts/boards/models/list.js
View file @ 024e3860
......@@ -136,6 +136,8 @@ class List {
}
this.createIssues(data.issues);
return data;
});
}
......
app/assets/javascripts/boards/stores/boards_store.js
View file @ 024e3860
......@@ -125,11 +125,17 @@ gl.issueBoards.BoardsStore = {
} else if (listTo.type === 'backlog' && listFrom.type === 'assignee') {
issue.removeAssignee(listFrom.assignee);
listFrom.removeIssue(issue);
} else if ((listTo.type !== 'label' && listFrom.type === 'assignee') ||
(listTo.type !== 'assignee' && listFrom.type === 'label')) {
} else if (this.shouldRemoveIssue(listFrom, listTo)) {
listFrom.removeIssue(issue);
}
},
shouldRemoveIssue(listFrom, listTo) {
return (
(listTo.type !== 'label' && listFrom.type === 'assignee') ||
(listTo.type !== 'assignee' && listFrom.type === 'label') ||
(listFrom.type === 'backlog')
);
},
moveIssueInList (list, issue, oldIndex, newIndex, idArray) {
const beforeId = parseInt(idArray[newIndex - 1], 10) || null;
const afterId = parseInt(idArray[newIndex + 1], 10) || null;
......
app/assets/javascripts/diffs/components/diff_discussions.vue
View file @ 024e3860
......@@ -30,7 +30,6 @@ export default {
:render-header="false"
:render-diff-file="false"
:always-expanded="true"
:discussions-by-diff-order="true"
/>
</ul>
</div>
......
app/assets/javascripts/diffs/components/diff_file_header.vue
View file @ 024e3860
......@@ -50,7 +50,7 @@ export default {
};
},
computed: {
...mapGetters('diffs', ['diffHasExpandedDiscussions']),
...mapGetters('diffs', ['diffHasExpandedDiscussions', 'diffHasDiscussions']),
hasExpandedDiscussions() {
return this.diffHasExpandedDiscussions(this.diffFile);
},
......@@ -108,6 +108,9 @@ export default {
false,
);
},
gfmCopyText() {
return `\`${this.diffFile.filePath}\``;
},
},
methods: {
...mapActions('diffs', ['toggleFileDiscussions']),
......@@ -191,6 +194,7 @@ export default {
<clipboard-button
:title="__('Copy file path to clipboard')"
:text="diffFile.filePath"
:gfm="gfmCopyText"
css-class="btn-default btn-transparent btn-clipboard"
/>
......@@ -217,6 +221,7 @@ export default {
v-if="diffFile.blob && diffFile.blob.readableText"
>
<button
:disabled="!diffHasDiscussions(diffFile)"
:class="{ active: hasExpandedDiscussions }"
:title="s__('MergeRequests|Toggle comments for this file')"
class="js-btn-vue-toggle-comments btn"
......
app/assets/javascripts/diffs/components/diff_line_gutter_content.vue
View file @ 024e3860
......@@ -71,18 +71,13 @@ export default {
required: false,
default: false,
},
discussions: {
type: Array,
required: false,
default: () => [],
},
},
computed: {
...mapState({
diffViewType: state => state.diffs.diffViewType,
diffFiles: state => state.diffs.diffFiles,
}),
...mapGetters(['isLoggedIn']),
...mapGetters(['isLoggedIn', 'discussionsByLineCode']),
lineHref() {
return this.lineCode ? `#${this.lineCode}` : '#';
},
......@@ -92,19 +87,24 @@ export default {
this.showCommentButton &&
!this.isMatchLine &&
!this.isContextLine &&
!this.isMetaLine &&
!this.hasDiscussions
!this.hasDiscussions &&
!this.isMetaLine
);
},
discussions() {
return this.discussionsByLineCode[this.lineCode] || [];
},
hasDiscussions() {
return this.discussions.length > 0;
},
shouldShowAvatarsOnGutter() {
let render = this.hasDiscussions && this.showCommentButton;
if (!this.lineType && this.linePosition === LINE_POSITION_RIGHT) {
return false;
render = false;
}
return this.hasDiscussions && this.showCommentButton;
return render;
},
},
methods: {
......@@ -189,6 +189,7 @@ export default {
</button>
<a
v-if="lineNumber"
v-once
:data-linenumber="lineNumber"
:href="lineHref"
>
......
app/assets/javascripts/diffs/components/diff_line_note_form.vue
View file @ 024e3860
<script>
import $ from 'jquery';
import { mapState, mapGetters, mapActions } from 'vuex';
import createFlash from '~/flash';
import { s__ } from '~/locale';
import noteForm from '../../notes/components/note_form.vue';
import { getNoteFormData } from '../store/utils';
import autosave from '../../notes/mixins/autosave';
import { DIFF_NOTE_TYPE } from '../constants';
import Autosave from '../../autosave';
import { DIFF_NOTE_TYPE, NOTE_TYPE } from '../constants';
export default {
components: {
noteForm,
},
mixins: [autosave],
props: {
diffFileHash: {
type: String,
......@@ -41,35 +41,28 @@ export default {
},
mounted() {
if (this.isLoggedIn) {
const noteableData = this.getNoteableData;
const keys = [
this.noteableData.diff_head_sha,
NOTE_TYPE,
this.noteableType,
noteableData.id,
noteableData.diff_head_sha,
DIFF_NOTE_TYPE,
this.noteableData.source_project_id,
noteableData.source_project_id,
this.line.lineCode,
];
this.initAutoSave(this.noteableData, keys);
this.autosave = new Autosave($(this.$refs.noteForm.$refs.textarea), keys);
}
},
methods: {
...mapActions('diffs', ['cancelCommentForm']),
...mapActions(['saveNote', 'refetchDiscussionById']),
handleCancelCommentForm(shouldConfirm, isDirty) {
if (shouldConfirm && isDirty) {
const msg = s__('Notes|Are you sure you want to cancel creating this comment?');
// eslint-disable-next-line no-alert
if (!window.confirm(msg)) {
return;
}
}
handleCancelCommentForm() {
this.autosave.reset();
this.cancelCommentForm({
lineCode: this.line.lineCode,
});
this.$nextTick(() => {
this.resetAutoSave();
});
},
handleSaveNote(note) {
const selectedDiffFile = this.getDiffFileByHash(this.diffFileHash);
......
app/assets/javascripts/diffs/components/diff_table_cell.vue
View file @ 024e3860
......@@ -67,11 +67,6 @@ export default {
required: false,
default: false,
},
discussions: {
type: Array,
required: false,
default: () => [],
},
},
computed: {
...mapGetters(['isLoggedIn']),
......@@ -141,7 +136,6 @@ export default {
:is-match-line="isMatchLine"
:is-context-line="isContentLine"
:is-meta-line="isMetaLine"
:discussions="discussions"
/>
</td>
</template>
app/assets/javascripts/diffs/components/inline_diff_comment_row.vue
View file @ 024e3860
<script>
import { mapState } from 'vuex';
import { mapState, mapGetters } from 'vuex';
import diffDiscussions from './diff_discussions.vue';
import diffLineNoteForm from './diff_line_note_form.vue';
......@@ -21,22 +21,18 @@ export default {
type: Number,
required: true,
},
discussions: {
type: Array,
required: false,
default: () => [],
},
},
computed: {
...mapState({
diffLineCommentForms: state => state.diffs.diffLineCommentForms,
}),
...mapGetters(['discussionsByLineCode']),
discussions() {
return this.discussionsByLineCode[this.line.lineCode] || [];
},
className() {
return this.discussions.length ? '' : 'js-temp-notes-holder';
},
hasCommentForm() {
return this.diffLineCommentForms[this.line.lineCode];
},
},
};
</script>
......@@ -57,7 +53,7 @@ export default {
:discussions="discussions"
/>
<diff-line-note-form
v-if="hasCommentForm"
v-if="diffLineCommentForms[line.lineCode]"
:diff-file-hash="diffFileHash"
:line="line"
:note-target-line="line"
......
app/assets/javascripts/diffs/components/inline_diff_table_row.vue
View file @ 024e3860
......@@ -33,11 +33,6 @@ export default {
required: false,
default: false,
},
discussions: {
type: Array,
required: false,
default: () => [],
},
},
data() {
return {
......@@ -94,7 +89,6 @@ export default {
:is-bottom="isBottom"
:is-hover="isHover"
:show-comment-button="true"
:discussions="discussions"
class="diff-line-num old_line"
/>
<diff-table-cell
......@@ -104,10 +98,10 @@ export default {
:line-type="newLineType"
:is-bottom="isBottom"
:is-hover="isHover"
:discussions="discussions"
class="diff-line-num new_line"
/>
<td
v-once
:class="line.type"
class="line_content"
v-html="line.richText"
......
app/assets/javascripts/diffs/components/inline_diff_view.vue
View file @ 024e3860
......@@ -20,11 +20,8 @@ export default {
},
},
computed: {
...mapGetters('diffs', [
'commitId',
'shouldRenderInlineCommentRow',
'singleDiscussionByLineCode',
]),
...mapGetters('diffs', ['commitId']),
...mapGetters(['discussionsByLineCode']),
...mapState({
diffLineCommentForms: state => state.diffs.diffLineCommentForms,
}),
......@@ -38,7 +35,18 @@ export default {
return window.gon.user_color_scheme;
},
},
methods: {},
methods: {
shouldRenderCommentRow(line) {
if (this.diffLineCommentForms[line.lineCode]) return true;
const lineDiscussions = this.discussionsByLineCode[line.lineCode];
if (lineDiscussions === undefined) {
return false;
}
return lineDiscussions.every(discussion => discussion.expanded);
},
},
};
</script>
......@@ -57,15 +65,13 @@ export default {
:line="line"
:is-bottom="index + 1 === diffLinesLength"
:key="line.lineCode"
:discussions="singleDiscussionByLineCode(line.lineCode)"
/>
<inline-diff-comment-row
v-if="shouldRenderInlineCommentRow(line)"
v-if="shouldRenderCommentRow(line)"
:diff-file-hash="diffFile.fileHash"
:line="line"
:line-index="index"
:key="index"
:discussions="singleDiscussionByLineCode(line.lineCode)"
/>
</template>
</tbody>
......
app/assets/javascripts/diffs/components/parallel_diff_comment_row.vue
View file @ 024e3860
<script>
import { mapState } from 'vuex';
import { mapState, mapGetters } from 'vuex';
import diffDiscussions from './diff_discussions.vue';
import diffLineNoteForm from './diff_line_note_form.vue';
......@@ -21,51 +21,48 @@ export default {
type: Number,
required: true,
},
leftDiscussions: {
type: Array,
required: false,
default: () => [],
},
rightDiscussions: {
type: Array,
required: false,
default: () => [],
},
},
computed: {
...mapState({
diffLineCommentForms: state => state.diffs.diffLineCommentForms,
}),
...mapGetters(['discussionsByLineCode']),
leftLineCode() {
return this.line.left.lineCode;
},
rightLineCode() {
return this.line.right.lineCode;
},
hasDiscussion() {
const discussions = this.discussionsByLineCode;
return discussions[this.leftLineCode] || discussions[this.rightLineCode];
},
hasExpandedDiscussionOnLeft() {
const discussions = this.leftDiscussions;
const discussions = this.discussionsByLineCode[this.leftLineCode];
return discussions ? discussions.every(discussion => discussion.expanded) : false;
},
hasExpandedDiscussionOnRight() {
const discussions = this.rightDiscussions;
const discussions = this.discussionsByLineCode[this.rightLineCode];
return discussions ? discussions.every(discussion => discussion.expanded) : false;
},
hasAnyExpandedDiscussion() {
return this.hasExpandedDiscussionOnLeft || this.hasExpandedDiscussionOnRight;
},
shouldRenderDiscussionsOnLeft() {
return this.leftDiscussions && this.hasExpandedDiscussionOnLeft;
return this.discussionsByLineCode[this.leftLineCode] && this.hasExpandedDiscussionOnLeft;
},
shouldRenderDiscussionsOnRight() {
return this.rightDiscussions && this.hasExpandedDiscussionOnRight && this.line.right.type;
},
showRightSideCommentForm() {
return this.line.right.type && this.diffLineCommentForms[this.rightLineCode];
return (
this.discussionsByLineCode[this.rightLineCode] &&
this.hasExpandedDiscussionOnRight &&
this.line.right.type
);
},
className() {
return this.leftDiscussions.length > 0 || this.rightDiscussions.length > 0
? ''
: 'js-temp-notes-holder';
return this.hasDiscussion ? '' : 'js-temp-notes-holder';
},
},
};
......@@ -83,12 +80,13 @@ export default {
class="content"
>
<diff-discussions
v-if="leftDiscussions.length"
:discussions="leftDiscussions"
v-if="discussionsByLineCode[leftLineCode].length"
:discussions="discussionsByLineCode[leftLineCode]"
/>
</div>
<diff-line-note-form
v-if="diffLineCommentForms[leftLineCode]"
v-if="diffLineCommentForms[leftLineCode] &&
diffLineCommentForms[leftLineCode]"
:diff-file-hash="diffFileHash"
:line="line.left"
:note-target-line="line.left"
......@@ -102,12 +100,13 @@ export default {
class="content"
>
<diff-discussions
v-if="rightDiscussions.length"
:discussions="rightDiscussions"
v-if="discussionsByLineCode[rightLineCode].length"
:discussions="discussionsByLineCode[rightLineCode]"
/>
</div>
<diff-line-note-form
v-if="showRightSideCommentForm"
v-if="diffLineCommentForms[rightLineCode] &&
diffLineCommentForms[rightLineCode] && line.right.type"
:diff-file-hash="diffFileHash"
:line="line.right"
:note-target-line="line.right"
......
app/assets/javascripts/diffs/components/parallel_diff_table_row.vue
View file @ 024e3860
......@@ -36,16 +36,6 @@ export default {
required: false,
default: false,
},
leftDiscussions: {
type: Array,
required: false,
default: () => [],
},
rightDiscussions: {
type: Array,
required: false,
default: () => [],
},
},
data() {
return {
......@@ -126,10 +116,10 @@ export default {
:is-hover="isLeftHover"
:show-comment-button="true"
:diff-view-type="parallelDiffViewType"
:discussions="leftDiscussions"
class="diff-line-num old_line"
/>
<td
v-once
:id="line.left.lineCode"
:class="parallelViewLeftLineType"
class="line_content parallel left-side"
......@@ -147,10 +137,10 @@ export default {
:is-hover="isRightHover"
:show-comment-button="true"
:diff-view-type="parallelDiffViewType"
:discussions="rightDiscussions"
class="diff-line-num new_line"
/>
<td
v-once
:id="line.right.lineCode"
:class="line.right.type"
class="line_content parallel right-side"
......
app/assets/javascripts/diffs/components/parallel_diff_view.vue
View file @ 024e3860
......@@ -21,11 +21,8 @@ export default {
},
},
computed: {
...mapGetters('diffs', [
'commitId',
'singleDiscussionByLineCode',
'shouldRenderParallelCommentRow',
]),
...mapGetters('diffs', ['commitId']),
...mapGetters(['discussionsByLineCode']),
...mapState({
diffLineCommentForms: state => state.diffs.diffLineCommentForms,
}),
......@@ -55,6 +52,32 @@ export default {
return window.gon.user_color_scheme;
},
},
methods: {
shouldRenderCommentRow(line) {
const leftLineCode = line.left.lineCode;
const rightLineCode = line.right.lineCode;
const discussions = this.discussionsByLineCode;
const leftDiscussions = discussions[leftLineCode];
const rightDiscussions = discussions[rightLineCode];
const hasDiscussion = leftDiscussions || rightDiscussions;
const hasExpandedDiscussionOnLeft = leftDiscussions
? leftDiscussions.every(discussion => discussion.expanded)
: false;
const hasExpandedDiscussionOnRight = rightDiscussions
? rightDiscussions.every(discussion => discussion.expanded)
: false;
if (hasDiscussion && (hasExpandedDiscussionOnLeft || hasExpandedDiscussionOnRight)) {
return true;
}
const hasCommentFormOnLeft = this.diffLineCommentForms[leftLineCode];
const hasCommentFormOnRight = this.diffLineCommentForms[rightLineCode];
return hasCommentFormOnLeft || hasCommentFormOnRight;
},
},
};
</script>
......@@ -75,17 +98,13 @@ export default {
:line="line"
:is-bottom="index + 1 === diffLinesLength"
:key="index"
:left-discussions="singleDiscussionByLineCode(line.left.lineCode)"
:right-discussions="singleDiscussionByLineCode(line.right.lineCode)"
/>
<parallel-diff-comment-row
v-if="shouldRenderParallelCommentRow(line)"
v-if="shouldRenderCommentRow(line)"
:key="`dcr-${index}`"
:line="line"
:diff-file-hash="diffFile.fileHash"
:line-index="index"
:left-discussions="singleDiscussionByLineCode(line.left.lineCode)"
:right-discussions="singleDiscussionByLineCode(line.right.lineCode)"
/>
</template>
</tbody>
......
app/assets/javascripts/diffs/store/getters.js
View file @ 024e3860
import _ from 'underscore';
import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
import { PARALLEL_DIFF_VIEW_TYPE, INLINE_DIFF_VIEW_TYPE } from '../constants';
import { getDiffRefsByLineCode } from './utils';
export const isParallelView = state => state.diffViewType === PARALLEL_DIFF_VIEW_TYPE;
......@@ -47,6 +45,14 @@ export const diffHasExpandedDiscussions = (state, getters) => diff => {
);
};
/**
* Checks if the diff has any discussion
* @param {Boolean} diff
* @returns {Boolean}
*/
export const diffHasDiscussions = (state, getters) => diff =>
getters.getDiffFileDiscussions(diff).length > 0;
/**
* Returns an array with the discussions of the given diff
* @param {Object} diff
......@@ -58,87 +64,6 @@ export const getDiffFileDiscussions = (state, getters, rootState, rootGetters) =
discussion.diff_discussion && _.isEqual(discussion.diff_file.file_hash, diff.fileHash),
) || [];
/**
* Returns an Object with discussions by their diff line code
* To avoid rendering outdated discussions on the Changes tab we should do a bunch of SHA
* comparisions. `note.position.formatter` have the current version diff refs but
* `note.original_position.formatter` will have the first version's diff refs.
* If line diff refs matches with one of them, we should render it as a discussion on Changes tab.
*
* @param {Object} diff
* @returns {Array}
*/
export const discussionsByLineCode = (state, getters, rootState, rootGetters) => {
const diffRefsByLineCode = getDiffRefsByLineCode(state.diffFiles);
return rootGetters.discussions.reduce((acc, note) => {
const isDiffDiscussion = note.diff_discussion;
const hasLineCode = note.line_code;
const isResolvable = note.resolvable;
if (isDiffDiscussion && hasLineCode && isResolvable) {
const diffRefs = diffRefsByLineCode[note.line_code];
if (diffRefs) {
const refs = convertObjectPropsToCamelCase(note.position.formatter);
const originalRefs = convertObjectPropsToCamelCase(note.original_position.formatter);
if (_.isEqual(refs, diffRefs) || _.isEqual(originalRefs, diffRefs)) {
const lineCode = note.line_code;
if (acc[lineCode]) {
acc[lineCode].push(note);
} else {
acc[lineCode] = [note];
}
}
}
}
return acc;
}, {});
};
export const singleDiscussionByLineCode = (state, getters) => lineCode => {
if (!lineCode) return [];
const discussions = getters.discussionsByLineCode;
return discussions[lineCode] || [];
};
export const shouldRenderParallelCommentRow = (state, getters) => line => {
const leftLineCode = line.left.lineCode;
const rightLineCode = line.right.lineCode;
const leftDiscussions = getters.singleDiscussionByLineCode(leftLineCode);
const rightDiscussions = getters.singleDiscussionByLineCode(rightLineCode);
const hasDiscussion = leftDiscussions.length || rightDiscussions.length;
const hasExpandedDiscussionOnLeft = leftDiscussions.length
? leftDiscussions.every(discussion => discussion.expanded)
: false;
const hasExpandedDiscussionOnRight = rightDiscussions.length
? rightDiscussions.every(discussion => discussion.expanded)
: false;
if (hasDiscussion && (hasExpandedDiscussionOnLeft || hasExpandedDiscussionOnRight)) {
return true;
}
const hasCommentFormOnLeft = state.diffLineCommentForms[leftLineCode];
const hasCommentFormOnRight = state.diffLineCommentForms[rightLineCode];
return hasCommentFormOnLeft || hasCommentFormOnRight;
};
export const shouldRenderInlineCommentRow = (state, getters) => line => {
if (state.diffLineCommentForms[line.lineCode]) return true;
const lineDiscussions = getters.singleDiscussionByLineCode(line.lineCode);
if (lineDiscussions.length === 0) {
return false;
}
return lineDiscussions.every(discussion => discussion.expanded);
};
// prevent babel-plugin-rewire from generating an invalid default during karma∂ tests
export const getDiffFileByHash = state => fileHash =>
state.diffFiles.find(file => file.fileHash === fileHash);
......
app/assets/javascripts/diffs/store/utils.js
View file @ 024e3860
......@@ -173,24 +173,3 @@ export function trimFirstCharOfLineContent(line = {}) {
return parsedLine;
}
export function getDiffRefsByLineCode(diffFiles) {
return diffFiles.reduce((acc, diffFile) => {
const { baseSha, headSha, startSha } = diffFile.diffRefs;
const { newPath, oldPath } = diffFile;
// We can only use highlightedDiffLines to create the map of diff lines because
// highlightedDiffLines will also include every parallel diff line in it.
if (diffFile.highlightedDiffLines) {
diffFile.highlightedDiffLines.forEach(line => {
const { lineCode, oldLine, newLine } = line;
if (lineCode) {
acc[lineCode] = { baseSha, headSha, startSha, newPath, oldPath, oldLine, newLine };
}
});
}
return acc;
}, {});
}
app/assets/javascripts/helpers/avatar_helper.js 0 → 100644
View file @ 024e3860
import _ from 'underscore';
import { getFirstCharacterCapitalized } from '~/lib/utils/text_utility';
export const DEFAULT_SIZE_CLASS = 's40';
export const IDENTICON_BG_COUNT = 7;
export function getIdenticonBackgroundClass(entityId) {
const type = (entityId % IDENTICON_BG_COUNT) + 1;
return `bg${type}`;
}
export function getIdenticonTitle(entityName) {
return getFirstCharacterCapitalized(entityName) || ' ';
}
export function renderIdenticon(entity, options = {}) {
const { sizeClass = DEFAULT_SIZE_CLASS } = options;
const bgClass = getIdenticonBackgroundClass(entity.id);
const title = getIdenticonTitle(entity.name);
return `<div class="avatar identicon ${_.escape(sizeClass)} ${_.escape(bgClass)}">${_.escape(title)}</div>`;
}
export function renderAvatar(entity, options = {}) {
if (!entity.avatar_url) {
return renderIdenticon(entity, options);
}
const { sizeClass = DEFAULT_SIZE_CLASS } = options;
return `<img src="${_.escape(entity.avatar_url)}" class="avatar ${_.escape(sizeClass)}" />`;
}
app/assets/javascripts/ide/components/ide.vue
View file @ 024e3860
<script>
import Mousetrap from 'mousetrap';
import { mapActions, mapState, mapGetters } from 'vuex';
import { __ } from '~/locale';
import NewModal from './new_dropdown/modal.vue';
import IdeSidebar from './ide_side_bar.vue';
import RepoTabs from './repo_tabs.vue';
......@@ -25,7 +26,6 @@ export default {
},
computed: {
...mapState([
'changedFiles',
'openFiles',
'viewer',
'currentMergeRequestId',
......@@ -34,18 +34,10 @@ export default {
'currentProjectId',
'errorMessage',
]),
...mapGetters(['activeFile', 'hasChanges']),
...mapGetters(['activeFile', 'hasChanges', 'someUncommitedChanges']),
},
mounted() {
const returnValue = 'Are you sure you want to lose unsaved changes?';
window.onbeforeunload = e => {
if (!this.changedFiles.length) return undefined;
Object.assign(e, {
returnValue,
});
return returnValue;
};
window.onbeforeunload = e => this.onBeforeUnload(e);
Mousetrap.bind(['t', 'command+p', 'ctrl+p'], e => {
if (e.preventDefault) {
......@@ -59,6 +51,16 @@ export default {
},
methods: {
...mapActions(['toggleFileFinder']),
onBeforeUnload(e = {}) {
const returnValue = __('Are you sure you want to lose unsaved changes?');
if (!this.someUncommitedChanges) return undefined;
Object.assign(e, {
returnValue,
});
return returnValue;
},
mousetrapStopCallback(e, el, combo) {
if (
(combo === 't' && el.classList.contains('dropdown-input-field')) ||
......
app/assets/javascripts/ide/components/new_dropdown/index.vue
View file @ 024e3860
......@@ -35,7 +35,9 @@ export default {
watch: {
dropdownOpen() {
this.$nextTick(() => {
this.$refs.dropdownMenu.scrollIntoView();
this.$refs.dropdownMenu.scrollIntoView({
block: 'nearest',
});
});
},
mouseOver() {
......
app/assets/javascripts/lib/utils/http_status.js
View file @ 024e3860
......@@ -2,11 +2,34 @@
* exports HTTP status codes
*/
export default {
const httpStatusCodes = {
ABORTED: 0,
NO_CONTENT: 204,
OK: 200,
CREATED: 201,
ACCEPTED: 202,
NON_AUTHORITATIVE_INFORMATION: 203,
NO_CONTENT: 204,
RESET_CONTENT: 205,
PARTIAL_CONTENT: 206,
MULTI_STATUS: 207,
ALREADY_REPORTED: 208,
IM_USED: 226,
MULTIPLE_CHOICES: 300,
BAD_REQUEST: 400,
NOT_FOUND: 404,
};
export const successCodes = [
httpStatusCodes.OK,
httpStatusCodes.CREATED,
httpStatusCodes.ACCEPTED,
httpStatusCodes.NON_AUTHORITATIVE_INFORMATION,
httpStatusCodes.NO_CONTENT,
httpStatusCodes.RESET_CONTENT,
httpStatusCodes.PARTIAL_CONTENT,
httpStatusCodes.MULTI_STATUS,
httpStatusCodes.ALREADY_REPORTED,
httpStatusCodes.IM_USED,
];
export default httpStatusCodes;
app/assets/javascripts/lib/utils/poll.js
View file @ 024e3860
import httpStatusCodes from './http_status';
import httpStatusCodes, { successCodes } from './http_status';
import { normalizeHeaders } from './common_utils';
/**
......@@ -62,8 +62,7 @@ export default class Poll {
checkConditions(response) {
const headers = normalizeHeaders(response.headers);
const pollInterval = parseInt(headers[this.intervalHeader], 10);
if (pollInterval > 0 && response.status === httpStatusCodes.OK && this.canPoll) {
clearTimeout(this.timeoutID);
if (pollInterval > 0 && successCodes.indexOf(response.status) !== -1 && this.canPoll) {
this.timeoutID = setTimeout(() => {
this.makeRequest();
}, pollInterval);
......
app/assets/javascripts/lib/utils/text_utility.js
View file @ 024e3860
......@@ -75,6 +75,20 @@ export function capitalizeFirstCharacter(text) {
return `${text[0].toUpperCase()}${text.slice(1)}`;
}
/**
* Returns the first character capitalized
*
* If falsey, returns empty string.
*
* @param {String} text
* @return {String}
*/
export function getFirstCharacterCapitalized(text) {
return text
? text.charAt(0).toUpperCase()
: '';
}
/**
* Replaces all html tags from a string with the given replacement.
*
......
app/assets/javascripts/notes/components/discussion_counter.vue
View file @ 024e3860
......@@ -5,20 +5,19 @@ import resolvedSvg from 'icons/_icon_status_success_solid.svg';
import mrIssueSvg from 'icons/_icon_mr_issue.svg';
import nextDiscussionSvg from 'icons/_next_discussion.svg';
import { pluralize } from '../../lib/utils/text_utility';
import discussionNavigation from '../mixins/discussion_navigation';
import { scrollToElement } from '../../lib/utils/common_utils';
import tooltip from '../../vue_shared/directives/tooltip';
export default {
directives: {
tooltip,
},
mixins: [discussionNavigation],
computed: {
...mapGetters([
'getUserData',
'getNoteableData',
'discussionCount',
'firstUnresolvedDiscussionId',
'unresolvedDiscussions',
'resolvedDiscussionCount',
]),
isLoggedIn() {
......@@ -36,6 +35,11 @@ export default {
resolveAllDiscussionsIssuePath() {
return this.getNoteableData.create_issue_to_resolve_discussions_path;
},
firstUnresolvedDiscussionId() {
const item = this.unresolvedDiscussions[0] || {};
return item.id;
},
},
created() {
this.resolveSvg = resolveSvg;
......@@ -46,10 +50,22 @@ export default {
methods: {
...mapActions(['expandDiscussion']),
jumpToFirstUnresolvedDiscussion() {
const diffTab = window.mrTabs.currentAction === 'diffs';
const discussionId = this.firstUnresolvedDiscussionId(diffTab);
const discussionId = this.firstUnresolvedDiscussionId;
if (!discussionId) {
return;
}
const el = document.querySelector(`[data-discussion-id="${discussionId}"]`);
const activeTab = window.mrTabs.currentAction;
if (activeTab === 'commits' || activeTab === 'pipelines') {
window.mrTabs.activateTab('show');
}
this.jumpToDiscussion(discussionId);
if (el) {
this.expandDiscussion({ discussionId });
scrollToElement(el);
}
},
},
};
......
app/assets/javascripts/notes/components/note_form.vue
View file @ 024e3860
......@@ -7,7 +7,7 @@ import issuableStateMixin from '../mixins/issuable_state';
import resolvable from '../mixins/resolvable';
export default {
name: 'NoteForm',
name: 'IssueNoteForm',
components: {
issueWarning,
markdownField,
......
app/assets/javascripts/notes/components/note_header.vue
View file @ 024e3860
......@@ -74,6 +74,9 @@ export default {
</div>
<a :href="author.path">
<span class="note-header-author-name">{{ author.name }}</span>
<span
v-if="author.status_tooltip_html"
v-html="author.status_tooltip_html"></span>
<span class="note-headline-light">
@{{ author.username }}
</span>
......
app/assets/javascripts/notes/components/noteable_discussion.vue
View file @ 024e3860
<script>
import _ from 'underscore';
import { mapActions, mapGetters } from 'vuex';
import resolveDiscussionsSvg from 'icons/_icon_mr_issue.svg';
import nextDiscussionsSvg from 'icons/_next_discussion.svg';
import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
import { convertObjectPropsToCamelCase, scrollToElement } from '~/lib/utils/common_utils';
import { truncateSha } from '~/lib/utils/text_utility';
import systemNote from '~/vue_shared/components/notes/system_note.vue';
import { s__ } from '~/locale';
import Flash from '../../flash';
import { SYSTEM_NOTE } from '../constants';
import userAvatarLink from '../../vue_shared/components/user_avatar/user_avatar_link.vue';
......@@ -20,7 +20,6 @@ import placeholderSystemNote from '../../vue_shared/components/notes/placeholder
import autosave from '../mixins/autosave';
import noteable from '../mixins/noteable';
import resolvable from '../mixins/resolvable';
import discussionNavigation from '../mixins/discussion_navigation';
import tooltip from '../../vue_shared/directives/tooltip';
export default {
......@@ -40,7 +39,7 @@ export default {
directives: {
tooltip,
},
mixins: [autosave, noteable, resolvable, discussionNavigation],
mixins: [autosave, noteable, resolvable],
props: {
discussion: {
type: Object,
......@@ -61,11 +60,6 @@ export default {
required: false,
default: false,
},
discussionsByDiffOrder: {
type: Boolean,
required: false,
default: false,
},
},
data() {
return {
......@@ -80,12 +74,7 @@ export default {
'discussionCount',
'resolvedDiscussionCount',
'allDiscussions',
'unresolvedDiscussionsIdsByDiff',
'unresolvedDiscussionsIdsByDate',
'unresolvedDiscussions',
'unresolvedDiscussionsIdsOrdered',
'nextUnresolvedDiscussionId',
'isLastUnresolvedDiscussion',
]),
transformedDiscussion() {
return {
......@@ -136,10 +125,6 @@ export default {
hasMultipleUnresolvedDiscussions() {
return this.unresolvedDiscussions.length > 1;
},
showJumpToNextDiscussion() {
return this.hasMultipleUnresolvedDiscussions &&
!this.isLastUnresolvedDiscussion(this.discussion.id, this.discussionsByDiffOrder);
},
shouldRenderDiffs() {
const { diffDiscussion, diffFile } = this.transformedDiscussion;
......@@ -159,17 +144,19 @@ export default {
return this.isDiffDiscussion ? '' : 'card discussion-wrapper';
},
},
watch: {
isReplying() {
if (this.isReplying) {
this.$nextTick(() => {
// Pass an extra key to separate reply and note edit forms
this.initAutoSave(this.transformedDiscussion, ['Reply']);
});
mounted() {
if (this.isReplying) {
this.initAutoSave(this.transformedDiscussion);
}
},
updated() {
if (this.isReplying) {
if (!this.autosave) {
this.initAutoSave(this.transformedDiscussion);
} else {
this.disposeAutoSave();
this.setAutoSave();
}
},
}
},
created() {
this.resolveDiscussionsSvg = resolveDiscussionsSvg;
......@@ -207,18 +194,16 @@ export default {
showReplyForm() {
this.isReplying = true;
},
cancelReplyForm(shouldConfirm, isDirty) {
if (shouldConfirm && isDirty) {
const msg = s__('Notes|Are you sure you want to cancel creating this comment?');
cancelReplyForm(shouldConfirm) {
if (shouldConfirm && this.$refs.noteForm.isDirty) {
// eslint-disable-next-line no-alert
if (!window.confirm(msg)) {
if (!window.confirm('Are you sure you want to cancel creating this comment?')) {
return;
}
}
this.isReplying = false;
this.resetAutoSave();
this.isReplying = false;
},
saveReply(noteText, form, callback) {
const postData = {
......@@ -256,10 +241,21 @@ Please check your network connection and try again.`;
});
},
jumpToNextDiscussion() {
const nextId =
this.nextUnresolvedDiscussionId(this.discussion.id, this.discussionsByDiffOrder);
const discussionIds = this.allDiscussions.map(d => d.id);
const unresolvedIds = this.unresolvedDiscussions.map(d => d.id);
const currentIndex = discussionIds.indexOf(this.discussion.id);
const remainingAfterCurrent = discussionIds.slice(currentIndex + 1);
const nextIndex = _.findIndex(remainingAfterCurrent, id => unresolvedIds.indexOf(id) > -1);
if (nextIndex > -1) {
const nextId = remainingAfterCurrent[nextIndex];
const el = document.querySelector(`[data-discussion-id="${nextId}"]`);
this.jumpToDiscussion(nextId);
if (el) {
this.expandDiscussion({ discussionId: nextId });
scrollToElement(el);
}
}
},
},
};
......@@ -401,7 +397,7 @@ Please check your network connection and try again.`;
</a>
</div>
<div
v-if="showJumpToNextDiscussion"
v-if="hasMultipleUnresolvedDiscussions"
class="btn-group"
role="group">
<button
......@@ -424,8 +420,7 @@ Please check your network connection and try again.`;
:is-editing="false"
save-button-title="Comment"
@handleFormUpdate="saveReply"
@cancelForm="cancelReplyForm"
/>
@cancelForm="cancelReplyForm" />
<note-signed-out-widget v-if="!canReply" />
</div>
</div>
......
app/assets/javascripts/notes/mixins/autosave.js
View file @ 024e3860
......@@ -4,18 +4,12 @@ import { capitalizeFirstCharacter } from '../../lib/utils/text_utility';
export default {
methods: {
initAutoSave(noteable, extraKeys = []) {
let keys = [
initAutoSave(noteable) {
this.autosave = new Autosave($(this.$refs.noteForm.$refs.textarea), [
'Note',
capitalizeFirstCharacter(noteable.noteable_type || noteable.noteableType),
capitalizeFirstCharacter(noteable.noteable_type),
noteable.id,
];
if (extraKeys) {
keys = keys.concat(extraKeys);
}
this.autosave = new Autosave($(this.$refs.noteForm.$refs.textarea), keys);
]);
},
resetAutoSave() {
this.autosave.reset();
......@@ -23,8 +17,5 @@ export default {
setAutoSave() {
this.autosave.save();
},
disposeAutoSave() {
this.autosave.dispose();
},
},
};
app/assets/javascripts/notes/mixins/discussion_navigation.js deleted 100644 → 0
View file @ f0f3821b
import { scrollToElement } from '~/lib/utils/common_utils';
export default {
methods: {
jumpToDiscussion(id) {
if (id) {
const activeTab = window.mrTabs.currentAction;
const selector =
activeTab === 'diffs'
? `ul.notes[data-discussion-id="${id}"]`
: `div.discussion[data-discussion-id="${id}"]`;
const el = document.querySelector(selector);
if (activeTab === 'commits' || activeTab === 'pipelines') {
window.mrTabs.activateTab('show');
}
if (el) {
this.expandDiscussion({ discussionId: id });
scrollToElement(el);
return true;
}
}
return false;
},
},
};
app/assets/javascripts/notes/stores/getters.js
View file @ 024e3860
......@@ -28,6 +28,18 @@ export const notesById = state =>
return acc;
}, {});
export const discussionsByLineCode = state =>
state.discussions.reduce((acc, note) => {
if (note.diff_discussion && note.line_code && note.resolvable) {
// For context about line notes: there might be multiple notes with the same line code
const items = acc[note.line_code] || [];
items.push(note);
Object.assign(acc, { [note.line_code]: items });
}
return acc;
}, {});
export const noteableType = state => {
const { ISSUE_NOTEABLE_TYPE, MERGE_REQUEST_NOTEABLE_TYPE, EPIC_NOTEABLE_TYPE } = constants;
......@@ -70,9 +82,6 @@ export const allDiscussions = (state, getters) => {
return Object.values(resolved).concat(unresolved);
};
export const allResolvableDiscussions = (state, getters) =>
getters.allDiscussions.filter(d => !d.individual_note && d.resolvable);
export const resolvedDiscussionsById = state => {
const map = {};
......@@ -89,51 +98,6 @@ export const resolvedDiscussionsById = state => {
return map;
};
// Gets Discussions IDs ordered by the date of their initial note
export const unresolvedDiscussionsIdsByDate = (state, getters) =>
getters.allResolvableDiscussions
.filter(d => !d.resolved)
.sort((a, b) => {
const aDate = new Date(a.notes[0].created_at);
const bDate = new Date(b.notes[0].created_at);
if (aDate < bDate) {
return -1;
}
return aDate === bDate ? 0 : 1;
})
.map(d => d.id);
// Gets Discussions IDs ordered by their position in the diff
//
// Sorts the array of resolvable yet unresolved discussions by
// comparing file names first. If file names are the same, compares
// line numbers.
export const unresolvedDiscussionsIdsByDiff = (state, getters) =>
getters.allResolvableDiscussions
.filter(d => !d.resolved)
.sort((a, b) => {
if (!a.diff_file || !b.diff_file) {
return 0;
}
// Get file names comparison result
const filenameComparison = a.diff_file.file_path.localeCompare(b.diff_file.file_path);
// Get the line numbers, to compare within the same file
const aLines = [a.position.formatter.new_line, a.position.formatter.old_line];
const bLines = [b.position.formatter.new_line, b.position.formatter.old_line];
return filenameComparison < 0 ||
(filenameComparison === 0 &&
// .max() because one of them might be zero (if removed/added)
Math.max(aLines[0], aLines[1]) < Math.max(bLines[0], bLines[1]))
? -1
: 1;
})
.map(d => d.id);
export const resolvedDiscussionCount = (state, getters) => {
const resolvedMap = getters.resolvedDiscussionsById;
......@@ -150,42 +114,5 @@ export const discussionTabCounter = state => {
return all.length;
};
// Returns the list of discussion IDs ordered according to given parameter
// @param {Boolean} diffOrder - is ordered by diff?
export const unresolvedDiscussionsIdsOrdered = (state, getters) => diffOrder => {
if (diffOrder) {
return getters.unresolvedDiscussionsIdsByDiff;
}
return getters.unresolvedDiscussionsIdsByDate;
};
// Checks if a given discussion is the last in the current order (diff or date)
// @param {Boolean} discussionId - id of the discussion
// @param {Boolean} diffOrder - is ordered by diff?
export const isLastUnresolvedDiscussion = (state, getters) => (discussionId, diffOrder) => {
const idsOrdered = getters.unresolvedDiscussionsIdsOrdered(diffOrder);
const lastDiscussionId = idsOrdered[idsOrdered.length - 1];
return lastDiscussionId === discussionId;
};
// Gets the ID of the discussion following the one provided, respecting order (diff or date)
// @param {Boolean} discussionId - id of the current discussion
// @param {Boolean} diffOrder - is ordered by diff?
export const nextUnresolvedDiscussionId = (state, getters) => (discussionId, diffOrder) => {
const idsOrdered = getters.unresolvedDiscussionsIdsOrdered(diffOrder);
const currentIndex = idsOrdered.indexOf(discussionId);
return idsOrdered.slice(currentIndex + 1, currentIndex + 2)[0];
};
// @param {Boolean} diffOrder - is ordered by diff?
export const firstUnresolvedDiscussionId = (state, getters) => diffOrder => {
if (diffOrder) {
return getters.unresolvedDiscussionsIdsByDiff[0];
}
return getters.unresolvedDiscussionsIdsByDate[0];
};
// prevent babel-plugin-rewire from generating an invalid default during karma tests
export default () => {};
app/assets/javascripts/notes/stores/mutations.js
View file @ 024e3860
......@@ -174,19 +174,27 @@ export default {
[types.UPDATE_NOTE](state, note) {
const noteObj = utils.findNoteObjectById(state.discussions, note.discussion_id);
if (noteObj.individual_note) {
noteObj.notes.splice(0, 1, note);
} else {
const comment = utils.findNoteObjectById(noteObj.notes, note.id);
Object.assign(comment, note);
noteObj.notes.splice(noteObj.notes.indexOf(comment), 1, note);
}
},
[types.UPDATE_DISCUSSION](state, noteData) {
const note = noteData;
const selectedDiscussion = state.discussions.find(n => n.id === note.id);
let index = 0;
state.discussions.forEach((n, i) => {
if (n.id === note.id) {
index = i;
}
});
note.expanded = true; // override expand flag to prevent collapse
Object.assign(selectedDiscussion, note);
state.discussions.splice(index, 1, note);
},
[types.CLOSE_ISSUE](state) {
......@@ -207,9 +215,12 @@ export default {
[types.SET_DISCUSSION_DIFF_LINES](state, { discussionId, diffLines }) {
const discussion = utils.findNoteObjectById(state.discussions, discussionId);
const index = state.discussions.indexOf(discussion);
Object.assign(discussion, {
const discussionWithDiffLines = Object.assign({}, discussion, {
truncated_diff_lines: diffLines,
});
state.discussions.splice(index, 1, discussionWithDiffLines);
},
};
app/assets/javascripts/notes/stores/utils.js
View file @ 024e3860
......@@ -2,11 +2,13 @@ import AjaxCache from '~/lib/utils/ajax_cache';
const REGEX_QUICK_ACTIONS = /^\/\w+.*$/gm;
export const findNoteObjectById = (notes, id) => notes.find(n => n.id === id);
export const findNoteObjectById = (notes, id) =>
notes.filter(n => n.id === id)[0];
export const getQuickActionText = note => {
let text = 'Applying command';
const quickActions = AjaxCache.get(gl.GfmAutoComplete.dataSources.commands) || [];
const quickActions =
AjaxCache.get(gl.GfmAutoComplete.dataSources.commands) || [];
const executedCommands = quickActions.filter(command => {
const commandRegex = new RegExp(`/${command.name}`);
......@@ -27,4 +29,5 @@ export const getQuickActionText = note => {
export const hasQuickActions = note => REGEX_QUICK_ACTIONS.test(note);
export const stripQuickActions = note => note.replace(REGEX_QUICK_ACTIONS, '').trim();
export const stripQuickActions = note =>
note.replace(REGEX_QUICK_ACTIONS, '').trim();
app/assets/javascripts/pipelines/components/graph/dropdown_job_component.vue
View file @ 024e3860
......@@ -14,7 +14,7 @@ import tooltip from '../../../vue_shared/directives/tooltip';
* "id": 4256,
* "name": "test",
* "status": {
* "icon": "icon_status_success",
* "icon": "status_success",
* "text": "passed",
* "label": "passed",
* "group": "success",
......
app/assets/javascripts/pipelines/components/graph/job_component.vue
View file @ 024e3860
......@@ -13,7 +13,7 @@ import tooltip from '../../../vue_shared/directives/tooltip';
* "id": 4256,
* "name": "test",
* "status": {
* "icon": "icon_status_success",
* "icon": "status_success",
* "text": "passed",
* "label": "passed",
* "group": "success",
......
app/assets/javascripts/search_autocomplete.js
View file @ 024e3860
......@@ -137,7 +137,11 @@ export default class SearchAutocomplete {
if (!term) {
const contents = this.getCategoryContents();
if (contents) {
this.searchInput.data('glDropdown').filter.options.callback(contents);
const glDropdownInstance = this.searchInput.data('glDropdown');
if (glDropdownInstance) {
glDropdownInstance.filter.options.callback(contents);
}
this.enableAutocomplete();
}
return;
......
app/assets/javascripts/vue_shared/components/clipboard_button.vue
View file @ 024e3860
......@@ -31,6 +31,11 @@ export default {
type: String,
required: true,
},
gfm: {
type: String,
required: false,
default: null,
},
title: {
type: String,
required: true,
......@@ -51,6 +56,14 @@ export default {
default: 'btn-default',
},
},
computed: {
clipboardText() {
if (this.gfm !== null) {
return JSON.stringify({ text: this.text, gfm: this.gfm });
}
return this.text;
},
},
};
</script>
......@@ -59,7 +72,7 @@ export default {
v-tooltip
:class="cssClass"
:title="title"
:data-clipboard-text="text"
:data-clipboard-text="clipboardText"
:data-container="tooltipContainer"
:data-placement="tooltipPlacement"
type="button"
......
app/assets/javascripts/vue_shared/components/header_ci_component.vue
View file @ 024e3860
......@@ -113,6 +113,9 @@ export default {
{{ user.name }}
</a>
<span
v-if="user.status_tooltip_html"
v-html="user.status_tooltip_html"></span>
</template>
</section>
......
app/assets/javascripts/vue_shared/components/identicon.vue
View file @ 024e3860
<script>
import { getIdenticonBackgroundClass, getIdenticonTitle } from '~/helpers/avatar_helper';
export default {
props: {
entityId: {
......@@ -16,26 +18,11 @@ export default {
},
},
computed: {
/**
* This method is based on app/helpers/avatars_helper.rb#project_identicon
*/
identiconStyles() {
const allowedColors = [
'#FFEBEE',
'#F3E5F5',
'#E8EAF6',
'#E3F2FD',
'#E0F2F1',
'#FBE9E7',
'#EEEEEE',
];
const backgroundColor = allowedColors[this.entityId % 7];
return `background-color: ${backgroundColor}; color: #555;`;
identiconBackgroundClass() {
return getIdenticonBackgroundClass(this.entityId);
},
identiconTitle() {
return this.entityName.charAt(0).toUpperCase();
return getIdenticonTitle(this.entityName);
},
},
};
......@@ -43,8 +30,7 @@ export default {
<template>
<div
:class="sizeClass"
:style="identiconStyles"
:class="[sizeClass, identiconBackgroundClass]"
class="avatar identicon">
{{ identiconTitle }}
</div>
......
app/assets/stylesheets/framework/avatar.scss
View file @ 024e3860
......@@ -69,7 +69,10 @@
.identicon {
text-align: center;
vertical-align: top;
color: $identicon-fg-color;
background-color: $identicon-gray;
// Sizes
&.s16 { font-size: 12px; line-height: 1.33; }
&.s24 { font-size: 13px; line-height: 1.8; }
&.s26 { font-size: 20px; line-height: 1.33; }
......@@ -82,6 +85,15 @@
&.s110 { font-size: 40px; line-height: 108px; font-weight: $gl-font-weight-normal; }
&.s140 { font-size: 72px; line-height: 138px; }
&.s160 { font-size: 96px; line-height: 158px; }
// Background colors
&.bg1 { background-color: $identicon-red; }
&.bg2 { background-color: $identicon-purple; }
&.bg3 { background-color: $identicon-indigo; }
&.bg4 { background-color: $identicon-blue; }
&.bg5 { background-color: $identicon-teal; }
&.bg6 { background-color: $identicon-orange; }
&.bg7 { background-color: $identicon-gray; }
}
.avatar-container {
......
app/assets/stylesheets/framework/typography.scss
View file @ 024e3860
......@@ -444,3 +444,5 @@ textarea {
color: $placeholder-text-color;
}
}
.lh-100 { line-height: 1; }
app/assets/stylesheets/framework/variables.scss
View file @ 024e3860
......@@ -486,6 +486,18 @@ $note-icon-gutter-width: 55px;
*/
$zen-control-color: #555;
/*
* Identicon
*/
$identicon-red: #ffebee;
$identicon-purple: #f3e5f5;
$identicon-indigo: #e8eaf6;
$identicon-blue: #e3f2fd;
$identicon-teal: #e0f2f1;
$identicon-orange: #fbe9e7;
$identicon-gray: $gray-darker;
$identicon-fg-color: #555555;
/*
* Calendar
*/
......
app/assets/stylesheets/pages/boards.scss
View file @ 024e3860
......@@ -205,7 +205,7 @@
.board-title {
margin: 0;
padding: 12px $gl-padding;
padding: $gl-padding-8 $gl-padding;
font-size: 1em;
border-bottom: 1px solid $border-color;
display: flex;
......
app/assets/stylesheets/pages/issues/issue_count_badge.scss
View file @ 024e3860
.issue-count-badge {
display: inline-flex;
align-items: stretch;
height: 24px;
}
.issue-count-badge-count {
display: flex;
align-items: center;
padding-right: 10px;
padding-left: 10px;
border: 1px solid $border-color;
border-radius: $border-radius-base;
line-height: 1;
&.has-btn {
border-right: 0;
border-top-right-radius: 0;
border-bottom-right-radius: 0;
}
border: 1px solid $border-color;
padding: 5px $gl-padding-8;
}
.issue-count-badge-add-button {
display: flex;
.issue-count-badge-count {
display: inline-flex;
align-items: center;
border: 1px solid $border-color;
border-radius: 0 $border-radius-base $border-radius-base 0;
line-height: 1;
}
app/assets/stylesheets/pages/projects.scss
View file @ 024e3860
......@@ -754,6 +754,11 @@
}
}
.repository-languages-bar {
height: 6px;
margin-bottom: 8px;
}
pre.light-well {
border-color: $well-light-border;
}
......
app/assets/stylesheets/pages/reports.scss
View file @ 024e3860
......@@ -75,31 +75,27 @@
margin: 0;
.license-item {
line-height: $gl-padding-24;
line-height: $gl-padding-32;
.license-dependencies {
color: $gl-text-color-tertiary;
.license-packages {
font-size: $label-font-size;
}
.btn-show-all-packages {
line-height: $gl-btn-line-height;
margin-bottom: 2px;
}
}
}
.report-block-list-icon {
display: flex;
&.failed {
&.failed svg {
color: $red-500;
}
&.success {
&.success svg {
color: $green-500;
}
&.neutral {
&.neutral svg {
color: $theme-gray-700;
}
......
app/controllers/admin/jobs_controller.rb
View file @ 024e3860
......@@ -2,7 +2,7 @@ class Admin::JobsController < Admin::ApplicationController
def index
@scope = params[:scope]
@all_builds = Ci::Build
@builds = @all_builds.order('created_at DESC')
@builds = @all_builds.order('id DESC')
@builds =
case @scope
when 'pending'
......
app/controllers/admin/services_controller.rb
View file @ 024e3860
# frozen_string_literal: true
class Admin::ServicesController < Admin::ApplicationController
include ServiceParams
......@@ -30,7 +32,7 @@ class Admin::ServicesController < Admin::ApplicationController
def services_templates
Service.available_services_names.map do |service_name|
service_template = service_name.concat("_service").camelize.constantize
service_template = "#{service_name}_service".camelize.constantize
service_template.where(template: true).first_or_create
end
end
......
app/controllers/application_controller.rb
View file @ 024e3860
......@@ -397,7 +397,7 @@ class ApplicationController < ActionController::Base
# actually stored in the session and a token is needed
# for every request. If you want the token to work as a
# sign in token, you can simply remove store: false.
sign_in user, store: false
sign_in(user, store: false, message: :sessionless_sign_in)
end
end
......
app/controllers/boards/issues_controller.rb
View file @ 024e3860
......@@ -12,8 +12,9 @@ module Boards
skip_before_action :authenticate_user!, only: [:index]
def index
issues = Boards::Issues::ListService.new(board_parent, current_user, filter_params).execute
issues = issues.page(params[:page]).per(params[:per] || 20)
list_service = Boards::Issues::ListService.new(board_parent, current_user, filter_params)
issues = list_service.execute
issues = issues.page(params[:page]).per(params[:per] || 20).without_count
make_sure_position_is_set(issues) if Gitlab::Database.read_write?
issues = issues.preload(:project,
:milestone,
......@@ -22,10 +23,7 @@ module Boards
notes: [:award_emoji, :author]
)
render json: {
issues: serialize_as_json(issues),
size: issues.total_count
}
render_issues(issues, list_service.metadata)
end
def create
......@@ -51,6 +49,13 @@ module Boards
private
def render_issues(issues, metadata)
data = { issues: serialize_as_json(issues) }
data.merge!(metadata)
render json: data
end
def make_sure_position_is_set(issues)
issues.each do |issue|
issue.move_to_end && issue.save unless issue.relative_position
......
app/controllers/concerns/authenticates_with_two_factor.rb
View file @ 024e3860
......@@ -60,7 +60,7 @@ module AuthenticatesWithTwoFactor
remember_me(user) if user_params[:remember_me] == '1'
user.save!
sign_in(user)
sign_in(user, message: :two_factor_authenticated)
else
user.increment_failed_attempts!
Gitlab::AppLogger.info("Failed Login: user=#{user.username} ip=#{request.remote_ip} method=OTP")
......@@ -77,7 +77,7 @@ module AuthenticatesWithTwoFactor
session.delete(:challenge)
remember_me(user) if user_params[:remember_me] == '1'
sign_in(user)
sign_in(user, message: :two_factor_authenticated)
else
user.increment_failed_attempts!
Gitlab::AppLogger.info("Failed Login: user=#{user.username} ip=#{request.remote_ip} method=U2F")
......
app/controllers/concerns/members_presentation.rb
View file @ 024e3860
......@@ -2,10 +2,18 @@ module MembersPresentation
extend ActiveSupport::Concern
def present_members(members)
preload_associations(members)
Gitlab::View::Presenter::Factory.new(
members,
current_user: current_user,
presenter_class: MembersPresenter
).fabricate!
end
def preload_associations(members)
ActiveRecord::Associations::Preloader.new.preload(members, :user)
ActiveRecord::Associations::Preloader.new.preload(members, :source)
ActiveRecord::Associations::Preloader.new.preload(members.map(&:user), :status)
ActiveRecord::Associations::Preloader.new.preload(members.map(&:user), :u2f_registrations)
end
end
app/controllers/concerns/membership_actions.rb
View file @ 024e3860
module MembershipActions
include MembersPresentation
extend ActiveSupport::Concern
def create
......@@ -20,6 +21,7 @@ module MembershipActions
.execute(member)
.present(current_user: current_user)
present_members([member])
respond_to do |format|
format.js { render 'shared/members/update', locals: { member: member } }
end
......
app/controllers/concerns/notes_actions.rb
View file @ 024e3860
......@@ -41,7 +41,7 @@ module NotesActions
@note = Notes::CreateService.new(note_project, current_user, create_params).execute
if @note.is_a?(Note)
Notes::RenderService.new(current_user).execute([@note])
prepare_notes_for_rendering([@note], noteable)
end
respond_to do |format|
......@@ -56,7 +56,7 @@ module NotesActions
@note = Notes::UpdateService.new(project, current_user, note_params).execute(note)
if @note.is_a?(Note)
Notes::RenderService.new(current_user).execute([@note])
prepare_notes_for_rendering([@note])
end
respond_to do |format|
......
app/controllers/concerns/renders_notes.rb
View file @ 024e3860
......@@ -4,6 +4,7 @@ module RendersNotes
preload_noteable_for_regular_notes(notes)
preload_max_access_for_authors(notes, @project)
preload_first_time_contribution_for_authors(noteable, notes)
preload_author_status(notes)
Notes::RenderService.new(current_user).execute(notes)
notes
......@@ -28,4 +29,8 @@ module RendersNotes
notes.each {|n| n.specialize_for_first_contribution!(noteable)}
end
def preload_author_status(notes)
ActiveRecord::Associations::Preloader.new.preload(notes, { author: :status })
end
end
app/controllers/groups/group_members_controller.rb
View file @ 024e3860
......@@ -30,7 +30,7 @@ class Groups::GroupMembersController < Groups::ApplicationController
end
@members = @members.page(params[:page]).per(50)
@members = present_members(@members.includes(:user))
@members = present_members(@members)
@requesters = present_members(
AccessRequestsFinder.new(@group).execute(current_user))
......
app/controllers/instance_statistics/application_controller.rb 0 → 100644
View file @ 024e3860
# frozen_string_literal: true
class InstanceStatistics::ApplicationController < ApplicationController
before_action :authorize_read_instance_statistics!
layout 'instance_statistics'
def authorize_read_instance_statistics!
render_404 unless can?(current_user, :read_instance_statistics)
end
end
app/controllers/admin/cohorts_controller.rb → app/controllers/instance_statistics/cohorts_controller.rb
View file @ 024e3860
class Admin::CohortsController < Admin::ApplicationController
# frozen_string_literal: true
class InstanceStatistics::CohortsController < InstanceStatistics::ApplicationController
def index
if Gitlab::CurrentSettings.usage_ping_enabled
cohorts_results = Rails.cache.fetch('cohorts', expires_in: 1.day) do
......
app/controllers/admin/conversational_development_index_controller.rb → app/controllers/instance_statistics/conversational_development_index_controller.rb
View file @ 024e3860
class Admin::ConversationalDevelopmentIndexController < Admin::ApplicationController
def show
# frozen_string_literal: true
class InstanceStatistics::ConversationalDevelopmentIndexController < InstanceStatistics::ApplicationController
def index
@metric = ConversationalDevelopmentIndex::Metric.order(:created_at).last&.present
end
end
app/controllers/jwt_controller.rb
View file @ 024e3860
......@@ -54,6 +54,22 @@ class JwtController < ApplicationController
end
def auth_params
params.permit(:service, :scope, :account, :client_id)
params.permit(:service, :account, :client_id)
.merge(additional_params)
end
def additional_params
{ scopes: scopes_param }.compact
end
# We have to parse scope here, because Docker Client does not send an array of scopes,
# but rather a flat list and we loose second scope when being processed by Rails:
# scope=scopeA&scope=scopeB
#
# This method makes to always return an array of scopes
def scopes_param
return unless params[:scope].present?
Array(Rack::Utils.parse_query(request.query_string)['scope'])
end
end
app/controllers/profiles_controller.rb
View file @ 024e3860
......@@ -100,7 +100,8 @@ class ProfilesController < Profiles::ApplicationController
:website_url,
:organization,
:preferred_language,
:private_profile
:private_profile,
status: [:emoji, :message]
)
end
end
app/controllers/projects/commit_controller.rb
View file @ 024e3860
......@@ -22,7 +22,9 @@ class Projects::CommitController < Projects::ApplicationController
apply_diff_view_cookie!
respond_to do |format|
format.html { render }
format.html do
render
end
format.diff do
send_git_diff(@project.repository, @commit.diff_refs)
end
......@@ -124,7 +126,10 @@ class Projects::CommitController < Projects::ApplicationController
end
def commit
@noteable = @commit ||= @project.commit_by(oid: params[:id])
@noteable = @commit ||= @project.commit_by(oid: params[:id]).tap do |commit|
# preload author and their status for rendering
commit&.author&.status
end
end
def define_commit_vars
......
app/controllers/projects/issues_controller.rb
View file @ 024e3860
......@@ -165,7 +165,7 @@ class Projects::IssuesController < Projects::ApplicationController
return @issue if defined?(@issue)
# The Sortable default scope causes performance issues when used with find_by
@issuable = @noteable = @issue ||= @project.issues.where(iid: params[:id]).reorder(nil).take!
@issuable = @noteable = @issue ||= @project.issues.includes(author: :status).where(iid: params[:id]).reorder(nil).take!
@note = @project.notes.new(noteable: @issuable)
return render_404 unless can?(current_user, :read_issue, @issue)
......
app/controllers/projects/labels_controller.rb
View file @ 024e3860
......@@ -160,7 +160,10 @@ class Projects::LabelsController < Projects::ApplicationController
def find_labels
@available_labels ||=
LabelsFinder.new(current_user, project_id: @project.id, include_ancestor_groups: params[:include_ancestor_groups]).execute
LabelsFinder.new(current_user,
project_id: @project.id,
include_ancestor_groups: params[:include_ancestor_groups],
search: params[:search]).execute
end
def authorize_admin_labels!
......
app/controllers/projects/lfs_api_controller.rb
View file @ 024e3860
class Projects::LfsApiController < Projects::GitHttpClientController
include LfsRequest
LFS_TRANSFER_CONTENT_TYPE = 'application/octet-stream'.freeze
skip_before_action :lfs_check_access!, only: [:deprecated]
before_action :lfs_check_batch_operation!, only: [:batch]
......@@ -86,7 +88,10 @@ class Projects::LfsApiController < Projects::GitHttpClientController
upload: {
href: "#{project.http_url_to_repo}/gitlab-lfs/objects/#{object[:oid]}/#{object[:size]}",
header: {
Authorization: request.headers['Authorization']
Authorization: request.headers['Authorization'],
# git-lfs v2.5.0 sets the Content-Type based on the uploaded file. This
# ensures that Workhorse can intercept the request.
'Content-Type': LFS_TRANSFER_CONTENT_TYPE
}.compact
}
}
......
app/controllers/projects/merge_requests/application_controller.rb
View file @ 024e3860
......@@ -6,7 +6,7 @@ class Projects::MergeRequests::ApplicationController < Projects::ApplicationCont
private
def merge_request
@issuable = @merge_request ||= @project.merge_requests.find_by!(iid: params[:id])
@issuable = @merge_request ||= @project.merge_requests.includes(author: :status).find_by!(iid: params[:id])
end
def merge_request_params
......
app/controllers/projects/mirrors_controller.rb
View file @ 024e3860
......@@ -13,7 +13,9 @@ class Projects::MirrorsController < Projects::ApplicationController
end
def update
if project.update(mirror_params)
result = ::Projects::UpdateService.new(project, current_user, mirror_params).execute
if result[:status] == :success
flash[:notice] = 'Mirroring settings were successfully updated.'
else
flash[:alert] = project.errors.full_messages.join(', ').html_safe
......
app/controllers/projects/notes_controller.rb
View file @ 024e3860
class Projects::NotesController < Projects::ApplicationController
include RendersNotes
include NotesActions
include NotesHelper
include ToggleAwardEmoji
......@@ -53,7 +54,7 @@ class Projects::NotesController < Projects::ApplicationController
private
def render_json_with_notes_serializer
Notes::RenderService.new(current_user).execute([note])
prepare_notes_for_rendering([note])
render json: note_serializer.represent(note)
end
......
app/controllers/projects/pipelines_controller.rb
View file @ 024e3860
class Projects::PipelinesController < Projects::ApplicationController
before_action :whitelist_query_limiting, only: [:create, :retry]
before_action :pipeline, except: [:index, :new, :create, :charts]
before_action :commit, only: [:show, :builds, :failures]
before_action :authorize_read_pipeline!
before_action :authorize_create_pipeline!, only: [:new, :create]
before_action :authorize_update_pipeline!, only: [:retry, :cancel]
......@@ -161,11 +160,11 @@ class Projects::PipelinesController < Projects::ApplicationController
end
def pipeline
@pipeline ||= project.pipelines.find_by!(id: params[:id]).present(current_user: current_user)
end
def commit
@commit ||= @pipeline.commit
@pipeline ||= project
.pipelines
.includes(user: :status)
.find_by!(id: params[:id])
.present(current_user: current_user)
end
def whitelist_query_limiting
......
app/controllers/projects/snippets_controller.rb
View file @ 024e3860
......@@ -88,7 +88,7 @@ class Projects::SnippetsController < Projects::ApplicationController
protected
def snippet
@snippet ||= @project.snippets.find(params[:id])
@snippet ||= @project.snippets.inc_relations_for_view.find(params[:id])
end
alias_method :awardable, :snippet
alias_method :spammable, :snippet
......
app/controllers/projects/wikis_controller.rb
View file @ 024e3860
class Projects::WikisController < Projects::ApplicationController
include PreviewMarkdown
include Gitlab::Utils::StrongMemoize
before_action :authorize_read_wiki!
before_action :authorize_create_wiki!, only: [:edit, :create, :history]
before_action :authorize_admin_wiki!, only: :destroy
before_action :load_project_wiki
before_action :load_page, only: [:show, :edit, :update, :history, :destroy]
before_action :valid_encoding?, only: [:show, :edit, :update], if: :load_page
before_action only: [:edit, :update], unless: :valid_encoding? do
redirect_to(project_wiki_path(@project, @page))
end
def pages
@wiki_pages = Kaminari.paginate_array(@project_wiki.pages).page(params[:page])
......@@ -12,11 +18,11 @@ class Projects::WikisController < Projects::ApplicationController
end
def show
@page = @project_wiki.find_page(params[:id], params[:version_id])
view_param = @project_wiki.empty? ? params[:view] : 'create'
if @page
set_encoding_error unless valid_encoding?
render 'show'
elsif file = @project_wiki.find_file(params[:id], params[:version_id])
response.headers['Content-Security-Policy'] = "default-src 'none'"
......@@ -38,13 +44,11 @@ class Projects::WikisController < Projects::ApplicationController
end
def edit
@page = @project_wiki.find_page(params[:id])
end
def update
return render('empty') unless can?(current_user, :create_wiki, @project)
@page = @project_wiki.find_page(params[:id])
@page = WikiPages::UpdateService.new(@project, current_user, wiki_params).execute(@page)
if @page.valid?
......@@ -79,8 +83,6 @@ class Projects::WikisController < Projects::ApplicationController
end
def history
@page = @project_wiki.find_page(params[:id])
if @page
@page_versions = Kaminari.paginate_array(@page.versions(page: params[:page].to_i),
total_count: @page.count_versions)
......@@ -94,8 +96,6 @@ class Projects::WikisController < Projects::ApplicationController
end
def destroy
@page = @project_wiki.find_page(params[:id])
WikiPages::DestroyService.new(@project, current_user).execute(@page)
redirect_to project_wiki_path(@project, :home),
......@@ -141,4 +141,25 @@ class Projects::WikisController < Projects::ApplicationController
page.update_attributes(args) # rubocop:disable Rails/ActiveRecordAliases
end
end
def load_page
@page ||= @project_wiki.find_page(*page_params)
end
def page_params
keys = [:id]
keys << :version_id if params[:action] == 'show'
params.values_at(*keys)
end
def valid_encoding?
strong_memoize(:valid_encoding) do
@page.content.encoding == Encoding::UTF_8
end
end
def set_encoding_error
flash.now[:notice] = "The content of this page is not encoded in UTF-8. Edits can only be made via the Git repository."
end
end
app/controllers/sessions_controller.rb
View file @ 024e3860
......@@ -89,6 +89,14 @@ class SessionsController < Devise::SessionsController
).increment
end
##
# We do have some duplication between lib/gitlab/auth/activity.rb here, but
# leaving this method here because of backwards compatibility.
#
def login_counter
@login_counter ||= Gitlab::Metrics.counter(:user_session_logins_total, 'User sign in count')
end
def log_failed_login
Gitlab::AppLogger.info("Failed Login: username=#{user_params[:login]} ip=#{request.remote_ip}")
end
......@@ -97,10 +105,6 @@ class SessionsController < Devise::SessionsController
(options = env["warden.options"]) && options[:action] == "unauthenticated"
end
def login_counter
@login_counter ||= Gitlab::Metrics.counter(:user_session_logins_total, 'User sign in count')
end
# Handle an "initial setup" state, where there's only one user, it's an admin,
# and they require a password change.
def check_initial_setup
......
app/controllers/snippets/notes_controller.rb
View file @ 024e3860
......@@ -9,7 +9,7 @@ class Snippets::NotesController < ApplicationController
private
def note
@note ||= snippet.notes.find(params[:id])
@note ||= snippet.notes.inc_relations_for_view.find(params[:id])
end
alias_method :awardable, :note
......
app/controllers/snippets_controller.rb
View file @ 024e3860
......@@ -95,7 +95,7 @@ class SnippetsController < ApplicationController
protected
def snippet
@snippet ||= PersonalSnippet.find_by(id: params[:id])
@snippet ||= PersonalSnippet.inc_relations_for_view.find_by(id: params[:id])
end
alias_method :awardable, :snippet
......
app/finders/issuable_finder.rb
View file @ 024e3860
......@@ -130,7 +130,7 @@ class IssuableFinder
counts[:all] = counts.values.sum
counts
counts.with_indifferent_access
end
def group
......
app/finders/labels_finder.rb
View file @ 024e3860
......@@ -14,6 +14,7 @@ class LabelsFinder < UnionFinder
@skip_authorization = skip_authorization
items = find_union(label_ids, Label) || Label.none
items = with_title(items)
items = by_search(items)
sort(items)
end
......@@ -63,6 +64,12 @@ class LabelsFinder < UnionFinder
items.where(title: title)
end
def by_search(labels)
return labels unless search?
labels.search(params[:search])
end
# Gets redacted array of group ids
# which can include the ancestors and descendants of the requested group.
def group_ids_for(group)
......@@ -106,6 +113,10 @@ class LabelsFinder < UnionFinder
params[:only_group_labels]
end
def search?
params[:search].present?
end
def title
params[:title] || params[:name]
end
......
app/helpers/application_settings_helper.rb
View file @ 024e3860
......@@ -148,6 +148,7 @@ module ApplicationSettingsHelper
:after_sign_up_text,
:akismet_api_key,
:akismet_enabled,
:allow_local_requests_from_hooks_and_services,
:authorized_keys_enabled,
:auto_devops_enabled,
:auto_devops_domain,
......@@ -174,6 +175,7 @@ module ApplicationSettingsHelper
:ed25519_key_restriction,
:email_author_in_body,
:enabled_git_access_protocol,
:enforce_terms,
:gitaly_timeout_default,
:gitaly_timeout_medium,
:gitaly_timeout_fast,
......@@ -182,6 +184,7 @@ module ApplicationSettingsHelper
:help_page_hide_commercial_content,
:help_page_support_url,
:help_page_text,
:hide_third_party_offers,
:home_page_url,
:housekeeping_bitmaps_enabled,
:housekeeping_enabled,
......@@ -203,6 +206,7 @@ module ApplicationSettingsHelper
:metrics_port,
:metrics_sample_interval,
:metrics_timeout,
:mirror_available,
:pages_domain_verification_enabled,
:password_authentication_enabled_for_web,
:password_authentication_enabled_for_git,
......@@ -233,28 +237,25 @@ module ApplicationSettingsHelper
:sign_in_text,
:signup_enabled,
:terminal_max_session_time,
:throttle_unauthenticated_enabled,
:throttle_unauthenticated_requests_per_period,
:throttle_unauthenticated_period_in_seconds,
:throttle_authenticated_web_enabled,
:throttle_authenticated_web_requests_per_period,
:throttle_authenticated_web_period_in_seconds,
:terms,
:throttle_authenticated_api_enabled,
:throttle_authenticated_api_requests_per_period,
:throttle_authenticated_api_period_in_seconds,
:throttle_authenticated_api_requests_per_period,
:throttle_authenticated_web_enabled,
:throttle_authenticated_web_period_in_seconds,
:throttle_authenticated_web_requests_per_period,
:throttle_unauthenticated_enabled,
:throttle_unauthenticated_period_in_seconds,
:throttle_unauthenticated_requests_per_period,
:two_factor_grace_period,
:unique_ips_limit_enabled,
:unique_ips_limit_per_user,
:unique_ips_limit_time_window,
:usage_ping_enabled,
:instance_statistics_visibility_private,
:user_default_external,
:user_oauth_applications,
:version_check_enabled,
:allow_local_requests_from_hooks_and_services,
:hide_third_party_offers,
:enforce_terms,
:terms,
:mirror_available
:version_check_enabled
]
end
end
app/helpers/avatars_helper.rb
View file @ 024e3860
......@@ -15,22 +15,12 @@ module AvatarsHelper
end
def project_identicon(project, options = {})
allowed_colors = {
red: 'FFEBEE',
purple: 'F3E5F5',
indigo: 'E8EAF6',
blue: 'E3F2FD',
teal: 'E0F2F1',
orange: 'FBE9E7',
gray: 'EEEEEE'
}
bg_key = (project.id % 7) + 1
options[:class] ||= ''
options[:class] << ' identicon'
bg_key = project.id % 7
style = "background-color: ##{allowed_colors.values[bg_key]}; color: #555"
options[:class] << " bg#{bg_key}"
content_tag(:div, class: options[:class], style: style) do
content_tag(:div, class: options[:class]) do
project.name[0, 1].upcase
end
end
......
app/helpers/issuables_helper.rb
View file @ 024e3860
......@@ -159,6 +159,12 @@ module IssuablesHelper
output << content_tag(:strong) do
author_output = link_to_member(project, issuable.author, size: 24, mobile_classes: "d-none d-sm-inline", tooltip: true)
author_output << link_to_member(project, issuable.author, size: 24, by_username: true, avatar: false, mobile_classes: "d-block d-sm-none")
if status = user_status(issuable.author)
author_output << "&ensp; #{status}".html_safe
end
author_output
end
output << "&ensp;".html_safe
......
app/helpers/profiles_helper.rb
View file @ 024e3860
......@@ -9,4 +9,8 @@ module ProfilesHelper
end
end
end
def show_user_status_field?
Feature.enabled?(:user_status_form) || cookies[:feature_user_status_form] == 'true'
end
end
app/helpers/repository_languages_helper.rb 0 → 100644
View file @ 024e3860
module RepositoryLanguagesHelper
def repository_languages_bar(languages)
return if languages.none?
content_tag :div, class: 'progress repository-languages-bar' do
safe_join(languages.map { |lang| language_progress(lang) })
end
end
def language_progress(lang)
content_tag :div, nil,
class: "progress-bar has-tooltip",
style: "width: #{lang.share}%; background-color:#{lang.color}",
title: lang.name
end
end
app/helpers/users_helper.rb
View file @ 024e3860
......@@ -39,6 +39,24 @@ module UsersHelper
"access:#{max_project_member_access(project)}"
end
def user_status(user)
return unless user
unless user.association(:status).loaded?
exception = RuntimeError.new("Status was not preloaded")
Gitlab::Sentry.track_exception(exception, extra: { user: user.inspect })
end
return unless user.status
content_tag :span,
class: 'user-status-emoji has-tooltip',
title: user.status.message_html,
data: { html: true, placement: 'top' } do
emoji_icon user.status.emoji
end
end
private
def get_profile_tabs
......
app/models/ability.rb
View file @ 024e3860
# frozen_string_literal: true
require_dependency 'declarative_policy'
class Ability
......
app/models/abuse_report.rb
View file @ 024e3860
# frozen_string_literal: true
class AbuseReport < ActiveRecord::Base
include CacheMarkdownField
......
app/models/active_session.rb
View file @ 024e3860
# frozen_string_literal: true
class ActiveSession
include ActiveModel::Model
......
app/models/appearance.rb
View file @ 024e3860
# frozen_string_literal: true
class Appearance < ActiveRecord::Base
include CacheableAttributes
include CacheMarkdownField
......
app/models/application_setting.rb
View file @ 024e3860
# frozen_string_literal: true
class ApplicationSetting < ActiveRecord::Base
include CacheableAttributes
include CacheMarkdownField
......@@ -228,25 +230,27 @@ class ApplicationSetting < ActiveRecord::Base
{
after_sign_up_text: nil,
akismet_enabled: false,
allow_local_requests_from_hooks_and_services: false,
authorized_keys_enabled: true, # TODO default to false if the instance is configured to use AuthorizedKeysCommand
container_registry_token_expire_delay: 5,
default_artifacts_expire_in: '30 days',
default_branch_protection: Settings.gitlab['default_branch_protection'],
default_group_visibility: Settings.gitlab.default_projects_features['visibility_level'],
default_project_visibility: Settings.gitlab.default_projects_features['visibility_level'],
default_projects_limit: Settings.gitlab['default_projects_limit'],
default_snippet_visibility: Settings.gitlab.default_projects_features['visibility_level'],
default_group_visibility: Settings.gitlab.default_projects_features['visibility_level'],
disabled_oauth_sign_in_sources: [],
domain_whitelist: Settings.gitlab['domain_whitelist'],
dsa_key_restriction: 0,
ecdsa_key_restriction: 0,
ed25519_key_restriction: 0,
gitaly_timeout_default: 55,
gitaly_timeout_fast: 10,
gitaly_timeout_medium: 30,
gravatar_enabled: Settings.gravatar['enabled'],
help_page_text: nil,
help_page_hide_commercial_content: false,
unique_ips_limit_per_user: 10,
unique_ips_limit_time_window: 3600,
unique_ips_limit_enabled: false,
help_page_text: nil,
hide_third_party_offers: false,
housekeeping_bitmaps_enabled: true,
housekeeping_enabled: true,
housekeeping_full_repack_period: 50,
......@@ -257,12 +261,14 @@ class ApplicationSetting < ActiveRecord::Base
koding_url: nil,
max_artifacts_size: Settings.artifacts['max_size'],
max_attachment_size: Settings.gitlab['max_attachment_size'],
password_authentication_enabled_for_web: Settings.gitlab['signin_enabled'],
mirror_available: true,
password_authentication_enabled_for_git: true,
password_authentication_enabled_for_web: Settings.gitlab['signin_enabled'],
performance_bar_allowed_group_id: nil,
rsa_key_restriction: 0,
plantuml_enabled: false,
plantuml_url: nil,
polling_interval_multiplier: 1,
project_export_enabled: true,
recaptcha_enabled: false,
repository_checks_enabled: true,
......@@ -277,25 +283,22 @@ class ApplicationSetting < ActiveRecord::Base
sign_in_text: nil,
signup_enabled: Settings.gitlab['signup_enabled'],
terminal_max_session_time: 0,
throttle_unauthenticated_enabled: false,
throttle_unauthenticated_requests_per_period: 3600,
throttle_unauthenticated_period_in_seconds: 3600,
throttle_authenticated_web_enabled: false,
throttle_authenticated_web_requests_per_period: 7200,
throttle_authenticated_web_period_in_seconds: 3600,
throttle_authenticated_api_enabled: false,
throttle_authenticated_api_requests_per_period: 7200,
throttle_authenticated_api_period_in_seconds: 3600,
throttle_authenticated_api_requests_per_period: 7200,
throttle_authenticated_web_enabled: false,
throttle_authenticated_web_period_in_seconds: 3600,
throttle_authenticated_web_requests_per_period: 7200,
throttle_unauthenticated_enabled: false,
throttle_unauthenticated_period_in_seconds: 3600,
throttle_unauthenticated_requests_per_period: 3600,
two_factor_grace_period: 48,
user_default_external: false,
polling_interval_multiplier: 1,
unique_ips_limit_enabled: false,
unique_ips_limit_per_user: 10,
unique_ips_limit_time_window: 3600,
usage_ping_enabled: Settings.gitlab['usage_ping_enabled'],
gitaly_timeout_fast: 10,
gitaly_timeout_medium: 30,
gitaly_timeout_default: 55,
allow_local_requests_from_hooks_and_services: false,
hide_third_party_offers: false,
mirror_available: true
instance_statistics_visibility_private: false,
user_default_external: false
}
end
......
app/models/audit_event.rb
View file @ 024e3860
# frozen_string_literal: true
class AuditEvent < ActiveRecord::Base
serialize :details, Hash # rubocop:disable Cop/ActiveRecordSerialize
......
app/models/award_emoji.rb
View file @ 024e3860
# frozen_string_literal: true
class AwardEmoji < ActiveRecord::Base
DOWNVOTE_NAME = "thumbsdown".freeze
UPVOTE_NAME = "thumbsup".freeze
......
app/models/badge.rb
View file @ 024e3860
# frozen_string_literal: true
class Badge < ActiveRecord::Base
# This structure sets the placeholders that the urls
# can have. This hash also sets which action to ask when
......
app/models/blob.rb
View file @ 024e3860
# frozen_string_literal: true
# Blob is a Rails-specific wrapper around Gitlab::Git::Blob objects
class Blob < SimpleDelegator
CACHE_TIME = 60 # Cache raw blobs referred to by a (mutable) ref for 1 minute
......
app/models/board.rb
View file @ 024e3860
# frozen_string_literal: true
class Board < ActiveRecord::Base
belongs_to :group
belongs_to :project
......
app/models/broadcast_message.rb
View file @ 024e3860
This diff is collapsed.
app/models/chat_name.rb
View file @ 024e3860
This diff is collapsed.
app/models/chat_team.rb
View file @ 024e3860
This diff is collapsed.
app/models/ci/build.rb
View file @ 024e3860
This diff is collapsed.
app/models/ci/build_runner_session.rb
View file @ 024e3860
This diff is collapsed.
app/models/ci/job_artifact.rb
View file @ 024e3860
This diff is collapsed.
app/models/clusters/applications/ingress.rb
View file @ 024e3860
This diff is collapsed.
app/models/clusters/applications/jupyter.rb
View file @ 024e3860
This diff is collapsed.
app/models/clusters/applications/runner.rb
View file @ 024e3860
This diff is collapsed.
app/models/clusters/concerns/application_version.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
app/models/commit.rb
View file @ 024e3860
This diff is collapsed.
app/models/commit_range.rb
View file @ 024e3860
This diff is collapsed.
app/models/commit_status.rb
View file @ 024e3860
This diff is collapsed.
app/models/compare.rb
View file @ 024e3860
This diff is collapsed.
app/models/concerns/atomic_internal_id.rb
View file @ 024e3860
This diff is collapsed.
app/models/concerns/label_eventable.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
app/models/container_repository.rb
View file @ 024e3860
This diff is collapsed.
app/models/cycle_analytics.rb
View file @ 024e3860
This diff is collapsed.
app/models/dashboard_milestone.rb
View file @ 024e3860
This diff is collapsed.
app/models/deploy_key.rb
View file @ 024e3860
This diff is collapsed.
app/models/deploy_keys_project.rb
View file @ 024e3860
This diff is collapsed.
app/models/deploy_token.rb
View file @ 024e3860
This diff is collapsed.
app/models/deployment.rb
View file @ 024e3860
This diff is collapsed.
app/models/diff_discussion.rb
View file @ 024e3860
This diff is collapsed.
app/models/diff_note.rb
View file @ 024e3860
This diff is collapsed.
app/models/directly_addressed_user.rb
View file @ 024e3860
This diff is collapsed.
app/models/discussion.rb
View file @ 024e3860
This diff is collapsed.
app/models/discussion_note.rb
View file @ 024e3860
This diff is collapsed.
app/models/email.rb
View file @ 024e3860
This diff is collapsed.
app/models/environment.rb
View file @ 024e3860
This diff is collapsed.
app/models/epic.rb
View file @ 024e3860
This diff is collapsed.
app/models/event.rb
View file @ 024e3860
This diff is collapsed.
app/models/event_collection.rb
View file @ 024e3860
This diff is collapsed.
app/models/external_issue.rb
View file @ 024e3860
This diff is collapsed.
app/models/fork_network.rb
View file @ 024e3860
This diff is collapsed.
app/models/fork_network_member.rb
View file @ 024e3860
This diff is collapsed.
app/models/forked_project_link.rb
View file @ 024e3860
This diff is collapsed.
app/models/generic_commit_status.rb
View file @ 024e3860
This diff is collapsed.
app/models/global_label.rb
View file @ 024e3860
This diff is collapsed.
app/models/global_milestone.rb
View file @ 024e3860
This diff is collapsed.
app/models/gpg_key.rb
View file @ 024e3860
This diff is collapsed.
app/models/gpg_key_subkey.rb
View file @ 024e3860
This diff is collapsed.
app/models/gpg_signature.rb
View file @ 024e3860
This diff is collapsed.
app/models/group.rb
View file @ 024e3860
This diff is collapsed.
app/models/group_custom_attribute.rb
View file @ 024e3860
This diff is collapsed.
app/models/group_label.rb
View file @ 024e3860
This diff is collapsed.
app/models/group_milestone.rb
View file @ 024e3860
This diff is collapsed.
app/models/guest.rb
View file @ 024e3860
This diff is collapsed.
app/models/identity.rb
View file @ 024e3860
This diff is collapsed.
app/models/import_export_upload.rb
View file @ 024e3860
This diff is collapsed.
app/models/individual_note_discussion.rb
View file @ 024e3860
This diff is collapsed.
app/models/instance_configuration.rb
View file @ 024e3860
This diff is collapsed.
app/models/internal_id.rb
View file @ 024e3860
This diff is collapsed.
app/models/issue.rb
View file @ 024e3860
This diff is collapsed.
app/models/issue_assignee.rb
View file @ 024e3860
This diff is collapsed.
app/models/issue_collection.rb
View file @ 024e3860
This diff is collapsed.
app/models/key.rb
View file @ 024e3860
This diff is collapsed.
app/models/label.rb
View file @ 024e3860
This diff is collapsed.
app/models/label_link.rb
View file @ 024e3860
This diff is collapsed.
app/models/label_priority.rb
View file @ 024e3860
This diff is collapsed.
app/models/legacy_diff_discussion.rb
View file @ 024e3860
This diff is collapsed.
app/models/legacy_diff_note.rb
View file @ 024e3860
This diff is collapsed.
app/models/lfs_file_lock.rb
View file @ 024e3860
This diff is collapsed.
app/models/lfs_object.rb
View file @ 024e3860
This diff is collapsed.
app/models/lfs_objects_project.rb
View file @ 024e3860
This diff is collapsed.
app/models/list.rb
View file @ 024e3860
This diff is collapsed.
app/models/member.rb
View file @ 024e3860
This diff is collapsed.
app/models/merge_request.rb
View file @ 024e3860
This diff is collapsed.
app/models/merge_request_diff.rb
View file @ 024e3860
This diff is collapsed.
app/models/merge_request_diff_commit.rb
View file @ 024e3860
This diff is collapsed.
app/models/merge_request_diff_file.rb
View file @ 024e3860
This diff is collapsed.
app/models/merge_requests_closing_issues.rb
View file @ 024e3860
This diff is collapsed.
app/models/milestone.rb
View file @ 024e3860
This diff is collapsed.
app/models/namespace.rb
View file @ 024e3860
This diff is collapsed.
app/models/note.rb
View file @ 024e3860
This diff is collapsed.
app/models/note_diff_file.rb
View file @ 024e3860
This diff is collapsed.
app/models/notification_reason.rb
View file @ 024e3860
This diff is collapsed.
app/models/notification_recipient.rb
View file @ 024e3860
This diff is collapsed.
app/models/notification_setting.rb
View file @ 024e3860
This diff is collapsed.
app/models/oauth_access_grant.rb
View file @ 024e3860
This diff is collapsed.
app/models/oauth_access_token.rb
View file @ 024e3860
This diff is collapsed.
app/models/out_of_context_discussion.rb
View file @ 024e3860
This diff is collapsed.
app/models/pages_domain.rb
View file @ 024e3860
This diff is collapsed.
app/models/personal_access_token.rb
View file @ 024e3860
This diff is collapsed.
app/models/personal_snippet.rb
View file @ 024e3860
This diff is collapsed.
app/models/programming_language.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
app/models/project.rb
View file @ 024e3860
This diff is collapsed.
app/models/project_authorization.rb
View file @ 024e3860
This diff is collapsed.
app/models/project_auto_devops.rb
View file @ 024e3860
This diff is collapsed.
app/models/project_ci_cd_setting.rb
View file @ 024e3860
This diff is collapsed.
app/models/project_custom_attribute.rb
View file @ 024e3860
This diff is collapsed.
app/models/project_deploy_token.rb
View file @ 024e3860
This diff is collapsed.
app/models/project_feature.rb
View file @ 024e3860
This diff is collapsed.
app/models/project_group_link.rb
View file @ 024e3860
This diff is collapsed.
app/models/project_import_data.rb
View file @ 024e3860
This diff is collapsed.
app/models/project_import_state.rb
View file @ 024e3860
This diff is collapsed.
app/models/project_label.rb
View file @ 024e3860
This diff is collapsed.
app/models/project_snippet.rb
View file @ 024e3860
This diff is collapsed.
app/models/project_statistics.rb
View file @ 024e3860
This diff is collapsed.
app/models/project_team.rb
View file @ 024e3860
This diff is collapsed.
app/models/protectable_dropdown.rb
View file @ 024e3860
This diff is collapsed.
app/models/protected_branch.rb
View file @ 024e3860
This diff is collapsed.
app/models/protected_ref_matcher.rb
View file @ 024e3860
This diff is collapsed.
app/models/protected_tag.rb
View file @ 024e3860
This diff is collapsed.
app/models/push_event.rb
View file @ 024e3860
This diff is collapsed.
app/models/push_event_payload.rb
View file @ 024e3860
This diff is collapsed.
app/models/readme_blob.rb
View file @ 024e3860
This diff is collapsed.
app/models/redirect_route.rb
View file @ 024e3860
This diff is collapsed.
app/models/release.rb
View file @ 024e3860
This diff is collapsed.
app/models/remote_mirror.rb
View file @ 024e3860
This diff is collapsed.
app/models/repository.rb
View file @ 024e3860
This diff is collapsed.
app/models/repository_language.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
app/models/resource_label_event.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
app/models/route.rb
View file @ 024e3860
This diff is collapsed.
app/models/security_event.rb
View file @ 024e3860
This diff is collapsed.
app/models/sent_notification.rb
View file @ 024e3860
This diff is collapsed.
app/models/service.rb
View file @ 024e3860
This diff is collapsed.
app/models/snippet.rb
View file @ 024e3860
This diff is collapsed.
app/models/snippet_blob.rb
View file @ 024e3860
This diff is collapsed.
app/models/spam_log.rb
View file @ 024e3860
This diff is collapsed.
app/models/subscription.rb
View file @ 024e3860
This diff is collapsed.
app/models/system_note_metadata.rb
View file @ 024e3860
This diff is collapsed.
app/models/term_agreement.rb
View file @ 024e3860
This diff is collapsed.
app/models/timelog.rb
View file @ 024e3860
This diff is collapsed.
app/models/todo.rb
View file @ 024e3860
This diff is collapsed.
app/models/tree.rb
View file @ 024e3860
This diff is collapsed.
app/models/trending_project.rb
View file @ 024e3860
This diff is collapsed.
app/models/u2f_registration.rb
View file @ 024e3860
This diff is collapsed.
app/models/upload.rb
View file @ 024e3860
This diff is collapsed.
app/models/user.rb
View file @ 024e3860
This diff is collapsed.
app/models/user_agent_detail.rb
View file @ 024e3860
This diff is collapsed.
app/models/user_callout.rb
View file @ 024e3860
This diff is collapsed.
app/models/user_custom_attribute.rb
View file @ 024e3860
This diff is collapsed.
app/models/user_interacted_project.rb
View file @ 024e3860
This diff is collapsed.
app/models/user_status.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
app/models/users_star_project.rb
View file @ 024e3860
This diff is collapsed.
app/models/wiki_directory.rb
View file @ 024e3860
This diff is collapsed.
app/models/wiki_page.rb
View file @ 024e3860
This diff is collapsed.
app/policies/global_policy.rb
View file @ 024e3860
This diff is collapsed.
app/policies/user_policy.rb
View file @ 024e3860
This diff is collapsed.
app/presenters/ci/build_runner_presenter.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
app/presenters/commit_status_presenter.rb
View file @ 024e3860
This diff is collapsed.
app/serializers/concerns/user_status_tooltip.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
app/serializers/discussion_entity.rb
View file @ 024e3860
This diff is collapsed.
app/serializers/user_entity.rb
View file @ 024e3860
This diff is collapsed.
app/services/boards/issues/list_service.rb
View file @ 024e3860
This diff is collapsed.
app/services/ci/register_job_service.rb
View file @ 024e3860
This diff is collapsed.
app/services/git_push_service.rb
View file @ 024e3860
This diff is collapsed.
app/services/git_tag_push_service.rb
View file @ 024e3860
This diff is collapsed.
app/services/issues/update_service.rb
View file @ 024e3860
This diff is collapsed.
app/services/members/destroy_service.rb
View file @ 024e3860
This diff is collapsed.
app/services/projects/detect_repository_languages_service.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
app/services/projects/update_service.rb
View file @ 024e3860
This diff is collapsed.
app/services/resource_events/change_labels_service.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
app/services/todos/destroy/base_service.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
app/services/todos/destroy/confidential_issue_service.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
app/services/todos/destroy/entity_leave_service.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
app/services/todos/destroy/private_features_service.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
app/services/todos/destroy/project_private_service.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
app/services/users/set_status_service.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
app/services/users/update_service.rb
View file @ 024e3860
This diff is collapsed.
app/uploaders/import_export_uploader.rb
View file @ 024e3860
This diff is collapsed.
app/views/layouts/instance_statistics.html.haml 0 → 100644
View file @ 024e3860
This diff is collapsed.
app/views/layouts/nav/_dashboard.html.haml
View file @ 024e3860
This diff is collapsed.
app/views/layouts/nav/sidebar/_instance_statistics.html.haml 0 → 100644
View file @ 024e3860
This diff is collapsed.
app/views/profiles/show.html.haml
View file @ 024e3860
This diff is collapsed.
app/views/projects/jobs/_sidebar.html.haml
View file @ 024e3860
This diff is collapsed.
app/views/projects/jobs/show.html.haml
View file @ 024e3860
This diff is collapsed.
app/views/projects/labels/index.html.haml
View file @ 024e3860
This diff is collapsed.
app/views/projects/pipelines/show.html.haml
View file @ 024e3860
This diff is collapsed.
app/views/projects/show.html.haml
View file @ 024e3860
This diff is collapsed.
app/views/shared/members/_member.html.haml
View file @ 024e3860
This diff is collapsed.
app/views/shared/notes/_note.html.haml
View file @ 024e3860
This diff is collapsed.
app/views/shared/snippets/_header.html.haml
View file @ 024e3860
This diff is collapsed.
app/views/users/show.html.haml
View file @ 024e3860
This diff is collapsed.
app/workers/all_queues.yml
View file @ 024e3860
This diff is collapsed.
app/workers/concerns/todos_destroyer_queue.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
app/workers/create_gpg_signature_worker.rb
View file @ 024e3860
This diff is collapsed.
app/workers/detect_repository_languages_worker.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
app/workers/repository_import_worker.rb
View file @ 024e3860
This diff is collapsed.
app/workers/todos_destroyer/confidential_issue_worker.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
app/workers/todos_destroyer/entity_leave_worker.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
app/workers/todos_destroyer/private_features_worker.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
app/workers/todos_destroyer/project_private_worker.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
changelogs/unreleased/1756-set-iid-via-api.yml 0 → 100644
View file @ 024e3860
This diff is collapsed.
changelogs/unreleased/34572-ssh-certificates.yml 0 → 100644
View file @ 024e3860
This diff is collapsed.
changelogs/unreleased/4525-fix-project-indexes.yml deleted 100644 → 0
View file @ f0f3821b
This diff is collapsed.
changelogs/unreleased/47728-mr-api-documentation-changes.yml 0 → 100644
View file @ 024e3860
This diff is collapsed.
changelogs/unreleased/48246-osw-load-diffs-improvement.yml 0 → 100644
View file @ 024e3860
This diff is collapsed.
changelogs/unreleased/48823-copy-gfm.yml 0 → 100644
View file @ 024e3860
This diff is collapsed.
changelogs/unreleased/49161-disable-toggle-comments.yml 0 → 100644
View file @ 024e3860
This diff is collapsed.
changelogs/unreleased/49747-update-poll-2xx.yml 0 → 100644
View file @ 024e3860
This diff is collapsed.
changelogs/unreleased/49830-use-helm-272.yml 0 → 100644
View file @ 024e3860
This diff is collapsed.
changelogs/unreleased/49851-link-to-runners.yml 0 → 100644
View file @ 024e3860
This diff is collapsed.
changelogs/unreleased/_acet-fix-mr-autosave.yml deleted 100644 → 0
View file @ f0f3821b
This diff is collapsed.
changelogs/unreleased/artifact-format-v2.yml 0 → 100644
View file @ 024e3860
This diff is collapsed.
changelogs/unreleased/bvl-user-status-message-35463.yml 0 → 100644
View file @ 024e3860
This diff is collapsed.
changelogs/unreleased/dz-labels-search.yml 0 → 100644
View file @ 024e3860
This diff is collapsed.
changelogs/unreleased/feature-gb-login-activity-metrics.yml 0 → 100644
View file @ 024e3860
This diff is collapsed.
changelogs/unreleased/fix-multiple-scopes.yml 0 → 100644
View file @ 024e3860
This diff is collapsed.
changelogs/unreleased/fj-49802-bug-api-set-http-headers.yml 0 → 100644
View file @ 024e3860
This diff is collapsed.
changelogs/unreleased/floating-avarage-commit-numbers.yml 0 → 100644
View file @ 024e3860
This diff is collapsed.
changelogs/unreleased/frozen-string-enable-app-models.yml 0 → 100644
View file @ 024e3860
This diff is collapsed.
changelogs/unreleased/ide-edit-json-files.yml deleted 100644 → 0
View file @ f0f3821b
This diff is collapsed.
changelogs/unreleased/ide-warn-staged-files.yml 0 → 100644
View file @ 024e3860
This diff is collapsed.
changelogs/unreleased/jprovazn-resource-events.yml 0 → 100644
View file @ 024e3860
This diff is collapsed.
changelogs/unreleased/rails5-gpg-permit-concurrent.yml 0 → 100644
View file @ 024e3860
This diff is collapsed.
changelogs/unreleased/runner-features.yml 0 → 100644
View file @ 024e3860
This diff is collapsed.
changelogs/unreleased/sh-lfs-fix-content-type.yml 0 → 100644
View file @ 024e3860
This diff is collapsed.
changelogs/unreleased/sh-simplify-liveness-check.yml 0 → 100644
View file @ 024e3860
This diff is collapsed.
changelogs/unreleased/todos-visibility-change.yml 0 → 100644
View file @ 024e3860
This diff is collapsed.
changelogs/unreleased/zj-backup-timeout.yml deleted 100644 → 0
View file @ f0f3821b
This diff is collapsed.
changelogs/unreleased/zj-remove-git-rake-tasks.yml 0 → 100644
View file @ 024e3860
This diff is collapsed.
changelogs/unreleased/zj-repository-languages.yml 0 → 100644
View file @ 024e3860
This diff is collapsed.
config/application.rb
View file @ 024e3860
This diff is collapsed.
config/initializers/rbtrace.rb deleted 100644 → 0
View file @ f0f3821b
This diff is collapsed.
config/initializers/sidekiq.rb
View file @ 024e3860
This diff is collapsed.
config/initializers/warden.rb
View file @ 024e3860
This diff is collapsed.
config/routes.rb
View file @ 024e3860
This diff is collapsed.
config/routes/admin.rb
View file @ 024e3860
This diff is collapsed.
config/routes/instance_statistics.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
config/sidekiq_queues.yml
View file @ 024e3860
This diff is collapsed.
config/unicorn.rb.example
View file @ 024e3860
This diff is collapsed.
db/migrate/20180531185349_add_repository_languages.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
db/migrate/20180713092803_create_user_statuses.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
db/migrate/20180726172057_create_resource_label_events.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
db/schema.rb
View file @ 024e3860
This diff is collapsed.
doc/README.md
View file @ 024e3860
This diff is collapsed.
doc/administration/high_availability/nfs.md
View file @ 024e3860
This diff is collapsed.
doc/administration/img/raketasks/check_repos_output.png deleted 100644 → 0
View file @ f0f3821b
This diff is collapsed.
doc/administration/index.md
View file @ 024e3860
This diff is collapsed.
doc/administration/operations/index.md
View file @ 024e3860
This diff is collapsed.
doc/administration/operations/ssh_certificates.md 0 → 100644
View file @ 024e3860
This diff is collapsed.
doc/administration/raketasks/check.md
View file @ 024e3860
This diff is collapsed.
doc/administration/troubleshooting/debug.md
View file @ 024e3860
This diff is collapsed.
doc/api/issues.md
View file @ 024e3860
This diff is collapsed.
doc/api/merge_requests.md
View file @ 024e3860
This diff is collapsed.
doc/api/settings.md
View file @ 024e3860
This diff is collapsed.
doc/api/users.md
View file @ 024e3860
This diff is collapsed.
doc/ci/yaml/README.md
View file @ 024e3860
This diff is collapsed.
doc/development/fe_guide/performance.md
View file @ 024e3860
This diff is collapsed.
doc/development/performance.md
View file @ 024e3860
This diff is collapsed.
doc/gitlab-basics/create-project.md
View file @ 024e3860
This diff is collapsed.
doc/install/installation.md
View file @ 024e3860
This diff is collapsed.
doc/raketasks/cleanup.md
View file @ 024e3860
This diff is collapsed.
doc/update/11.1-to-11.2.md 0 → 100644
View file @ 024e3860
This diff is collapsed.
doc/update/patch_versions.md
View file @ 024e3860
This diff is collapsed.
lib/api/entities.rb
View file @ 024e3860
This diff is collapsed.
lib/api/helpers/headers_helpers.rb
View file @ 024e3860
This diff is collapsed.
lib/api/internal.rb
View file @ 024e3860
This diff is collapsed.
lib/api/issues.rb
View file @ 024e3860
This diff is collapsed.
lib/api/members.rb
View file @ 024e3860
This diff is collapsed.
lib/api/projects.rb
View file @ 024e3860
This diff is collapsed.
lib/api/runner.rb
View file @ 024e3860
This diff is collapsed.
lib/api/settings.rb
View file @ 024e3860
This diff is collapsed.
lib/api/users.rb
View file @ 024e3860
This diff is collapsed.
lib/backup/repository.rb
View file @ 024e3860
This diff is collapsed.
lib/banzai/pipeline/emoji_pipeline.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
lib/feature.rb
View file @ 024e3860
This diff is collapsed.
lib/gitlab/auth/activity.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
lib/gitlab/auth/blocked_user_tracker.rb
View file @ 024e3860
This diff is collapsed.
lib/gitlab/ci/config/entry/artifacts.rb
View file @ 024e3860
This diff is collapsed.
lib/gitlab/ci/config/entry/commands.rb
View file @ 024e3860
This diff is collapsed.
lib/gitlab/ci/config/entry/reports.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
lib/gitlab/ci/config/entry/validators.rb
View file @ 024e3860
This diff is collapsed.
lib/gitlab/ci/status/build/failed.rb
View file @ 024e3860
This diff is collapsed.
lib/gitlab/ci/trace.rb
View file @ 024e3860
This diff is collapsed.
lib/gitlab/cleanup/project_upload_file_finder.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
lib/gitlab/cleanup/project_uploads.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
lib/gitlab/git/repository.rb
View file @ 024e3860
This diff is collapsed.
lib/gitlab/git_post_receive.rb
View file @ 024e3860
This diff is collapsed.
lib/gitlab/gpg.rb
View file @ 024e3860
This diff is collapsed.
lib/gitlab/graphs/commits.rb
View file @ 024e3860
This diff is collapsed.
lib/gitlab/import_export/file_importer.rb
View file @ 024e3860
This diff is collapsed.
lib/gitlab/import_export/import_export.yml
View file @ 024e3860
This diff is collapsed.
lib/gitlab/import_export/importer.rb
View file @ 024e3860
This diff is collapsed.
lib/gitlab/import_export/uploads_manager.rb
View file @ 024e3860
This diff is collapsed.
lib/gitlab/import_sources.rb
View file @ 024e3860
This diff is collapsed.
lib/gitlab/kubernetes/helm.rb
View file @ 024e3860
This diff is collapsed.
lib/gitlab/language_detection.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
lib/gitlab/middleware/basic_health_check.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
lib/gitlab/template_helper.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
lib/tasks/gitlab/check.rake
View file @ 024e3860
This diff is collapsed.
lib/tasks/gitlab/cleanup.rake
View file @ 024e3860
This diff is collapsed.
lib/tasks/gitlab/git.rake
View file @ 024e3860
This diff is collapsed.
locale/bg/gitlab.po
View file @ 024e3860
This diff is collapsed.
locale/cs_CZ/gitlab.po
View file @ 024e3860
This diff is collapsed.
locale/de/gitlab.po
View file @ 024e3860
This diff is collapsed.
locale/eo/gitlab.po
View file @ 024e3860
This diff is collapsed.
locale/es/gitlab.po
View file @ 024e3860
This diff is collapsed.
locale/fil_PH/gitlab.po
View file @ 024e3860
This diff is collapsed.
locale/fr/gitlab.po
View file @ 024e3860
This diff is collapsed.
locale/gitlab.pot
View file @ 024e3860
This diff is collapsed.
locale/gl_ES/gitlab.po
View file @ 024e3860
This diff is collapsed.
locale/id_ID/gitlab.po
View file @ 024e3860
This diff is collapsed.
locale/it/gitlab.po
View file @ 024e3860
This diff is collapsed.
locale/ja/gitlab.po
View file @ 024e3860
This diff is collapsed.
locale/ko/gitlab.po
View file @ 024e3860
This diff is collapsed.
locale/nl_NL/gitlab.po
View file @ 024e3860
This diff is collapsed.
locale/pl_PL/gitlab.po
View file @ 024e3860
This diff is collapsed.
locale/pt_BR/gitlab.po
View file @ 024e3860
This diff is collapsed.
locale/ru/gitlab.po
View file @ 024e3860
This diff is collapsed.
locale/tr_TR/gitlab.po
View file @ 024e3860
This diff is collapsed.
locale/uk/gitlab.po
View file @ 024e3860
This diff is collapsed.
locale/zh_CN/gitlab.po
View file @ 024e3860
This diff is collapsed.
locale/zh_HK/gitlab.po
View file @ 024e3860
This diff is collapsed.
locale/zh_TW/gitlab.po
View file @ 024e3860
This diff is collapsed.
spec/factories/ci/builds.rb
View file @ 024e3860
This diff is collapsed.
spec/factories/ci/job_artifacts.rb
View file @ 024e3860
This diff is collapsed.
spec/factories/programming_languages.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
spec/factories/repository_languages.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
spec/factories/resource_label_events.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
spec/factories/user_statuses.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
spec/features/dashboard/active_tab_spec.rb
View file @ 024e3860
This diff is collapsed.
spec/features/dashboard/instance_statistics_spec.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
spec/features/groups/board_spec.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
spec/features/projects/labels/search_labels_spec.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
spec/features/snippets/show_spec.rb
View file @ 024e3860
This diff is collapsed.
spec/features/users/login_spec.rb
View file @ 024e3860
This diff is collapsed.
spec/features/users/show_spec.rb
View file @ 024e3860
This diff is collapsed.
spec/finders/labels_finder_spec.rb
View file @ 024e3860
This diff is collapsed.
spec/fixtures/junit.xml.gz 0 → 100644
View file @ 024e3860
This diff is collapsed.
spec/javascripts/.eslintrc.yml
View file @ 024e3860
This diff is collapsed.
spec/javascripts/autosave_spec.js
View file @ 024e3860
This diff is collapsed.
spec/javascripts/avatar_helper_spec.js 0 → 100644
View file @ 024e3860
This diff is collapsed.
spec/javascripts/datetime_utility_spec.js
View file @ 024e3860
This diff is collapsed.
spec/javascripts/diffs/store/utils_spec.js
View file @ 024e3860
This diff is collapsed.
spec/javascripts/ide/components/ide_spec.js
View file @ 024e3860
This diff is collapsed.
spec/javascripts/lib/utils/poll_spec.js
View file @ 024e3860
This diff is collapsed.
spec/javascripts/notes/mock_data.js
View file @ 024e3860
This diff is collapsed.
spec/javascripts/pdf/page_spec.js
View file @ 024e3860
This diff is collapsed.
spec/javascripts/test_bundle.js
View file @ 024e3860
This diff is collapsed.
spec/lib/backup/repository_spec.rb
View file @ 024e3860
This diff is collapsed.
spec/lib/banzai/pipeline/emoji_pipeline_spec.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
spec/lib/gitlab/auth/activity_spec.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
spec/lib/gitlab/ci/config/entry/reports_spec.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
spec/lib/gitlab/git/blame_spec.rb
View file @ 024e3860
This diff is collapsed.
spec/lib/gitlab/git/blob_snippet_spec.rb
View file @ 024e3860
This diff is collapsed.
spec/lib/gitlab/git/blob_spec.rb
View file @ 024e3860
This diff is collapsed.
spec/lib/gitlab/git/branch_spec.rb
View file @ 024e3860
This diff is collapsed.
spec/lib/gitlab/git/commit_spec.rb
View file @ 024e3860
This diff is collapsed.
spec/lib/gitlab/git/compare_spec.rb
View file @ 024e3860
This diff is collapsed.
spec/lib/gitlab/git/diff_collection_spec.rb
View file @ 024e3860
This diff is collapsed.
spec/lib/gitlab/git/diff_spec.rb
View file @ 024e3860
This diff is collapsed.
spec/lib/gitlab/git/hooks_service_spec.rb
View file @ 024e3860
This diff is collapsed.
spec/lib/gitlab/git/index_spec.rb
View file @ 024e3860
This diff is collapsed.
spec/lib/gitlab/git/repository_spec.rb
View file @ 024e3860
This diff is collapsed.
spec/lib/gitlab/git/tag_spec.rb
View file @ 024e3860
This diff is collapsed.
spec/lib/gitlab/git/tree_spec.rb
View file @ 024e3860
This diff is collapsed.
spec/lib/gitlab/gitaly_client/storage_service_spec.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
spec/lib/gitlab/graphs/commits_spec.rb
View file @ 024e3860
This diff is collapsed.
spec/lib/gitlab/import_export/importer_object_storage_spec.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
spec/lib/gitlab/language_detection_spec.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
spec/lib/gitlab/middleware/basic_health_check_spec.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
spec/models/ci/build_runner_session_spec.rb
View file @ 024e3860
This diff is collapsed.
spec/models/ci/build_spec.rb
View file @ 024e3860
This diff is collapsed.
spec/models/ci/job_artifact_spec.rb
View file @ 024e3860
This diff is collapsed.
spec/models/deploy_token_spec.rb
View file @ 024e3860
This diff is collapsed.
spec/models/internal_id_spec.rb
View file @ 024e3860
This diff is collapsed.
spec/models/label_spec.rb
View file @ 024e3860
This diff is collapsed.
spec/models/merge_request_diff_spec.rb
View file @ 024e3860
This diff is collapsed.
spec/models/milestone_spec.rb
View file @ 024e3860
This diff is collapsed.
spec/models/programming_language_spec.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
spec/models/project_spec.rb
View file @ 024e3860
This diff is collapsed.
spec/models/project_statistics_spec.rb
View file @ 024e3860
This diff is collapsed.
spec/models/repository_language_spec.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
spec/models/resource_label_event_spec.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
spec/models/user_spec.rb
View file @ 024e3860
This diff is collapsed.
spec/models/user_status_spec.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
spec/policies/global_policy_spec.rb
View file @ 024e3860
This diff is collapsed.
spec/policies/user_policy_spec.rb
View file @ 024e3860
This diff is collapsed.
spec/presenters/ci/build_runner_presenter_spec.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
spec/requests/api/files_spec.rb
View file @ 024e3860
This diff is collapsed.
spec/requests/api/internal_spec.rb
View file @ 024e3860
This diff is collapsed.
spec/requests/api/issues_spec.rb
View file @ 024e3860
This diff is collapsed.
spec/requests/api/jobs_spec.rb
View file @ 024e3860
This diff is collapsed.
spec/requests/api/members_spec.rb
View file @ 024e3860
This diff is collapsed.
spec/requests/api/project_import_spec.rb
View file @ 024e3860
This diff is collapsed.
spec/requests/api/runner_spec.rb
View file @ 024e3860
This diff is collapsed.
spec/requests/api/settings_spec.rb
View file @ 024e3860
This diff is collapsed.
spec/requests/api/users_spec.rb
View file @ 024e3860
This diff is collapsed.
spec/requests/jwt_controller_spec.rb
View file @ 024e3860
This diff is collapsed.
spec/requests/lfs_http_spec.rb
View file @ 024e3860
This diff is collapsed.
spec/routing/instance_statistics_routing_spec.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
spec/services/git_push_service_spec.rb
View file @ 024e3860
This diff is collapsed.
spec/services/issues/update_service_spec.rb
View file @ 024e3860
This diff is collapsed.
spec/services/resource_events/change_labels_service_spec.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
spec/services/todos/destroy/confidential_issue_service_spec.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
spec/services/todos/destroy/entity_leave_service_spec.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
spec/services/todos/destroy/private_features_service_spec.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
spec/services/todos/destroy/project_private_service_spec.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
spec/services/users/set_status_service_spec.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
spec/services/users/update_service_spec.rb
View file @ 024e3860
This diff is collapsed.
spec/support/helpers/seed_helper.rb
View file @ 024e3860
This diff is collapsed.
spec/support/helpers/stub_metrics.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
spec/support/helpers/test_env.rb
View file @ 024e3860
This diff is collapsed.
spec/support/matchers/metric_counter_matcher.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
spec/support/matchers/user_status_matcher.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
spec/support/rspec.rb
View file @ 024e3860
This diff is collapsed.
spec/support/stored_repositories.rb
View file @ 024e3860
This diff is collapsed.
spec/tasks/gitlab/backup_rake_spec.rb
View file @ 024e3860
This diff is collapsed.
spec/tasks/gitlab/cleanup_rake_spec.rb
View file @ 024e3860
This diff is collapsed.
spec/tasks/gitlab/git_rake_spec.rb
View file @ 024e3860
This diff is collapsed.
spec/workers/detect_repository_languages_worker_spec.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
spec/workers/todos_destroyer/confidential_issue_worker_spec.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
spec/workers/todos_destroyer/entity_leave_worker_spec.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
spec/workers/todos_destroyer/private_features_worker_spec.rb 0 → 100644
View file @ 024e3860
This diff is collapsed.
spec/workers/todos_destroyer/project_private_worker_spec.rb 0 → 100644
View file @ 024e3860
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