Skip to content

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

Merge branch 'master' into 32163-protected-branch-form-should-have-sane-defaults-for-dropdowns

parents e0fc02f1 18fee306
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 12400 additions and 6584 deletions
.eslintignore
View file @ a2dcf052
......@@ -8,4 +8,4 @@
karma.config.js
webpack.config.js
svg.config.js
/app/assets/javascripts/locale/**/*.js
/app/assets/javascripts/locale/**/app.js
.gitignore
View file @ a2dcf052
......@@ -63,4 +63,5 @@ eslint-report.html
/.gitlab_workhorse_secret
/webpack-report/
/locale/**/LC_MESSAGES
/locale/**/*.time_stamp
/.rspec
.gitlab-ci.yml
View file @ a2dcf052
......@@ -404,6 +404,7 @@ docs lint:
before_script: []
script:
- scripts/lint-doc.sh
- scripts/lint-changelog-yaml
- mv doc/ /nanoc/content/
- cd /nanoc
# Build HTML from Markdown
......
CHANGELOG.md
View file @ a2dcf052
......@@ -2,6 +2,13 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
## 10.0.2 (2017-09-27)
- [FIXED] Notes will not show an empty bubble when the author isn't a member. !14450
- [FIXED] Some checks in `rake gitlab:check` were failling with 'undefined method `run_command`'. !14469
- [FIXED] Make locked setting of Runner to not affect jobs scheduling. !14483
- [FIXED] Re-allow `name` attribute on user-provided anchor HTML.
## 10.0.1 (2017-09-23)
- [FIXED] Fix duplicate key errors in PostDeployMigrateUserExternalMailData migration.
......@@ -78,6 +85,8 @@ entry.
- [FIXED] Fixed merge request changes bar jumping.
- [FIXED] Improve migrations using triggers.
- [FIXED] Fix ConvDev Index nav item and Monitoring submenu regression.
- [FIXED] disabling notifications globally now properly turns off group/project added
emails !13325
- [DEPRECATED] Deprecate custom SSH client configuration for the git user. !13930
- [CHANGED] allow all users to delete their account. !13636 (Jacopo Beschi @jacopo-beschi)
- [CHANGED] Use full path of project's avatar in webhooks. !13649 (Vitaliy @blackst0ne Klachkov)
......@@ -186,6 +195,13 @@ entry.
- Added type to CHANGELOG entries. (Jacopo Beschi @jacopo-beschi)
- [BUGIFX] Improves subgroup creation permissions. !13418
## 9.5.6 (2017-09-29)
- [FIXED] Fix MR ready to merge buttons/controls at mobile breakpoint. !14242
- [FIXED] Fix errors thrown in merge request widget with external CI service/integration.
- [FIXED] Update x/x discussions resolved checkmark icon to be green when all discussions resolved.
- [FIXED] Fix 500 error on merged merge requests when GitLab is restored from a backup.
## 9.5.5 (2017-09-18)
- [SECURITY] Upgrade mail and nokogiri gems due to security issues. !13662 (Markus Koller)
......
CONTRIBUTING.md
View file @ a2dcf052
......@@ -49,7 +49,7 @@ _This notice should stay as the first item in the CONTRIBUTING.md file._
Thank you for your interest in contributing to GitLab. This guide details how
to contribute to GitLab in a way that is efficient for everyone.
Looking for something to work on? Look for the label [Accepting Merge Requests](#i-want-to-contribute).
Looking for something to work on? Look for issues with the label [Accepting Merge Requests](#i-want-to-contribute).
GitLab comes into two flavors, GitLab Community Edition (CE) our free and open
source edition, and GitLab Enterprise Edition (EE) which is our commercial
......@@ -101,7 +101,7 @@ the remaining issues on the GitHub issue tracker.
## I want to contribute!
If you want to contribute to GitLab, but are not sure where to start,
look for [issues with the label `Accepting Merge Requests` and weight < 5][accepting-mrs-weight].
look for [issues with the label `Accepting Merge Requests` and small weight][accepting-mrs-weight].
These issues will be of reasonable size and challenge, for anyone to start
contributing to GitLab.
......@@ -209,8 +209,7 @@ We add the ~"Accepting Merge Requests" label to:
- Low priority ~bug issues (i.e. we do not add it to the bugs that we want to
solve in the ~"Next Patch Release")
- Small ~"feature proposal" that do not need ~UX / ~"Product work", or for which
the ~UX / ~"Product work" is already done
- Small ~"feature proposal"
- Small ~"technical debt" issues
After adding the ~"Accepting Merge Requests" label, we try to estimate the
......@@ -223,6 +222,17 @@ know how difficult the issue is. Additionally:
- We encourage people that have never contributed to any open source project to
look for ["Accepting Merge Requests" issues with a weight of 1][firt-timers]
If you've decided that you would like to work on an issue, please @-mention
the [appropriate product manager](https://about.gitlab.com/handbook/product/#who-to-talk-to-for-what)
as soon as possible. The product manager will then pull in appropriate GitLab team
members to further discuss scope, design, and technical considerations. This will
ensure that that your contribution is aligned with the GitLab product and minimize
any rework and delay in getting it merged into master.
GitLab team members who apply the ~"Accepting Merge Requests" label to an issue
should update the issue description with a responsible product manager, inviting
any potential community contributor to @-mention per above.
[up-for-grabs]: https://gitlab.com/gitlab-org/gitlab-ce/issues?label_name=Accepting+Merge+Requests&scope=all&sort=weight_asc&state=opened
[firt-timers]: https://gitlab.com/gitlab-org/gitlab-ce/issues?label_name%5B%5D=Accepting+Merge+Requests&scope=all&sort=upvotes_desc&state=opened&weight=1
......
Gemfile
View file @ a2dcf052
......@@ -398,7 +398,7 @@ group :ed25519 do
end
# Gitaly GRPC client
gem 'gitaly-proto', '~> 0.33.0', require: 'gitaly'
gem 'gitaly-proto', '~> 0.39.0', require: 'gitaly'
gem 'toml-rb', '~> 0.3.15', require: false
......
Gemfile.lock
View file @ a2dcf052
......@@ -275,7 +275,7 @@ GEM
po_to_json (>= 1.0.0)
rails (>= 3.2.0)
gherkin-ruby (0.3.2)
gitaly-proto (0.33.0)
gitaly-proto (0.39.0)
google-protobuf (~> 3.1)
grpc (~> 1.0)
github-linguist (4.7.6)
......@@ -1025,7 +1025,7 @@ DEPENDENCIES
gettext (~> 3.2.2)
gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.2.0)
gitaly-proto (~> 0.33.0)
gitaly-proto (~> 0.39.0)
github-linguist (~> 4.7.0)
gitlab-flowdock-git-hook (~> 1.0.1)
gitlab-markup (~> 1.6.2)
......
app/assets/images/icons.json
View file @ a2dcf052
{"iconCount":134,"icons":["abuse","account","admin","angle-double-left","angle-down","angle-left","angle-right","angle-up","appearance","applications","approval","arrow-right","assignee","bold","book","branch","calendar","cancel","chevron-down","chevron-left","chevron-right","chevron-up","clock","code","comment-dots","comment-next","comment","comments","commit","credit-card","disk","doc_code","doc_image","doc_text","download","duplicate","earth","eye-slash","eye","file-additions","file-deletion","file-modified","filter","folder","fork","geo-nodes","git-merge","group","history","home","hook","issue-block","issue-child","issue-close","issue-duplicate","issue-new","issue-open-m","issue-open","issue-parent","issues","key-2","key","label","labels","leave","level-up","license","link","list-bulleted","list-numbered","location-dot","location","lock-open","lock","log","mail","merge-request-close-m","merge-request-close","messages","mobile-issue-close","monitor","more","notifications-off","notifications","overview","pencil","pipeline","play","plus-square-o","plus-square","plus","preferences","profile","project","push-rules","question-o","question","quote","redo","remove","repeat","retry","scale","screen-full","screen-normal","search","settings","shield","slight-frown","slight-smile","smile","smiley","snippet","spam","star-o","star","stop","talic","task-done","template","thump-down","thump-up","timer","todo-add","todo-done","token","unapproval","unassignee","unlink","user","users","volume-up","warning","work"]}
\ No newline at end of file
{"iconCount":135,"spriteSize":58718,"icons":["abuse","account","admin","angle-double-left","angle-double-right","angle-down","angle-left","angle-right","angle-up","appearance","applications","approval","arrow-right","assignee","bold","book","branch","calendar","cancel","chevron-down","chevron-left","chevron-right","chevron-up","clock","close","code","comment-dots","comment-next","comment","comments","commit","credit-card","disk","doc_code","doc_image","doc_text","download","duplicate","earth","eye-slash","eye","file-additions","file-deletion","file-modified","filter","folder","fork","geo-nodes","git-merge","group","history","home","hook","issue-block","issue-child","issue-close","issue-duplicate","issue-new","issue-open-m","issue-open","issue-parent","issues","key-2","key","label","labels","leave","level-up","license","link","list-bulleted","list-numbered","location-dot","location","lock-open","lock","log","mail","merge-request-close","messages","mobile-issue-close","monitor","more","notifications-off","notifications","overview","pencil","pipeline","play","plus-square-o","plus-square","plus","preferences","profile","project","push-rules","question-o","question","quote","redo","remove","repeat","retry","scale","screen-full","screen-normal","search","settings","shield","slight-frown","slight-smile","smile","smiley","snippet","spam","star-o","star","stop","talic","task-done","template","thump-down","thump-up","timer","todo-add","todo-done","token","unapproval","unassignee","unlink","user","users","volume-up","warning","work"]}
\ No newline at end of file
app/assets/images/icons.svg
View file @ a2dcf052
This source diff could not be displayed because it is too large. You can view the blob instead.
app/assets/images/sprite.symbol.html deleted 100644 → 0
View file @ e0fc02f1
This source diff could not be displayed because it is too large. You can view the blob instead.
app/assets/javascripts/blob/notebook/index.js
View file @ a2dcf052
......@@ -40,10 +40,10 @@ export default () => {
class="text-center"
v-if="error">
<span v-if="loadError">
An error occured whilst loading the file. Please try again later.
An error occurred whilst loading the file. Please try again later.
</span>
<span v-else>
An error occured whilst parsing the file.
An error occurred whilst parsing the file.
</span>
</p>
</div>
......
app/assets/javascripts/blob/pdf/index.js
View file @ a2dcf052
......@@ -48,10 +48,10 @@ export default () => {
class="text-center"
v-if="error">
<span v-if="loadError">
An error occured whilst loading the file. Please try again later.
An error occurred whilst loading the file. Please try again later.
</span>
<span v-else>
An error occured whilst decoding the file.
An error occurred whilst decoding the file.
</span>
</p>
</div>
......
app/assets/javascripts/boards/boards_bundle.js
View file @ a2dcf052
......@@ -77,9 +77,6 @@ $(() => {
});
Store.rootPath = this.boardsEndpoint;
this.filterManager = new FilteredSearchBoards(Store.filter, true);
this.filterManager.setup();
// Listen for updateTokens event
eventHub.$on('updateTokens', this.updateTokens);
},
......@@ -87,6 +84,9 @@ $(() => {
eventHub.$off('updateTokens', this.updateTokens);
},
mounted () {
this.filterManager = new FilteredSearchBoards(Store.filter, true);
this.filterManager.setup();
Store.disabled = this.disabled;
gl.boardService.all()
.then(response => response.json())
......
app/assets/javascripts/boards/components/board_new_issue.js
View file @ a2dcf052
......@@ -68,7 +68,7 @@ export default {
<div class="flash-container"
v-if="error">
<div class="flash-alert">
An error occured. Please try again.
An error occurred. Please try again.
</div>
</div>
<label class="label-light"
......
app/assets/javascripts/build.js
View file @ a2dcf052
......@@ -167,7 +167,7 @@ window.Build = (function () {
Build.prototype.getBuildTrace = function () {
return $.ajax({
url: `${this.pageUrl}/trace.json`,
data: this.state,
data: { state: this.state },
})
.done((log) => {
setCiStatusFavicon(`${this.pageUrl}/status.json`);
......
app/assets/javascripts/copy_as_gfm.js
View file @ a2dcf052
......@@ -298,7 +298,7 @@ class CopyAsGFM {
const documentFragment = getSelectedFragment();
if (!documentFragment) return;
const el = transformer(documentFragment.cloneNode(true));
const el = transformer(documentFragment.cloneNode(true), e.currentTarget);
if (!el) return;
e.preventDefault();
......@@ -338,55 +338,64 @@ class CopyAsGFM {
}
static transformGFMSelection(documentFragment) {
const gfmEls = documentFragment.querySelectorAll('.md, .wiki');
switch (gfmEls.length) {
const gfmElements = documentFragment.querySelectorAll('.md, .wiki');
switch (gfmElements.length) {
case 0: {
return documentFragment;
}
case 1: {
return gfmEls[0];
return gfmElements[0];
}
default: {
const allGfmEl = document.createElement('div');
const allGfmElement = document.createElement('div');
for (let i = 0; i < gfmEls.length; i += 1) {
const lineEl = gfmEls[i];
allGfmEl.appendChild(lineEl);
allGfmEl.appendChild(document.createTextNode('\n\n'));
for (let i = 0; i < gfmElements.length; i += 1) {
const gfmElement = gfmElements[i];
allGfmElement.appendChild(gfmElement);
allGfmElement.appendChild(document.createTextNode('\n\n'));
}
return allGfmEl;
return allGfmElement;
}
}
}
static transformCodeSelection(documentFragment) {
const lineEls = documentFragment.querySelectorAll('.line');
static transformCodeSelection(documentFragment, target) {
let lineSelector = '.line';
let codeEl;
if (lineEls.length > 1) {
codeEl = document.createElement('pre');
codeEl.className = 'code highlight';
if (target) {
const lineClass = ['left-side', 'right-side'].filter(name => target.classList.contains(name))[0];
if (lineClass) {
lineSelector = `.line_content.${lineClass} ${lineSelector}`;
}
}
const lineElements = documentFragment.querySelectorAll(lineSelector);
let codeElement;
if (lineElements.length > 1) {
codeElement = document.createElement('pre');
codeElement.className = 'code highlight';
const lang = lineEls[0].getAttribute('lang');
const lang = lineElements[0].getAttribute('lang');
if (lang) {
codeEl.setAttribute('lang', lang);
codeElement.setAttribute('lang', lang);
}
} else {
codeEl = document.createElement('code');
codeElement = document.createElement('code');
}
if (lineEls.length > 0) {
for (let i = 0; i < lineEls.length; i += 1) {
const lineEl = lineEls[i];
codeEl.appendChild(lineEl);
codeEl.appendChild(document.createTextNode('\n'));
if (lineElements.length > 0) {
for (let i = 0; i < lineElements.length; i += 1) {
const lineElement = lineElements[i];
codeElement.appendChild(lineElement);
codeElement.appendChild(document.createTextNode('\n'));
}
} else {
codeEl.appendChild(documentFragment);
codeElement.appendChild(documentFragment);
}
return codeEl;
return codeElement;
}
static nodeToGFM(node, respectWhitespaceParam = false) {
......
app/assets/javascripts/cycle_analytics/components/stage_code_component.vue
View file @ a2dcf052
<script>
import userAvatarImage from '../../vue_shared/components/user_avatar/user_avatar_image.vue';
import limitWarning from './limit_warning_component.vue';
import totalTime from './total_time_component.vue';
export default {
props: {
......@@ -8,6 +10,8 @@
},
components: {
userAvatarImage,
limitWarning,
totalTime,
},
};
</script>
......
app/assets/javascripts/cycle_analytics/components/stage_component.vue
View file @ a2dcf052
<script>
import userAvatarImage from '../../vue_shared/components/user_avatar/user_avatar_image.vue';
import limitWarning from './limit_warning_component.vue';
import totalTime from './total_time_component.vue';
export default {
props: {
......@@ -8,6 +10,8 @@
},
components: {
userAvatarImage,
limitWarning,
totalTime,
},
};
</script>
......
app/assets/javascripts/cycle_analytics/components/stage_plan_component.vue
View file @ a2dcf052
<script>
import userAvatarImage from '../../vue_shared/components/user_avatar/user_avatar_image.vue';
import iconCommit from '../svg/icon_commit.svg';
import userAvatarImage from '../../vue_shared/components/user_avatar/user_avatar_image.vue';
import iconCommit from '../svg/icon_commit.svg';
import limitWarning from './limit_warning_component.vue';
import totalTime from './total_time_component.vue';
export default {
props: {
items: Array,
stage: Object,
},
components: {
userAvatarImage,
},
computed: {
iconCommit() {
return iconCommit;
export default {
props: {
items: Array,
stage: Object,
},
},
};
components: {
userAvatarImage,
totalTime,
limitWarning,
},
computed: {
iconCommit() {
return iconCommit;
},
},
};
</script>
<template>
<div>
......
app/assets/javascripts/cycle_analytics/components/stage_review_component.vue
View file @ a2dcf052
<script>
import userAvatarImage from '../../vue_shared/components/user_avatar/user_avatar_image.vue';
import limitWarning from './limit_warning_component.vue';
import totalTime from './total_time_component.vue';
export default {
props: {
......@@ -8,6 +10,8 @@
},
components: {
userAvatarImage,
totalTime,
limitWarning,
},
};
</script>
......
app/assets/javascripts/cycle_analytics/components/stage_staging_component.vue
View file @ a2dcf052
<script>
import userAvatarImage from '../../vue_shared/components/user_avatar/user_avatar_image.vue';
import iconBranch from '../svg/icon_branch.svg';
import limitWarning from './limit_warning_component.vue';
import totalTime from './total_time_component.vue';
export default {
props: {
......@@ -9,6 +11,8 @@
},
components: {
userAvatarImage,
totalTime,
limitWarning,
},
computed: {
iconBranch() {
......
app/assets/javascripts/cycle_analytics/components/stage_test_component.vue
View file @ a2dcf052
<script>
import iconBuildStatus from '../svg/icon_build_status.svg';
import iconBranch from '../svg/icon_branch.svg';
import iconBuildStatus from '../svg/icon_build_status.svg';
import iconBranch from '../svg/icon_branch.svg';
import limitWarning from './limit_warning_component.vue';
import totalTime from './total_time_component.vue';
export default {
props: {
items: Array,
stage: Object,
},
computed: {
iconBuildStatus() {
return iconBuildStatus;
export default {
props: {
items: Array,
stage: Object,
},
iconBranch() {
return iconBranch;
components: {
totalTime,
limitWarning,
},
},
};
computed: {
iconBuildStatus() {
return iconBuildStatus;
},
iconBranch() {
return iconBranch;
},
},
};
</script>
<template>
<div>
......
app/assets/javascripts/cycle_analytics/cycle_analytics_bundle.js
View file @ a2dcf052
......@@ -3,14 +3,12 @@
import Vue from 'vue';
import Cookies from 'js-cookie';
import Translate from '../vue_shared/translate';
import limitWarningComponent from './components/limit_warning_component.vue';
import stageCodeComponent from './components/stage_code_component.vue';
import stagePlanComponent from './components/stage_plan_component.vue';
import stageComponent from './components/stage_component.vue';
import stageReviewComponent from './components/stage_review_component.vue';
import stageStagingComponent from './components/stage_staging_component.vue';
import stageTestComponent from './components/stage_test_component.vue';
import totalTime from './components/total_time_component.vue';
import CycleAnalyticsService from './cycle_analytics_service';
import CycleAnalyticsStore from './cycle_analytics_store';
......@@ -133,8 +131,4 @@ $(() => {
},
},
});
// Register global components
Vue.component('limit-warning', limitWarningComponent);
Vue.component('total-time', totalTime);
});
app/assets/javascripts/diff.js
View file @ a2dcf052
......@@ -24,7 +24,8 @@ class Diff {
if (!isBound) {
$(document)
.on('click', '.js-unfold', this.handleClickUnfold.bind(this))
.on('click', '.diff-line-num a', this.handleClickLineNum.bind(this));
.on('click', '.diff-line-num a', this.handleClickLineNum.bind(this))
.on('mousedown', 'td.line_content.parallel', this.handleParallelLineDown.bind(this));
isBound = true;
}
......@@ -100,6 +101,18 @@ class Diff {
this.highlightSelectedLine();
}
handleParallelLineDown(e) {
const line = $(e.currentTarget);
const table = line.closest('table');
table.removeClass('left-side-selected right-side-selected');
const lineClass = ['left-side', 'right-side'].filter(name => line.hasClass(name))[0];
if (lineClass) {
table.addClass(`${lineClass}-selected`);
}
}
diffViewType() {
return $('.inline-parallel-buttons a.active').data('view-type');
}
......
app/assets/javascripts/dispatcher.js
View file @ a2dcf052
......@@ -14,7 +14,6 @@
/* global NotificationsDropdown */
/* global GroupAvatar */
/* global LineHighlighter */
/* global ProjectFork */
/* global BuildArtifacts */
/* global GroupsSelect */
/* global Search */
......@@ -476,7 +475,9 @@ import { ajaxGet, convertPermissionToBoolean } from './lib/utils/common_utils';
shortcut_handler = true;
break;
case 'projects:forks:new':
new ProjectFork();
import(/* webpackChunkName: 'project_fork' */ './project_fork')
.then(fork => fork.default())
.catch(() => {});
break;
case 'projects:artifacts:browse':
new ShortcutsNavigation();
......
app/assets/javascripts/environments/components/environment.vue
View file @ a2dcf052
......@@ -163,7 +163,7 @@ export default {
this.service.postAction(endpoint)
.then(() => this.fetchEnvironments())
.catch(() => new Flash('An error occured while making the request.'));
.catch(() => new Flash('An error occurred while making the request.'));
}
},
......
app/assets/javascripts/environments/folder/environments_folder_view.vue
View file @ a2dcf052
......@@ -158,7 +158,7 @@ export default {
this.service.postAction(endpoint)
.then(() => this.fetchEnvironments())
.catch(() => new Flash('An error occured while making the request.'));
.catch(() => new Flash('An error occurred while making the request.'));
}
},
},
......
app/assets/javascripts/files_comment_button.js
View file @ a2dcf052
......@@ -7,6 +7,8 @@
* causes reflows, visit https://gist.github.com/paulirish/5d52fb081b3570c81e3a
*/
import Cookies from 'js-cookie';
const LINE_NUMBER_CLASS = 'diff-line-num';
const UNFOLDABLE_LINE_CLASS = 'js-unfold';
const NO_COMMENT_CLASS = 'no-comment-btn';
......@@ -27,9 +29,7 @@ export default {
this.userCanCreateNote = $diffFile.closest(DIFF_CONTAINER_SELECTOR).data('can-create-note') === '';
}
if (typeof notes !== 'undefined' && !this.isParallelView) {
this.isParallelView = notes.isParallelView && notes.isParallelView();
}
this.isParallelView = Cookies.get('diff_view') === 'parallel';
if (this.userCanCreateNote) {
$diffFile.on('mouseover', LINE_COLUMN_CLASSES, e => this.showButton(this.isParallelView, e))
......
app/assets/javascripts/filtered_search/dropdown_emoji.js
View file @ a2dcf052
......@@ -14,7 +14,7 @@ class DropdownEmoji extends gl.FilteredSearchDropdown {
loadingTemplate: this.loadingTemplate,
onError() {
/* eslint-disable no-new */
new Flash('An error occured fetching the dropdown data.');
new Flash('An error occurred fetching the dropdown data.');
/* eslint-enable no-new */
},
},
......
app/assets/javascripts/filtered_search/dropdown_non_user.js
View file @ a2dcf052
......@@ -17,7 +17,7 @@ class DropdownNonUser extends gl.FilteredSearchDropdown {
preprocessing,
onError() {
/* eslint-disable no-new */
new Flash('An error occured fetching the dropdown data.');
new Flash('An error occurred fetching the dropdown data.');
/* eslint-enable no-new */
},
},
......
app/assets/javascripts/filtered_search/dropdown_user.js
View file @ a2dcf052
......@@ -26,7 +26,7 @@ class DropdownUser extends gl.FilteredSearchDropdown {
},
onError() {
/* eslint-disable no-new */
new Flash('An error occured fetching the dropdown data.');
new Flash('An error occurred fetching the dropdown data.');
/* eslint-enable no-new */
},
},
......
app/assets/javascripts/filtered_search/filtered_search_manager.js
View file @ a2dcf052
......@@ -36,7 +36,7 @@ class FilteredSearchManager {
.catch((error) => {
if (error.name === 'RecentSearchesServiceError') return undefined;
// eslint-disable-next-line no-new
new window.Flash('An error occured while parsing recent searches');
new window.Flash('An error occurred while parsing recent searches');
// Gracefully fail to empty array
return [];
})
......
app/assets/javascripts/issuable_context.js
View file @ a2dcf052
......@@ -67,10 +67,13 @@ const PARTICIPANTS_ROW_COUNT = 7;
originalText = $(this).data("original-text");
if (currentText === originalText) {
$(this).text(lessText);
if (gl.lazyLoader) gl.lazyLoader.loadCheck();
} else {
$(this).text(originalText);
}
return $(".js-participants-hidden").toggle();
$(".js-participants-hidden").toggle();
};
return IssuableContext;
......
app/assets/javascripts/lib/utils/common_utils.js
View file @ a2dcf052
......@@ -71,6 +71,7 @@ export const handleLocationHash = () => {
// This is required to handle non-unicode characters in hash
hash = decodeURIComponent(hash);
const target = document.getElementById(hash) || document.getElementById(`user-content-${hash}`);
const fixedTabs = document.querySelector('.js-tabs-affix');
const fixedDiffStats = document.querySelector('.js-diff-files-changed.is-stuck');
const fixedNav = document.querySelector('.navbar-gitlab');
......@@ -78,25 +79,19 @@ export const handleLocationHash = () => {
let adjustment = 0;
if (fixedNav) adjustment -= fixedNav.offsetHeight;
// scroll to user-generated markdown anchor if we cannot find a match
if (document.getElementById(hash) === null) {
const target = document.getElementById(`user-content-${hash}`);
if (target && target.scrollIntoView) {
target.scrollIntoView(true);
window.scrollBy(0, adjustment);
}
} else {
// only adjust for fixedTabs when not targeting user-generated content
if (fixedTabs) {
adjustment -= fixedTabs.offsetHeight;
}
if (target && target.scrollIntoView) {
target.scrollIntoView(true);
}
if (fixedDiffStats) {
adjustment -= fixedDiffStats.offsetHeight;
}
if (fixedTabs) {
adjustment -= fixedTabs.offsetHeight;
}
window.scrollBy(0, adjustment);
if (fixedDiffStats) {
adjustment -= fixedDiffStats.offsetHeight;
}
window.scrollBy(0, adjustment);
};
// Check if element scrolled into viewport from above or below
......
app/assets/javascripts/lib/utils/datetime_utility.js
View file @ a2dcf052
......@@ -55,7 +55,7 @@ window.dateFormat = dateFormat;
if (!timeagoInstance) {
const localeRemaining = function(number, index) {
return [
[s__('Timeago|less than a minute ago'), s__('Timeago|a while')],
[s__('Timeago|less than a minute ago'), s__('Timeago|in a while')],
[s__('Timeago|less than a minute ago'), s__('Timeago|%s seconds remaining')],
[s__('Timeago|about a minute ago'), s__('Timeago|1 minute remaining')],
[s__('Timeago|%s minutes ago'), s__('Timeago|%s minutes remaining')],
......@@ -73,7 +73,7 @@ window.dateFormat = dateFormat;
};
locale = function(number, index) {
return [
[s__('Timeago|less than a minute ago'), s__('Timeago|a while')],
[s__('Timeago|less than a minute ago'), s__('Timeago|in a while')],
[s__('Timeago|less than a minute ago'), s__('Timeago|in %s seconds')],
[s__('Timeago|about a minute ago'), s__('Timeago|in 1 minute')],
[s__('Timeago|%s minutes ago'), s__('Timeago|in %s minutes')],
......
app/assets/javascripts/line_highlighter.js
View file @ a2dcf052
......@@ -28,148 +28,149 @@
// </div>
// </div>
//
(function() {
this.LineHighlighter = (function() {
// CSS class applied to highlighted lines
LineHighlighter.prototype.highlightClass = 'hll';
// Internal copy of location.hash so we're not dependent on `location` in tests
LineHighlighter.prototype._hash = '';
function LineHighlighter(hash) {
if (hash == null) {
// Initialize a LineHighlighter object
//
// hash - String URL hash for dependency injection in tests
hash = location.hash;
}
this.setHash = this.setHash.bind(this);
this.highlightLine = this.highlightLine.bind(this);
this.clickHandler = this.clickHandler.bind(this);
this.highlightHash = this.highlightHash.bind(this);
this._hash = hash;
this.bindEvents();
this.highlightHash();
}
LineHighlighter.prototype.bindEvents = function() {
const $fileHolder = $('.file-holder');
$fileHolder.on('click', 'a[data-line-number]', this.clickHandler);
$fileHolder.on('highlight:line', this.highlightHash);
};
LineHighlighter.prototype.highlightHash = function() {
var range;
if (this._hash !== '') {
range = this.hashToRange(this._hash);
if (range[0]) {
this.highlightRange(range);
$.scrollTo("#L" + range[0], {
// Scroll to the first highlighted line on initial load
// Offset -50 for the sticky top bar, and another -100 for some context
offset: -150
});
}
}
};
LineHighlighter.prototype.clickHandler = function(event) {
var current, lineNumber, range;
event.preventDefault();
this.clearHighlight();
lineNumber = $(event.target).closest('a').data('line-number');
current = this.hashToRange(this._hash);
if (!(current[0] && event.shiftKey)) {
// If there's no current selection, or there is but Shift wasn't held,
// treat this like a single-line selection.
this.setHash(lineNumber);
return this.highlightLine(lineNumber);
} else if (event.shiftKey) {
if (lineNumber < current[0]) {
range = [lineNumber, current[0]];
} else {
range = [current[0], lineNumber];
}
this.setHash(range[0], range[1]);
return this.highlightRange(range);
}
};
LineHighlighter.prototype.clearHighlight = function() {
return $("." + this.highlightClass).removeClass(this.highlightClass);
// Unhighlight previously highlighted lines
};
// Convert a URL hash String into line numbers
//
// hash - Hash String
//
// Examples:
//
// hashToRange('#L5') # => [5, null]
// hashToRange('#L5-15') # => [5, 15]
// hashToRange('#foo') # => [null, null]
//
// Returns an Array
LineHighlighter.prototype.hashToRange = function(hash) {
var first, last, matches;
// ?L(\d+)(?:-(\d+))?$/)
matches = hash.match(/^#?L(\d+)(?:-(\d+))?$/);
if (matches && matches.length) {
first = parseInt(matches[1], 10);
last = matches[2] ? parseInt(matches[2], 10) : null;
return [first, last];
} else {
return [null, null];
}
};
// Highlight a single line
//
// lineNumber - Line number to highlight
LineHighlighter.prototype.highlightLine = function(lineNumber) {
return $("#LC" + lineNumber).addClass(this.highlightClass);
};
// Highlight all lines within a range
//
// range - Array containing the starting and ending line numbers
LineHighlighter.prototype.highlightRange = function(range) {
var i, lineNumber, ref, ref1, results;
if (range[1]) {
results = [];
for (lineNumber = i = ref = range[0], ref1 = range[1]; ref <= ref1 ? i <= ref1 : i >= ref1; lineNumber = ref <= ref1 ? (i += 1) : (i -= 1)) {
results.push(this.highlightLine(lineNumber));
}
return results;
} else {
return this.highlightLine(range[0]);
}
};
const LineHighlighter = function(options = {}) {
options.highlightLineClass = options.highlightLineClass || 'hll';
options.fileHolderSelector = options.fileHolderSelector || '.file-holder';
options.scrollFileHolder = options.scrollFileHolder || false;
options.hash = options.hash || location.hash;
// Set the URL hash string
LineHighlighter.prototype.setHash = function(firstLineNumber, lastLineNumber) {
var hash;
if (lastLineNumber) {
hash = "#L" + firstLineNumber + "-" + lastLineNumber;
this.options = options;
this._hash = options.hash;
this.highlightLineClass = options.highlightLineClass;
this.setHash = this.setHash.bind(this);
this.highlightLine = this.highlightLine.bind(this);
this.clickHandler = this.clickHandler.bind(this);
this.highlightHash = this.highlightHash.bind(this);
this.bindEvents();
this.highlightHash();
};
LineHighlighter.prototype.bindEvents = function() {
const $fileHolder = $(this.options.fileHolderSelector);
$fileHolder.on('click', 'a[data-line-number]', this.clickHandler);
$fileHolder.on('highlight:line', this.highlightHash);
};
LineHighlighter.prototype.highlightHash = function() {
var range;
if (this._hash !== '') {
range = this.hashToRange(this._hash);
if (range[0]) {
this.highlightRange(range);
const lineSelector = `#L${range[0]}`;
const scrollOptions = {
// Scroll to the first highlighted line on initial load
// Offset -50 for the sticky top bar, and another -100 for some context
offset: -150
};
if (this.options.scrollFileHolder) {
$(this.options.fileHolderSelector).scrollTo(lineSelector, scrollOptions);
} else {
hash = "#L" + firstLineNumber;
$.scrollTo(lineSelector, scrollOptions);
}
this._hash = hash;
return this.__setLocationHash__(hash);
};
// Make the actual hash change in the browser
//
// This method is stubbed in tests.
LineHighlighter.prototype.__setLocationHash__ = function(value) {
return history.pushState({
url: value
// We're using pushState instead of assigning location.hash directly to
// prevent the page from scrolling on the hashchange event
}, document.title, value);
};
return LineHighlighter;
})();
}).call(window);
}
}
};
LineHighlighter.prototype.clickHandler = function(event) {
var current, lineNumber, range;
event.preventDefault();
this.clearHighlight();
lineNumber = $(event.target).closest('a').data('line-number');
current = this.hashToRange(this._hash);
if (!(current[0] && event.shiftKey)) {
// If there's no current selection, or there is but Shift wasn't held,
// treat this like a single-line selection.
this.setHash(lineNumber);
return this.highlightLine(lineNumber);
} else if (event.shiftKey) {
if (lineNumber < current[0]) {
range = [lineNumber, current[0]];
} else {
range = [current[0], lineNumber];
}
this.setHash(range[0], range[1]);
return this.highlightRange(range);
}
};
LineHighlighter.prototype.clearHighlight = function() {
return $("." + this.highlightLineClass).removeClass(this.highlightLineClass);
};
// Convert a URL hash String into line numbers
//
// hash - Hash String
//
// Examples:
//
// hashToRange('#L5') # => [5, null]
// hashToRange('#L5-15') # => [5, 15]
// hashToRange('#foo') # => [null, null]
//
// Returns an Array
LineHighlighter.prototype.hashToRange = function(hash) {
var first, last, matches;
// ?L(\d+)(?:-(\d+))?$/)
matches = hash.match(/^#?L(\d+)(?:-(\d+))?$/);
if (matches && matches.length) {
first = parseInt(matches[1], 10);
last = matches[2] ? parseInt(matches[2], 10) : null;
return [first, last];
} else {
return [null, null];
}
};
// Highlight a single line
//
// lineNumber - Line number to highlight
LineHighlighter.prototype.highlightLine = function(lineNumber) {
return $("#LC" + lineNumber).addClass(this.highlightLineClass);
};
// Highlight all lines within a range
//
// range - Array containing the starting and ending line numbers
LineHighlighter.prototype.highlightRange = function(range) {
var i, lineNumber, ref, ref1, results;
if (range[1]) {
results = [];
for (lineNumber = i = ref = range[0], ref1 = range[1]; ref <= ref1 ? i <= ref1 : i >= ref1; lineNumber = ref <= ref1 ? (i += 1) : (i -= 1)) {
results.push(this.highlightLine(lineNumber));
}
return results;
} else {
return this.highlightLine(range[0]);
}
};
// Set the URL hash string
LineHighlighter.prototype.setHash = function(firstLineNumber, lastLineNumber) {
var hash;
if (lastLineNumber) {
hash = "#L" + firstLineNumber + "-" + lastLineNumber;
} else {
hash = "#L" + firstLineNumber;
}
this._hash = hash;
return this.__setLocationHash__(hash);
};
// Make the actual hash change in the browser
//
// This method is stubbed in tests.
LineHighlighter.prototype.__setLocationHash__ = function(value) {
return history.pushState({
url: value
// We're using pushState instead of assigning location.hash directly to
// prevent the page from scrolling on the hashchange event
}, document.title, value);
};
window.LineHighlighter = LineHighlighter;
app/assets/javascripts/locale/index.js
View file @ a2dcf052
......@@ -16,9 +16,8 @@ const locales = allLocales.reduce((d, obj) => {
return data;
}, {});
let lang = document.querySelector('html').getAttribute('lang') || 'en';
lang = lang.replace(/-/g, '_');
const langAttribute = document.querySelector('html').getAttribute('lang');
const lang = (langAttribute || 'en').replace(/-/g, '_');
const locale = new Jed(locales[lang]);
/**
......
app/assets/javascripts/main.js
View file @ a2dcf052
......@@ -124,7 +124,6 @@ import './preview_markdown';
import './project';
import './project_avatar';
import './project_find_file';
import './project_fork';
import './project_import';
import './project_label_subscription';
import './project_new';
......@@ -302,7 +301,10 @@ $(function () {
return $container.remove();
// Commit show suppressed diff
});
$('.navbar-toggle').on('click', () => $('.header-content').toggleClass('menu-expanded'));
$('.navbar-toggle').on('click', () => {
$('.header-content').toggleClass('menu-expanded');
gl.lazyLoader.loadCheck();
});
// Show/hide comments on diff
$body.on('click', '.js-toggle-diff-comments', function (e) {
var $this = $(this);
......
app/assets/javascripts/merge_request_tabs.js
View file @ a2dcf052
......@@ -352,7 +352,7 @@ import {
}
expandViewContainer() {
const $wrapper = $('.content-wrapper .container-fluid');
const $wrapper = $('.content-wrapper .container-fluid').not('.breadcrumbs');
if (this.fixedLayoutPref === null) {
this.fixedLayoutPref = $wrapper.hasClass('container-limited');
}
......
app/assets/javascripts/notes/components/issue_note.vue
View file @ a2dcf052
......@@ -62,7 +62,7 @@
},
deleteHandler() {
// eslint-disable-next-line no-alert
if (confirm('Are you sure you want to delete this list?')) {
if (confirm('Are you sure you want to delete this comment?')) {
this.isDeleting = true;
this.deleteNote(this.note)
......
app/assets/javascripts/pipelines/components/pipeline_url.vue
View file @ a2dcf052
......@@ -28,8 +28,7 @@
popoverOptions() {
return {
html: true,
delay: { hide: 600 },
trigger: 'hover',
trigger: 'focus',
placement: 'top',
title: '<div class="autodevops-title">This pipeline makes use of a predefined CI/CD configuration enabled by <b>Auto DevOps.</b></div>',
content: `<a class="autodevops-link" href="${this.autoDevopsHelpPath}" target="_blank" rel="noopener noreferrer nofollow">Learn more about Auto DevOps</a>`,
......@@ -75,6 +74,7 @@
</span>
<a
v-if="pipeline.flags.auto_devops"
tabindex="0"
class="js-pipeline-url-autodevops label label-info autodevops-badge"
v-popover="popoverOptions"
role="button">
......
app/assets/javascripts/pipelines/mixins/pipelines.js
View file @ a2dcf052
......@@ -97,7 +97,7 @@ export default {
postAction(endpoint) {
this.service.postAction(endpoint)
.then(() => eventHub.$emit('refreshPipelines'))
.catch(() => new Flash('An error occured while making the request.'));
.catch(() => new Flash('An error occurred while making the request.'));
},
},
};
app/assets/javascripts/profile/gl_crop.js
View file @ a2dcf052
......@@ -73,7 +73,8 @@ import _ from 'underscore';
aspectRatio: 1,
modal: true,
scalable: false,
rotatable: false,
rotatable: true,
checkOrientation: true,
zoomable: true,
dragMode: 'move',
guides: false,
......
app/assets/javascripts/project_fork.js
View file @ a2dcf052
/* eslint-disable func-names, space-before-function-paren, wrap-iife, prefer-arrow-callback, max-len */
(function() {
this.ProjectFork = (function() {
function ProjectFork() {
$('.fork-thumbnail a').on('click', function() {
$('.fork-namespaces').hide();
return $('.save-project-loader').show();
});
}
export default () => {
$('.fork-thumbnail a').on('click', function forkThumbnailClicked() {
if ($(this).hasClass('disabled')) return false;
return ProjectFork;
})();
}).call(window);
$('.fork-namespaces').hide();
return $('.save-project-loader').show();
});
};
app/assets/javascripts/projects_dropdown/service/projects_service.js
View file @ a2dcf052
......@@ -19,7 +19,7 @@ export default class ProjectsService {
getSearchedProjects(searchQuery) {
return this.projectsPath.get({
simple: false,
simple: true,
per_page: 20,
membership: !!gon.current_user_id,
order_by: 'last_activity_at',
......
app/assets/javascripts/repo/components/repo_commit_section.vue
View file @ a2dcf052
......@@ -37,14 +37,14 @@ export default {
content: f.newContent,
}));
const payload = {
branch: Store.targetBranch,
branch: Store.currentBranch,
commit_message: commitMessage,
actions,
};
Store.submitCommitsLoading = true;
Service.commitFiles(payload)
.then(this.resetCommitState)
.catch(() => Flash('An error occured while committing your changes'));
.catch(() => Flash('An error occurred while committing your changes'));
},
resetCommitState() {
......@@ -105,7 +105,7 @@ export default {
</label>
<div class="col-md-6">
<span class="help-block">
{{targetBranch}}
{{currentBranch}}
</span>
</div>
</div>
......
app/assets/javascripts/repo/components/repo_edit_button.vue
View file @ a2dcf052
......@@ -26,16 +26,6 @@ export default {
this.editMode = !this.editMode;
Store.toggleBlobView();
},
toggleProjectRefsForm() {
$('.project-refs-form').toggleClass('disabled', this.editMode);
$('.js-tree-ref-target-holder').toggle(this.editMode);
},
},
watch: {
editMode() {
this.toggleProjectRefsForm();
},
},
};
</script>
......
app/assets/javascripts/repo/components/repo_file.vue
View file @ a2dcf052
......@@ -95,7 +95,7 @@ export default RepoFile;
</div>
</td>
<td class="hidden-xs">
<td class="hidden-xs text-right">
<span
class="commit-update"
:title="tooltipTitle(file.lastCommitUpdate)">
......
app/assets/javascripts/repo/components/repo_preview.vue
View file @ a2dcf052
<script>
/* global LineHighlighter */
import Store from '../stores/repo_store';
export default {
data: () => Store,
mounted() {
this.highlightFile();
},
computed: {
html() {
return this.activeFile.html;
},
},
methods: {
highlightFile() {
$(this.$el).find('.file-content').syntaxHighlight();
},
},
mounted() {
this.highlightFile();
this.lineHighlighter = new LineHighlighter({
fileHolderSelector: '.blob-viewer-container',
scrollFileHolder: true,
});
},
watch: {
html() {
this.$nextTick(() => {
......@@ -45,7 +49,7 @@ export default {
v-else
class="vertical-center render-error">
<p class="text-center">
The source could not be displayed because a rendering error occured. You can <a :href="activeFile.raw_path">download</a> it instead.
The source could not be displayed because a rendering error occurred. You can <a :href="activeFile.raw_path">download</a> it instead.
</p>
</div>
</div>
......
app/assets/javascripts/repo/components/repo_sidebar.vue
View file @ a2dcf052
......@@ -37,17 +37,24 @@ export default {
let file = clickedFile;
if (file.loading) return;
file.loading = true;
if (file.type === 'tree' && file.opened) {
file = Store.removeChildFilesOfTree(file);
file.loading = false;
} else {
Service.url = file.url;
Helper.getContent(file)
.then(() => {
file.loading = false;
Helper.scrollTabsRight();
})
.catch(Helper.loadingError);
const openFile = Helper.getFileFromPath(file.url);
if (openFile) {
file.loading = false;
Store.setActiveFiles(openFile);
} else {
Service.url = file.url;
Helper.getContent(file)
.then(() => {
file.loading = false;
Helper.scrollTabsRight();
})
.catch(Helper.loadingError);
}
}
},
......@@ -68,7 +75,7 @@ export default {
<tr>
<th class="name">Name</th>
<th class="hidden-sm hidden-xs last-commit">Last Commit</th>
<th class="hidden-xs last-update">Last Update</th>
<th class="hidden-xs last-update text-right">Last Update</th>
</tr>
</thead>
<tbody>
......
app/assets/javascripts/repo/helpers/repo_helper.js
View file @ a2dcf052
......@@ -58,13 +58,13 @@ const RepoHelper = {
return langs.find(lang => lang.extensions && lang.extensions.indexOf(`.${ext}`) > -1);
},
setDirectoryOpen(tree) {
setDirectoryOpen(tree, title) {
const file = tree;
if (!file) return undefined;
file.opened = true;
file.icon = 'fa-folder-open';
RepoHelper.updateHistoryEntry(file.url, file.name);
RepoHelper.updateHistoryEntry(file.url, title);
return file;
},
......@@ -135,6 +135,8 @@ const RepoHelper = {
return Service.getContent()
.then((response) => {
const data = response.data;
if (response.headers && response.headers['page-title']) data.pageTitle = response.headers['page-title'];
Store.isTree = RepoHelper.isTree(data);
if (!Store.isTree) {
if (!file) file = data;
......@@ -168,7 +170,7 @@ const RepoHelper = {
} else {
// it's a tree
if (!file) Store.isRoot = RepoHelper.isRoot(Service.url);
file = RepoHelper.setDirectoryOpen(file);
file = RepoHelper.setDirectoryOpen(file, data.pageTitle || data.name);
const newDirectory = RepoHelper.dataToListOfFiles(data);
Store.addFilesToDirectory(file, Store.files, newDirectory);
Store.prevURL = Service.blobURLtoParentTree(Service.url);
......@@ -255,7 +257,7 @@ const RepoHelper = {
history.pushState({ key: RepoHelper.key }, '', url);
if (title) {
document.title = `${title} · GitLab`;
document.title = title;
}
},
......@@ -263,6 +265,10 @@ const RepoHelper = {
return Store.openedFiles.find(openedFile => Store.activeFile.url === openedFile.url);
},
getFileFromPath(path) {
return Store.openedFiles.find(file => file.url === path);
},
loadingError() {
Flash('Unable to load this content at this time.');
},
......
app/assets/javascripts/repo/index.js
View file @ a2dcf052
......@@ -11,10 +11,6 @@ function initDropdowns() {
}
function addEventsForNonVueEls() {
$(document).on('change', '.dropdown', () => {
Store.targetBranch = $('.project-refs-target-form input[name="ref"]').val();
});
window.onbeforeunload = function confirmUnload(e) {
const hasChanged = Store.openedFiles
.some(file => file.changed);
......
app/assets/javascripts/repo/stores/repo_store.js
View file @ a2dcf052
......@@ -32,7 +32,6 @@ const RepoStore = {
isCommitable: false,
binary: false,
currentBranch: '',
targetBranch: 'new-branch',
commitMessage: '',
binaryTypes: {
png: false,
......@@ -84,7 +83,7 @@ const RepoStore = {
}).catch(Helper.loadingError);
}
if (!file.loading) Helper.updateHistoryEntry(file.url, file.name);
if (!file.loading) Helper.updateHistoryEntry(file.url, file.pageTitle || file.name);
RepoStore.binary = file.binary;
},
......
app/assets/javascripts/right_sidebar.js
View file @ a2dcf052
......@@ -29,28 +29,32 @@ import Cookies from 'js-cookie';
$('.dropdown').on('loading.gl.dropdown', this.sidebarDropdownLoading);
$('.dropdown').on('loaded.gl.dropdown', this.sidebarDropdownLoaded);
$document.on('click', '.js-sidebar-toggle', function(e, triggered) {
var $allGutterToggleIcons, $this, $thisIcon;
e.preventDefault();
$this = $(this);
$thisIcon = $this.find('i');
$allGutterToggleIcons = $('.js-sidebar-toggle i');
if ($thisIcon.hasClass('fa-angle-double-right')) {
$allGutterToggleIcons.removeClass('fa-angle-double-right').addClass('fa-angle-double-left');
$('aside.right-sidebar').removeClass('right-sidebar-expanded').addClass('right-sidebar-collapsed');
$('.page-with-sidebar').removeClass('right-sidebar-expanded').addClass('right-sidebar-collapsed');
} else {
$allGutterToggleIcons.removeClass('fa-angle-double-left').addClass('fa-angle-double-right');
$('aside.right-sidebar').removeClass('right-sidebar-collapsed').addClass('right-sidebar-expanded');
$('.page-with-sidebar').removeClass('right-sidebar-collapsed').addClass('right-sidebar-expanded');
}
if (!triggered) {
return Cookies.set("collapsed_gutter", $('.right-sidebar').hasClass('right-sidebar-collapsed'));
}
});
$document.on('click', '.js-sidebar-toggle', this.sidebarToggleClicked);
return $(document).off('click', '.js-issuable-todo').on('click', '.js-issuable-todo', this.toggleTodo);
};
Sidebar.prototype.sidebarToggleClicked = function (e, triggered) {
var $allGutterToggleIcons, $this, $thisIcon;
e.preventDefault();
$this = $(this);
$thisIcon = $this.find('i');
$allGutterToggleIcons = $('.js-sidebar-toggle i');
if ($thisIcon.hasClass('fa-angle-double-right')) {
$allGutterToggleIcons.removeClass('fa-angle-double-right').addClass('fa-angle-double-left');
$('aside.right-sidebar').removeClass('right-sidebar-expanded').addClass('right-sidebar-collapsed');
$('.page-with-sidebar').removeClass('right-sidebar-expanded').addClass('right-sidebar-collapsed');
} else {
$allGutterToggleIcons.removeClass('fa-angle-double-left').addClass('fa-angle-double-right');
$('aside.right-sidebar').removeClass('right-sidebar-collapsed').addClass('right-sidebar-expanded');
$('.page-with-sidebar').removeClass('right-sidebar-collapsed').addClass('right-sidebar-expanded');
if (gl.lazyLoader) gl.lazyLoader.loadCheck();
}
if (!triggered) {
Cookies.set("collapsed_gutter", $('.right-sidebar').hasClass('right-sidebar-collapsed'));
}
};
Sidebar.prototype.toggleTodo = function(e) {
var $btnText, $this, $todoLoading, ajaxType, url;
$this = $(e.currentTarget);
......
app/assets/javascripts/search_autocomplete.js
View file @ a2dcf052
......@@ -287,6 +287,7 @@ import { isInGroupsPage, isInProjectPage, getGroupSlug, getProjectSlug } from '.
onClearInputClick(e) {
e.preventDefault();
this.wrap.toggleClass('has-value', !!e.target.value);
return this.searchInput.val('').focus();
}
......
app/assets/javascripts/sidebar/lib/sidebar_move_issue.js
View file @ a2dcf052
......@@ -38,7 +38,7 @@ class SidebarMoveIssue {
data: (searchTerm, callback) => {
this.mediator.fetchAutocompleteProjects(searchTerm)
.then(callback)
.catch(() => new Flash('An error occured while fetching projects autocomplete.'));
.catch(() => new Flash('An error occurred while fetching projects autocomplete.'));
},
renderRow: project => `
<li>
......@@ -73,7 +73,7 @@ class SidebarMoveIssue {
this.mediator.moveIssue()
.catch(() => {
Flash('An error occured while moving the issue.');
Flash('An error occurred while moving the issue.');
this.$confirmButton
.enable()
.removeClass('is-loading');
......
app/assets/javascripts/sidebar/sidebar_mediator.js
View file @ a2dcf052
......@@ -41,7 +41,7 @@ export default class SidebarMediator {
this.store.setAssigneeData(data);
this.store.setTimeTrackingData(data);
})
.catch(() => new Flash('Error occured when fetching sidebar data'));
.catch(() => new Flash('Error occurred when fetching sidebar data'));
}
fetchAutocompleteProjects(searchTerm) {
......
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_status_icon.js
View file @ a2dcf052
......@@ -27,7 +27,7 @@ export default {
<button
v-if="showDisabledButton"
type="button"
class="btn btn-success btn-sm"
class="js-disabled-merge-button btn btn-success btn-sm"
disabled="true">
Merge
</button>
......
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_closed.js
View file @ a2dcf052
......@@ -16,9 +16,9 @@ export default {
<div class="media-body">
<mr-widget-author-and-time
actionText="Closed by"
:author="mr.closedBy"
:dateTitle="mr.updatedAt"
:dateReadable="mr.closedAt"
:author="mr.closedEvent.author"
:dateTitle="mr.closedEvent.updatedAt"
:dateReadable="mr.closedEvent.formattedUpdatedAt"
/>
<section class="mr-info-list">
<p>
......
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.js
View file @ a2dcf052
......@@ -10,27 +10,37 @@ export default {
},
template: `
<div class="mr-widget-body media">
<status-icon status="failed" showDisabledButton />
<status-icon
status="failed"
showDisabledButton />
<div class="media-body space-children">
<span class="bold">
There are merge conflicts<span v-if="!mr.canMerge">.</span>
<span v-if="!mr.canMerge">
Resolve these conflicts or ask someone with write access to this repository to merge it locally
</span>
<span
v-if="mr.shouldBeRebased"
class="bold">
Fast-forward merge is not possible.
To merge this request, first rebase locally.
</span>
<a
v-if="mr.canMerge && mr.conflictResolutionPath"
:href="mr.conflictResolutionPath"
class="btn btn-default btn-xs js-resolve-conflicts-button">
Resolve conflicts
</a>
<a
v-if="mr.canMerge"
class="btn btn-default btn-xs js-merge-locally-button"
data-toggle="modal"
href="#modal_merge_info">
Merge locally
</a>
<template v-else>
<span class="bold">
There are merge conflicts<span v-if="!mr.canMerge">.</span>
<span v-if="!mr.canMerge">
Resolve these conflicts or ask someone with write access to this repository to merge it locally
</span>
</span>
<a
v-if="mr.canMerge && mr.conflictResolutionPath"
:href="mr.conflictResolutionPath"
class="js-resolve-conflicts-button btn btn-default btn-xs">
Resolve conflicts
</a>
<a
v-if="mr.canMerge"
class="js-merge-locally-button btn btn-default btn-xs"
data-toggle="modal"
href="#modal_merge_info">
Merge locally
</a>
</template>
</div>
</div>
`,
......
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.js
View file @ a2dcf052
......@@ -69,9 +69,9 @@ export default {
<div class="space-children">
<mr-widget-author-and-time
actionText="Merged by"
:author="mr.mergedBy"
:dateTitle="mr.updatedAt"
:dateReadable="mr.mergedAt" />
:author="mr.mergedEvent.author"
:date-title="mr.mergedEvent.updatedAt"
:date-readable="mr.mergedEvent.formattedUpdatedAt" />
<a
v-if="mr.canRevertInCurrentMR"
v-tooltip
......
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js
View file @ a2dcf052
......@@ -284,10 +284,16 @@ export default {
:mr="mr"
:is-merge-button-disabled="isMergeButtonDisabled" />
<span
v-if="mr.ffOnlyEnabled"
class="js-fast-forward-message">
Fast-forward merge without a merge commit
</span>
<button
v-else
@click="toggleCommitMessageEditor"
:disabled="isMergeButtonDisabled"
class="btn btn-default btn-xs"
class="js-modify-commit-message-button btn btn-default btn-xs"
type="button">
Modify commit message
</button>
......
app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
View file @ a2dcf052
......@@ -37,10 +37,8 @@ export default class MergeRequestStore {
}
this.updatedAt = data.updated_at;
this.mergedAt = MergeRequestStore.getEventDate(data.merge_event);
this.closedAt = MergeRequestStore.getEventDate(data.closed_event);
this.mergedBy = MergeRequestStore.getAuthorObject(data.merge_event);
this.closedBy = MergeRequestStore.getAuthorObject(data.closed_event);
this.mergedEvent = MergeRequestStore.getEventObject(data.merge_event);
this.closedEvent = MergeRequestStore.getEventObject(data.closed_event);
this.setToMWPSBy = MergeRequestStore.getAuthorObject({ author: data.merge_user || {} });
this.mergeUserId = data.merge_user_id;
this.currentUserId = gon.current_user_id;
......@@ -57,6 +55,8 @@ export default class MergeRequestStore {
this.onlyAllowMergeIfPipelineSucceeds = data.only_allow_merge_if_pipeline_succeeds || false;
this.mergeWhenPipelineSucceeds = data.merge_when_pipeline_succeeds || false;
this.mergePath = data.merge_path;
this.ffOnlyEnabled = data.ff_only_enabled;
this.shouldBeRebased = !!data.should_be_rebased;
this.statusPath = data.status_path;
this.emailPatchesPath = data.email_patches_path;
this.plainDiffPath = data.plain_diff_path;
......@@ -118,6 +118,14 @@ export default class MergeRequestStore {
}
}
static getEventObject(event) {
return {
author: MergeRequestStore.getAuthorObject(event),
updatedAt: gl.utils.formatDate(MergeRequestStore.getEventUpdatedAtDate(event)),
formattedUpdatedAt: MergeRequestStore.getEventDate(event),
};
}
static getAuthorObject(event) {
if (!event) {
return {};
......@@ -131,6 +139,14 @@ export default class MergeRequestStore {
};
}
static getEventUpdatedAtDate(event) {
if (!event) {
return '';
}
return event.updated_at;
}
static getEventDate(event) {
const timeagoInstance = new Timeago();
......@@ -138,7 +154,7 @@ export default class MergeRequestStore {
return '';
}
return timeagoInstance.format(event.updated_at);
return timeagoInstance.format(MergeRequestStore.getEventUpdatedAtDate(event));
}
}
app/assets/stylesheets/framework/dropdowns.scss
View file @ a2dcf052
......@@ -873,6 +873,13 @@
min-width: 100%;
}
}
header.navbar-gitlab-new .header-content .dropdown {
.dropdown-menu {
left: 0;
min-width: 100%;
}
}
}
@include new-style-dropdown('.breadcrumbs-list .dropdown ');
......
app/assets/stylesheets/framework/gitlab-theme.scss
View file @ a2dcf052
......@@ -126,7 +126,7 @@
.search-input-wrap {
.search-icon,
.clear-icon {
color: rgba($color-200, .8);
fill: rgba($color-200, .8);
}
}
......@@ -141,7 +141,7 @@
.search-input-wrap {
.search-icon {
color: rgba($color-200, .8);
fill: rgba($color-200, .8);
}
}
}
......@@ -252,7 +252,7 @@ body {
.search-input-wrap {
.search-icon {
color: $theme-gray-200;
fill: $theme-gray-200;
}
.search-input {
......
app/assets/stylesheets/framework/header.scss
View file @ a2dcf052
......@@ -109,8 +109,7 @@ header {
.user-counter {
svg {
height: 16px;
width: 23px;
margin-right: 3px;
}
}
......@@ -133,16 +132,16 @@ header {
}
&.navbar-gitlab-new {
.fa-times {
.close-icon {
display: none;
}
.menu-expanded {
.fa-ellipsis-v {
.more-icon {
display: none;
}
.fa-times {
.close-icon {
display: block;
}
}
......
app/assets/stylesheets/framework/images.scss
View file @ a2dcf052
......@@ -27,7 +27,9 @@
}
svg {
&.s8 { @include svg-size(8px); }
&.s16 { @include svg-size(16px); }
&.s18 { @include svg-size(18px); }
&.s24 { @include svg-size(24px); }
&.s32 { @include svg-size(32px); }
&.s48 { @include svg-size(48px); }
......
app/assets/stylesheets/framework/lists.scss
View file @ a2dcf052
......@@ -229,6 +229,10 @@ ul.content-list {
.label-default {
color: $gl-text-color-secondary;
}
.avatar-cell {
align-self: flex-start;
}
}
.panel > .content-list > li {
......
app/assets/stylesheets/framework/new-nav.scss
View file @ a2dcf052
......@@ -120,17 +120,24 @@ header.navbar-gitlab-new {
.container-fluid {
.navbar-toggle {
min-width: 45px;
padding: 4px $gl-padding;
padding: 0 $gl-padding;
margin-right: -7px;
font-size: 14px;
text-align: center;
color: currentColor;
svg {
fill: currentColor;
}
&:hover,
&:focus,
&.active {
color: currentColor;
background-color: transparent;
svg {
fill: currentColor;
}
}
}
......@@ -279,10 +286,6 @@ header.navbar-gitlab-new {
}
}
.admin-icon i {
font-size: 18px;
}
.caret-down {
height: 11px;
width: 11px;
......@@ -306,6 +309,8 @@ header.navbar-gitlab-new {
display: flex;
width: 100%;
position: relative;
padding-top: $gl-padding / 2;
padding-bottom: $gl-padding / 2;
align-items: center;
border-bottom: 1px solid $border-color;
}
......@@ -346,6 +351,7 @@ header.navbar-gitlab-new {
display: flex;
align-items: center;
position: relative;
padding: 2px 0;
&:not(:last-child) {
margin-right: 20px;
......@@ -381,7 +387,7 @@ header.navbar-gitlab-new {
margin: 0;
font-size: 12px;
font-weight: 600;
line-height: 1;
line-height: 16px;
a {
color: $gl-text-color;
......
app/assets/stylesheets/framework/new-sidebar.scss
View file @ a2dcf052
......@@ -56,8 +56,8 @@ $new-sidebar-collapsed-width: 50px;
color: $hover-color;
.settings-avatar {
i {
color: $hover-color;
svg {
fill: $hover-color;
}
}
}
......@@ -76,12 +76,9 @@ $new-sidebar-collapsed-width: 50px;
.settings-avatar {
background-color: $white-light;
i {
font-size: 20px;
width: 100%;
color: $gl-text-color-secondary;
text-align: center;
align-self: center;
svg {
fill: $gl-text-color-secondary;
margin: auto;
}
}
......@@ -177,16 +174,16 @@ $new-sidebar-collapsed-width: 50px;
.nav-icon-container {
display: flex;
margin-right: 8px;
svg {
height: 16px;
width: 16px;
}
}
.fly-out-top-item {
display: none;
}
svg {
height: 16px;
width: 16px;
}
}
.nav-sidebar-inner-scroll {
......@@ -354,18 +351,22 @@ $new-sidebar-collapsed-width: 50px;
display: flex;
align-items: center;
i {
font-size: 20px;
svg {
fill: $gl-text-color-secondary;
margin-right: 8px;
}
.fa-angle-double-right {
.icon-angle-double-right {
display: none;
}
&:hover {
background-color: $border-color;
color: $gl-text-color;
svg {
fill: $gl-text-color;
}
}
}
......@@ -407,15 +408,16 @@ $new-sidebar-collapsed-width: 50px;
.toggle-sidebar-button {
width: $new-sidebar-collapsed-width - 2px;
padding: 16px 18px;
padding: 16px;
.collapse-text,
.fa-angle-double-left {
.icon-angle-double-left {
display: none;
}
.fa-angle-double-right {
.icon-angle-double-right {
display: block;
margin: 0;
}
}
}
......
app/assets/stylesheets/framework/variables.scss
View file @ a2dcf052
......@@ -7,6 +7,7 @@ $gutter_inner_width: 250px;
$sidebar-transition-duration: .15s;
$sidebar-breakpoint: 1024px;
$default-transition-duration: .15s;
$right-sidebar-transition-duration: .3s;
/*
* Color schema
......
app/assets/stylesheets/pages/boards.scss
View file @ a2dcf052
......@@ -55,6 +55,15 @@
.boards-app {
position: relative;
@media (min-width: $screen-sm-min) {
transition: width $right-sidebar-transition-duration;
width: 100%;
&.is-compact {
width: calc(100% - #{$gutter_width});
}
}
}
.boards-app-loading {
......@@ -78,11 +87,6 @@
height: calc(100vh - 222px);
// scss-lint:enable DuplicateProperty
min-height: 475px;
transition: width .2s;
&.is-compact {
width: calc(100% - 290px);
}
}
}
......@@ -412,14 +416,6 @@
.page-with-layout-nav.page-with-sub-nav .issue-boards-sidebar,
.page-with-new-sidebar.page-with-sidebar .issue-boards-sidebar {
position: absolute;
&.right-sidebar {
top: 0;
bottom: 0;
height: 100%;
}
.issuable-sidebar-header {
position: relative;
}
......@@ -457,8 +453,8 @@
.right-sidebar.right-sidebar-expanded {
&.boards-sidebar-slide-enter-active,
&.boards-sidebar-slide-leave-active {
transition: width .2s,
padding .2s;
transition: width $right-sidebar-transition-duration,
padding $right-sidebar-transition-duration;
}
&.boards-sidebar-slide-enter,
......
app/assets/stylesheets/pages/diff.scss
View file @ a2dcf052
......@@ -77,6 +77,18 @@
word-wrap: break-word;
}
}
&.left-side-selected {
td.line_content.parallel.right-side {
@include user-select(none);
}
}
&.right-side-selected {
td.line_content.parallel.left-side {
@include user-select(none);
}
}
}
tr.line_holder.parallel {
......@@ -535,7 +547,6 @@
}
.diff-notes-collapse {
position: relative;
width: 19px;
height: 19px;
padding: 0;
......@@ -543,11 +554,7 @@
z-index: 100;
svg {
position: absolute;
left: 50%;
top: 50%;
margin-left: -5.5px;
margin-top: -5.5px;
vertical-align: text-top;
}
path {
......
app/assets/stylesheets/pages/issuable.scss
View file @ a2dcf052
......@@ -223,14 +223,14 @@
top: $new-navbar-height;
bottom: 0;
right: 0;
transition: width .3s;
transition: width $right-sidebar-transition-duration;
background: $gray-light;
z-index: 200;
overflow: hidden;
.issuable-sidebar {
width: calc(100% + 100px);
height: calc(100% - #{$new-navbar-height});
height: 100%;
overflow-y: scroll;
overflow-x: hidden;
-webkit-overflow-scrolling: touch;
......
app/assets/stylesheets/pages/projects.scss
View file @ a2dcf052
......@@ -516,7 +516,7 @@ a.deploy-project-label {
text-align: center;
width: 169px;
&:hover,
&:hover:not(.disabled),
&.forked {
background-color: $row-hover;
border-color: $row-hover-border;
......@@ -543,6 +543,15 @@ a.deploy-project-label {
padding-top: $gl-padding;
color: $gl-text-color;
&.disabled {
opacity: .3;
cursor: not-allowed;
&:hover {
text-decoration: none;
}
}
.caption {
min-height: 30px;
padding: $gl-padding 0;
......
app/assets/stylesheets/pages/repo.scss
View file @ a2dcf052
......@@ -54,6 +54,10 @@
border-radius: $border-radius-default;
color: $almost-black;
.code.white pre .hll {
background-color: $well-light-border !important;
}
.tree-content-holder {
display: flex;
min-height: 300px;
......
app/assets/stylesheets/pages/search.scss
View file @ a2dcf052
......@@ -81,17 +81,10 @@ input[type="checkbox"]:hover {
.clear-icon {
position: absolute;
right: 5px;
top: 0;
&::before {
font-family: FontAwesome;
font-weight: $gl-font-weight-normal;
font-style: normal;
}
top: 4px;
}
.search-icon {
@extend .fa-search;
transition: color $default-transition-duration;
-webkit-user-select: none;
-moz-user-select: none;
......@@ -99,7 +92,6 @@ input[type="checkbox"]:hover {
}
.clear-icon {
@extend .fa-times;
display: none;
}
......
app/controllers/admin/applications_controller.rb
View file @ a2dcf052
......@@ -22,8 +22,7 @@ class Admin::ApplicationsController < Admin::ApplicationController
@application = Doorkeeper::Application.new(application_params)
if @application.save
flash[:notice] = I18n.t(:notice, scope: [:doorkeeper, :flash, :applications, :create])
redirect_to admin_application_url(@application)
redirect_to_admin_page
else
render :new
end
......@@ -42,6 +41,13 @@ class Admin::ApplicationsController < Admin::ApplicationController
redirect_to admin_applications_url, status: 302, notice: 'Application was successfully destroyed.'
end
protected
def redirect_to_admin_page
flash[:notice] = I18n.t(:notice, scope: [:doorkeeper, :flash, :applications, :create])
redirect_to admin_application_url(@application)
end
private
def set_application
......
app/controllers/admin/users_controller.rb
View file @ a2dcf052
......@@ -128,7 +128,7 @@ class Admin::UsersController < Admin::ApplicationController
end
respond_to do |format|
result = Users::UpdateService.new(user, user_params_with_pass).execute do |user|
result = Users::UpdateService.new(current_user, user_params_with_pass.merge(user: user)).execute do |user|
user.skip_reconfirmation!
end
......@@ -155,7 +155,7 @@ class Admin::UsersController < Admin::ApplicationController
def remove_email
email = user.emails.find(params[:email_id])
success = Emails::DestroyService.new(user, email: email.email).execute
success = Emails::DestroyService.new(current_user, user: user, email: email.email).execute
respond_to do |format|
if success
......@@ -219,7 +219,7 @@ class Admin::UsersController < Admin::ApplicationController
end
def update_user(&block)
result = Users::UpdateService.new(user).execute(&block)
result = Users::UpdateService.new(current_user, user: user).execute(&block)
result[:status] == :success
end
......
app/controllers/application_controller.rb
View file @ a2dcf052
......@@ -25,6 +25,8 @@ class ApplicationController < ActionController::Base
around_action :set_locale
after_action :set_page_title_header, if: -> { request.format == :json }
protect_from_forgery with: :exception
helper_method :can?, :current_application_settings
......@@ -335,4 +337,9 @@ class ApplicationController < ActionController::Base
sign_in user, store: false
end
end
def set_page_title_header
# Per https://tools.ietf.org/html/rfc5987, headers need to be ISO-8859-1, not UTF-8
response.headers['Page-Title'] = page_title('GitLab').encode('ISO-8859-1')
end
end
app/controllers/concerns/authenticates_with_two_factor.rb
View file @ a2dcf052
......@@ -59,6 +59,7 @@ module AuthenticatesWithTwoFactor
sign_in(user)
else
user.increment_failed_attempts!
Gitlab::AppLogger.info("Failed Login: user=#{user.username} ip=#{request.remote_ip} method=OTP")
flash.now[:alert] = 'Invalid two-factor code.'
prompt_for_two_factor(user)
end
......@@ -75,6 +76,7 @@ module AuthenticatesWithTwoFactor
sign_in(user)
else
user.increment_failed_attempts!
Gitlab::AppLogger.info("Failed Login: user=#{user.username} ip=#{request.remote_ip} method=U2F")
flash.now[:alert] = 'Authentication via U2F device failed.'
prompt_for_two_factor(user)
end
......
app/controllers/concerns/notes_actions.rb
View file @ a2dcf052
......@@ -15,9 +15,9 @@ module NotesActions
notes = notes_finder.execute
.inc_relations_for_view
.reject { |n| n.cross_reference_not_visible_for?(current_user) }
notes = prepare_notes_for_rendering(notes)
notes = notes.reject { |n| n.cross_reference_not_visible_for?(current_user) }
notes_json[:notes] =
if noteable.discussions_rendered_on_frontend?
......
app/controllers/confirmations_controller.rb
View file @ a2dcf052
......@@ -12,10 +12,15 @@ class ConfirmationsController < Devise::ConfirmationsController
def after_confirmation_path_for(resource_name, resource)
if signed_in?(resource_name)
after_sign_in_path_for(resource)
after_sign_in(resource)
else
Gitlab::AppLogger.info("Email Confirmed: username=#{resource.username} email=#{resource.email} ip=#{request.remote_ip}")
flash[:notice] += " Please sign in."
new_session_path(resource_name)
end
end
def after_sign_in(resource)
after_sign_in_path_for(resource)
end
end
app/controllers/oauth/applications_controller.rb
View file @ a2dcf052
......@@ -21,14 +21,20 @@ class Oauth::ApplicationsController < Doorkeeper::ApplicationsController
@application.owner = current_user
if @application.save
flash[:notice] = I18n.t(:notice, scope: [:doorkeeper, :flash, :applications, :create])
redirect_to oauth_application_url(@application)
redirect_to_oauth_application_page
else
set_index_vars
render :index
end
end
protected
def redirect_to_oauth_application_page
flash[:notice] = I18n.t(:notice, scope: [:doorkeeper, :flash, :applications, :create])
redirect_to oauth_application_url(@application)
end
private
def verify_user_oauth_applications_enabled
......
app/controllers/profiles/avatars_controller.rb
View file @ a2dcf052
......@@ -2,7 +2,7 @@ class Profiles::AvatarsController < Profiles::ApplicationController
def destroy
@user = current_user
Users::UpdateService.new(@user).execute { |user| user.remove_avatar! }
Users::UpdateService.new(current_user, user: @user).execute { |user| user.remove_avatar! }
redirect_to profile_path, status: 302
end
......
app/controllers/profiles/emails_controller.rb
View file @ a2dcf052
......@@ -5,7 +5,7 @@ class Profiles::EmailsController < Profiles::ApplicationController
end
def create
@email = Emails::CreateService.new(current_user, email_params).execute
@email = Emails::CreateService.new(current_user, email_params.merge(user: current_user)).execute
if @email.errors.blank?
NotificationService.new.new_email(@email)
......@@ -19,7 +19,7 @@ class Profiles::EmailsController < Profiles::ApplicationController
def destroy
@email = current_user.emails.find(params[:id])
Emails::DestroyService.new(current_user, email: @email.email).execute
Emails::DestroyService.new(current_user, user: current_user, email: @email.email).execute
respond_to do |format|
format.html { redirect_to profile_emails_url, status: 302 }
......
app/controllers/profiles/keys_controller.rb
View file @ a2dcf052
......@@ -14,7 +14,7 @@ class Profiles::KeysController < Profiles::ApplicationController
@key = Keys::CreateService.new(current_user, key_params).execute
if @key.persisted?
redirect_to profile_key_path(@key)
redirect_to_profile_key_path
else
@keys = current_user.keys.select(&:persisted?)
render :index
......@@ -50,6 +50,12 @@ class Profiles::KeysController < Profiles::ApplicationController
end
end
protected
def redirect_to_profile_key_path
redirect_to profile_key_path(@key)
end
private
def key_params
......
app/controllers/profiles/notifications_controller.rb
View file @ a2dcf052
......@@ -7,7 +7,7 @@ class Profiles::NotificationsController < Profiles::ApplicationController
end
def update
result = Users::UpdateService.new(current_user, user_params).execute
result = Users::UpdateService.new(current_user, user_params.merge(user: current_user)).execute
if result[:status] == :success
flash[:notice] = "Notification settings saved"
......
app/controllers/profiles/passwords_controller.rb
View file @ a2dcf052
......@@ -21,10 +21,10 @@ class Profiles::PasswordsController < Profiles::ApplicationController
password_automatically_set: false
}
result = Users::UpdateService.new(@user, password_attributes).execute
result = Users::UpdateService.new(current_user, password_attributes.merge(user: @user)).execute
if result[:status] == :success
Users::UpdateService.new(@user, password_expires_at: nil).execute
Users::UpdateService.new(current_user, user: @user, password_expires_at: nil).execute
redirect_to root_path, notice: 'Password successfully changed'
else
......@@ -46,7 +46,7 @@ class Profiles::PasswordsController < Profiles::ApplicationController
return
end
result = Users::UpdateService.new(@user, password_attributes).execute
result = Users::UpdateService.new(current_user, password_attributes.merge(user: @user)).execute
if result[:status] == :success
flash[:notice] = "Password was successfully updated. Please login with it"
......
app/controllers/profiles/preferences_controller.rb
View file @ a2dcf052
......@@ -6,7 +6,7 @@ class Profiles::PreferencesController < Profiles::ApplicationController
def update
begin
result = Users::UpdateService.new(user, preferences_params).execute
result = Users::UpdateService.new(current_user, preferences_params.merge(user: user)).execute
if result[:status] == :success
flash[:notice] = 'Preferences saved.'
......
app/controllers/profiles/two_factor_auths_controller.rb
View file @ a2dcf052
......@@ -10,7 +10,7 @@ class Profiles::TwoFactorAuthsController < Profiles::ApplicationController
current_user.otp_grace_period_started_at = Time.current
end
Users::UpdateService.new(current_user).execute!
Users::UpdateService.new(current_user, user: current_user).execute!
if two_factor_authentication_required? && !current_user.two_factor_enabled?
two_factor_authentication_reason(
......@@ -41,7 +41,7 @@ class Profiles::TwoFactorAuthsController < Profiles::ApplicationController
def create
if current_user.validate_and_consume_otp!(params[:pin_code])
Users::UpdateService.new(current_user, otp_required_for_login: true).execute! do |user|
Users::UpdateService.new(current_user, user: current_user, otp_required_for_login: true).execute! do |user|
@codes = user.generate_otp_backup_codes!
end
......@@ -70,7 +70,7 @@ class Profiles::TwoFactorAuthsController < Profiles::ApplicationController
end
def codes
Users::UpdateService.new(current_user).execute! do |user|
Users::UpdateService.new(current_user, user: current_user).execute! do |user|
@codes = user.generate_otp_backup_codes!
end
end
......
app/controllers/profiles_controller.rb
View file @ a2dcf052
......@@ -10,7 +10,7 @@ class ProfilesController < Profiles::ApplicationController
def update
respond_to do |format|
result = Users::UpdateService.new(@user, user_params).execute
result = Users::UpdateService.new(current_user, user_params.merge(user: @user)).execute
if result[:status] == :success
message = "Profile was successfully updated"
......@@ -25,7 +25,7 @@ class ProfilesController < Profiles::ApplicationController
end
def reset_private_token
Users::UpdateService.new(@user).execute! do |user|
Users::UpdateService.new(current_user, user: @user).execute! do |user|
user.reset_authentication_token!
end
......@@ -35,7 +35,7 @@ class ProfilesController < Profiles::ApplicationController
end
def reset_incoming_email_token
Users::UpdateService.new(@user).execute! do |user|
Users::UpdateService.new(current_user, user: @user).execute! do |user|
user.reset_incoming_email_token!
end
......@@ -45,7 +45,7 @@ class ProfilesController < Profiles::ApplicationController
end
def reset_rss_token
Users::UpdateService.new(@user).execute! do |user|
Users::UpdateService.new(current_user, user: @user).execute! do |user|
user.reset_rss_token!
end
......@@ -61,7 +61,7 @@ class ProfilesController < Profiles::ApplicationController
end
def update_username
result = Users::UpdateService.new(@user, username: user_params[:username]).execute
result = Users::UpdateService.new(current_user, user: @user, username: user_params[:username]).execute
options = if result[:status] == :success
{ notice: "Username successfully changed" }
......
app/controllers/projects/blob_controller.rb
View file @ a2dcf052
......@@ -41,6 +41,8 @@ class Projects::BlobController < Projects::ApplicationController
end
format.json do
page_title @blob.path, @ref, @project.name_with_namespace
show_json
end
end
......
app/controllers/projects/issues_controller.rb
View file @ a2dcf052
......@@ -16,7 +16,7 @@ class Projects::IssuesController < Projects::ApplicationController
before_action :authorize_create_issue!, only: [:new, :create]
# Allow modify issue
before_action :authorize_update_issue!, only: [:edit, :update, :move]
before_action :authorize_update_issue!, only: [:update, :move]
# Allow create a new branch and empty WIP merge request from current issue
before_action :authorize_create_merge_request!, only: [:create_merge_request]
......@@ -63,10 +63,6 @@ class Projects::IssuesController < Projects::ApplicationController
respond_with(@issue)
end
def edit
respond_with(@issue)
end
def show
@noteable = @issue
@note = @project.notes.new(noteable: @issue)
......@@ -126,10 +122,6 @@ class Projects::IssuesController < Projects::ApplicationController
@issue = Issues::UpdateService.new(project, current_user, update_params).execute(issue)
respond_to do |format|
format.html do
recaptcha_check_with_fallback { render :edit }
end
format.json do
render_issue_json
end
......
app/controllers/projects/tree_controller.rb
View file @ a2dcf052
......@@ -35,6 +35,8 @@ class Projects::TreeController < Projects::ApplicationController
end
format.json do
page_title @path.presence || _("Files"), @ref, @project.name_with_namespace
# n+1: https://gitlab.com/gitlab-org/gitlab-ce/issues/38261
Gitlab::GitalyClient.allow_n_plus_1_calls do
render json: TreeSerializer.new(project: @project, repository: @repository, ref: @ref).represent(@tree)
......
app/controllers/projects_controller.rb
View file @ a2dcf052
......@@ -344,6 +344,7 @@ class ProjectsController < Projects::ApplicationController
:tag_list,
:visibility_level,
:template_name,
:merge_method,
project_feature_attributes: %i[
builds_access_level
......
app/controllers/registrations_controller.rb
View file @ a2dcf052
......@@ -42,10 +42,12 @@ class RegistrationsController < Devise::RegistrationsController
end
def after_sign_up_path_for(user)
Gitlab::AppLogger.info("User Created: username=#{user.username} email=#{user.email} ip=#{request.remote_ip} confirmed:#{user.confirmed?}")
user.confirmed? ? dashboard_projects_path : users_almost_there_path
end
def after_inactive_sign_up_path_for(_resource)
def after_inactive_sign_up_path_for(resource)
Gitlab::AppLogger.info("User Created: username=#{resource.username} email=#{resource.email} ip=#{request.remote_ip} confirmed:false")
users_almost_there_path
end
......
app/controllers/sessions_controller.rb
View file @ a2dcf052
This diff is collapsed.
app/finders/concerns/custom_attributes_filter.rb 0 → 100644
View file @ a2dcf052
This diff is collapsed.
app/finders/users_finder.rb
View file @ a2dcf052
This diff is collapsed.
app/helpers/boards_helper.rb
View file @ a2dcf052
This diff is collapsed.
app/helpers/breadcrumbs_helper.rb
View file @ a2dcf052
This diff is collapsed.
app/helpers/diff_helper.rb
View file @ a2dcf052
This diff is collapsed.
app/helpers/icons_helper.rb
View file @ a2dcf052
This diff is collapsed.
app/helpers/issuables_helper.rb
View file @ a2dcf052
This diff is collapsed.
app/helpers/page_layout_helper.rb
View file @ a2dcf052
This diff is collapsed.
app/helpers/projects_helper.rb
View file @ a2dcf052
This diff is collapsed.
app/models/ci/pipeline.rb
View file @ a2dcf052
This diff is collapsed.
app/models/gpg_key.rb
View file @ a2dcf052
This diff is collapsed.
app/models/merge_request.rb
View file @ a2dcf052
This diff is collapsed.
app/models/project.rb
View file @ a2dcf052
This diff is collapsed.
app/models/project_wiki.rb
View file @ a2dcf052
This diff is collapsed.
app/models/repository.rb
View file @ a2dcf052
This diff is collapsed.
app/models/storage/hashed_project.rb
View file @ a2dcf052
This diff is collapsed.
app/models/user.rb
View file @ a2dcf052
This diff is collapsed.
app/models/user_custom_attribute.rb 0 → 100644
View file @ a2dcf052
This diff is collapsed.
app/policies/global_policy.rb
View file @ a2dcf052
This diff is collapsed.
app/policies/namespace_policy.rb
View file @ a2dcf052
This diff is collapsed.
app/serializers/merge_request_entity.rb
View file @ a2dcf052
This diff is collapsed.
app/services/ci/create_pipeline_service.rb
View file @ a2dcf052
This diff is collapsed.
app/services/emails/base_service.rb
View file @ a2dcf052
This diff is collapsed.
app/services/emails/destroy_service.rb
View file @ a2dcf052
This diff is collapsed.
app/services/merge_requests/ff_merge_service.rb 0 → 100644
View file @ a2dcf052
This diff is collapsed.
app/services/projects/hashed_storage_migration_service.rb 0 → 100644
View file @ a2dcf052
This diff is collapsed.
app/services/tags/create_service.rb
View file @ a2dcf052
This diff is collapsed.
app/services/users/update_service.rb
View file @ a2dcf052
This diff is collapsed.
app/views/layouts/_search.html.haml
View file @ a2dcf052
This diff is collapsed.
app/views/layouts/header/_default.html.haml
View file @ a2dcf052
This diff is collapsed.
app/views/layouts/header/_new_dropdown.haml
View file @ a2dcf052
This diff is collapsed.
app/views/layouts/nav/_dashboard.html.haml
View file @ a2dcf052
This diff is collapsed.
app/views/projects/_merge_request_rebase_settings.html.haml 0 → 100644
View file @ a2dcf052
This diff is collapsed.
app/views/projects/blob/diff.html.haml
View file @ a2dcf052
This diff is collapsed.
app/views/projects/buttons/_fork.html.haml
View file @ a2dcf052
This diff is collapsed.
app/views/projects/forks/new.html.haml
View file @ a2dcf052
This diff is collapsed.
app/views/projects/issues/edit.html.haml deleted 100644 → 0
View file @ e0fc02f1
This diff is collapsed.
app/views/projects/notes/_actions.html.haml
View file @ a2dcf052
This diff is collapsed.
app/views/projects/tree/show.html.haml
View file @ a2dcf052
This diff is collapsed.
app/views/projects/wikis/_form.html.haml
View file @ a2dcf052
This diff is collapsed.
app/views/projects/wikis/_new.html.haml
View file @ a2dcf052
This diff is collapsed.
app/views/projects/wikis/_sidebar.html.haml
View file @ a2dcf052
This diff is collapsed.
app/views/projects/wikis/edit.html.haml
View file @ a2dcf052
This diff is collapsed.
app/views/projects/wikis/empty.html.haml
View file @ a2dcf052
This diff is collapsed.
app/views/projects/wikis/history.html.haml
View file @ a2dcf052
This diff is collapsed.
app/views/projects/wikis/pages.html.haml
View file @ a2dcf052
This diff is collapsed.
app/views/projects/wikis/show.html.haml
View file @ a2dcf052
This diff is collapsed.
app/views/shared/_target_switcher.html.haml deleted 100644 → 0
View file @ e0fc02f1
This diff is collapsed.
app/views/shared/boards/_show.html.haml
View file @ a2dcf052
This diff is collapsed.
app/workers/project_migrate_hashed_storage_worker.rb 0 → 100644
View file @ a2dcf052
This diff is collapsed.
app/workers/storage_migrator_worker.rb 0 → 100644
View file @ a2dcf052
This diff is collapsed.
changelogs/unreleased/3523-i18n-autodevops.yml 0 → 100644
View file @ a2dcf052
This diff is collapsed.
changelogs/unreleased/35942-api-binary-encoding.yaml deleted 100644 → 0
View file @ e0fc02f1
This diff is collapsed.
changelogs/unreleased/36670-remove-edit-form.yml 0 → 100644
View file @ a2dcf052
This diff is collapsed.
changelogs/unreleased/37335-counter-active-state.yml 0 → 100644
View file @ a2dcf052
This diff is collapsed.
changelogs/unreleased/38052-use-simple-api-for-projects.yml 0 → 100644
View file @ a2dcf052
This diff is collapsed.
changelogs/unreleased/38202-cannot-rename-a-hashed-project.yml 0 → 100644
View file @ a2dcf052
This diff is collapsed.
changelogs/unreleased/38432-fix-notes-type-for-import.yml 0 → 100644
View file @ a2dcf052
This diff is collapsed.
changelogs/unreleased/38528-build-url.yml 0 → 100644
View file @ a2dcf052
This diff is collapsed.
changelogs/unreleased/38571-fix-exception-in-raven-report.yml 0 → 100644
View file @ a2dcf052
This diff is collapsed.
changelogs/unreleased/add-labels-template-index.yml 0 → 100644
View file @ a2dcf052
This diff is collapsed.
changelogs/unreleased/breadcrumb-item-links.yml 0 → 100644
View file @ a2dcf052
This diff is collapsed.
changelogs/unreleased/breadcrumbs-line-height-padding.yml 0 → 100644
View file @ a2dcf052
This diff is collapsed.
changelogs/unreleased/bvl-fix-close-issuable-link.yml 0 → 100644
View file @ a2dcf052
This diff is collapsed.
changelogs/unreleased/close-issue-by-implements.yml 0 → 100644
View file @ a2dcf052
This diff is collapsed.
changelogs/unreleased/commit-row-avatar-align-top.yml 0 → 100644
View file @ a2dcf052
This diff is collapsed.
changelogs/unreleased/commit-side-by-side-comment.yml 0 → 100644
View file @ a2dcf052
This diff is collapsed.
changelogs/unreleased/dm-api-unauthorized.yml 0 → 100644
View file @ a2dcf052
This diff is collapsed.
changelogs/unreleased/dm-copy-parallel-diff.yml 0 → 100644
View file @ a2dcf052
This diff is collapsed.
changelogs/unreleased/docs-28814-clarify-artifacts-ref.yml 0 → 100644
View file @ a2dcf052
This diff is collapsed.
changelogs/unreleased/feature-custom-attributes.yml 0 → 100644
View file @ a2dcf052
This diff is collapsed.
changelogs/unreleased/ff_port_from_ee.yml 0 → 100644
View file @ a2dcf052
This diff is collapsed.
changelogs/unreleased/fix-gpg-case-insensitive.yml 0 → 100644
View file @ a2dcf052
This diff is collapsed.
changelogs/unreleased/fix-kubectl-180.yml 0 → 100644
View file @ a2dcf052
This diff is collapsed.
changelogs/unreleased/fix-mr-sidebar-counter-after-merge.yml 0 → 100644
View file @ a2dcf052
This diff is collapsed.
changelogs/unreleased/fork-btn-enabled-user-groups.yml 0 → 100644
View file @ a2dcf052
This diff is collapsed.
changelogs/unreleased/hash-mr-scroll-load.yml 0 → 100644
View file @ a2dcf052
This diff is collapsed.
changelogs/unreleased/hashed-storage-migration-path.yml 0 → 100644
View file @ a2dcf052
This diff is collapsed.
changelogs/unreleased/lint-changelog-yaml.yml 0 → 100644
View file @ a2dcf052
This diff is collapsed.
changelogs/unreleased/mr-widget-merged-date-tooltip.yml 0 → 100644
View file @ a2dcf052
This diff is collapsed.
changelogs/unreleased/remote_user.yml 0 → 100644
View file @ a2dcf052
This diff is collapsed.
changelogs/unreleased/repository-name-emojis deleted 100644 → 0
View file @ e0fc02f1
This diff is collapsed.
changelogs/unreleased/rotated_profile_image.yml 0 → 100644
View file @ a2dcf052
This diff is collapsed.
changelogs/unreleased/sh-fix-import-repos.yml 0 → 100644
View file @ a2dcf052
This diff is collapsed.
changelogs/unreleased/sh-fix-issue-38646.yml 0 → 100644
View file @ a2dcf052
This diff is collapsed.
changelogs/unreleased/sh-restore-all-refs-backup.yml 0 → 100644
View file @ a2dcf052
This diff is collapsed.
changelogs/unreleased/sh-thread-safe-markdown.yml 0 → 100644
View file @ a2dcf052
This diff is collapsed.
changelogs/unreleased/update-pages-0-6.yml 0 → 100644
View file @ a2dcf052
This diff is collapsed.
changelogs/unreleased/zj-repo-gitaly.yml 0 → 100644
View file @ a2dcf052
This diff is collapsed.
config/gitlab.yml.example
View file @ a2dcf052
This diff is collapsed.
config/initializers/1_settings.rb
View file @ a2dcf052
This diff is collapsed.
config/initializers/devise.rb
View file @ a2dcf052
This diff is collapsed.
config/initializers/grpc.rb 0 → 100644
View file @ a2dcf052
This diff is collapsed.
config/sidekiq_queues.yml
View file @ a2dcf052
This diff is collapsed.
db/migrate/20170720122741_create_user_custom_attributes.rb 0 → 100644
View file @ a2dcf052
This diff is collapsed.
db/post_migrate/20170927112319_update_notes_type_for_import.rb 0 → 100644
View file @ a2dcf052
This diff is collapsed.
db/schema.rb
View file @ a2dcf052
This diff is collapsed.
doc/administration/gitaly/index.md
View file @ a2dcf052
This diff is collapsed.
doc/administration/raketasks/storage.md 0 → 100644
View file @ a2dcf052
This diff is collapsed.
doc/administration/repository_storage_types.md 0 → 100644
View file @ a2dcf052
This diff is collapsed.
doc/api/README.md
View file @ a2dcf052
This diff is collapsed.
doc/api/custom_attributes.md 0 → 100644
View file @ a2dcf052
This diff is collapsed.
doc/api/jobs.md
View file @ a2dcf052
This diff is collapsed.
doc/api/users.md
View file @ a2dcf052
This diff is collapsed.
doc/ci/docker/using_docker_build.md
View file @ a2dcf052
This diff is collapsed.
doc/ci/yaml/README.md
View file @ a2dcf052
This diff is collapsed.
doc/development/README.md
View file @ a2dcf052
This diff is collapsed.
doc/development/fe_guide/index.md
View file @ a2dcf052
This diff is collapsed.
doc/development/gitaly.md 0 → 100644
View file @ a2dcf052
This diff is collapsed.
doc/development/testing.md
View file @ a2dcf052
This diff is collapsed.
doc/development/ux_guide/illustrations.md 0 → 100644
View file @ a2dcf052
This diff is collapsed.
doc/development/ux_guide/img/illustration-size-large-vertical.png 0 → 100644
View file @ a2dcf052
This diff is collapsed.
doc/development/ux_guide/img/illustration-size-medium.png 0 → 100755
View file @ a2dcf052
This diff is collapsed.
doc/development/ux_guide/img/illustration-size-small.png 0 → 100644
View file @ a2dcf052
This diff is collapsed.
doc/development/ux_guide/img/illustrations-border-radius.png 0 → 100755
View file @ a2dcf052
This diff is collapsed.
doc/development/ux_guide/img/illustrations-caps-do.png 0 → 100755
View file @ a2dcf052
This diff is collapsed.
doc/development/ux_guide/img/illustrations-caps-don't.png 0 → 100755
View file @ a2dcf052
This diff is collapsed.
doc/development/ux_guide/img/illustrations-color-grey.png 0 → 100755
View file @ a2dcf052
This diff is collapsed.
doc/development/ux_guide/img/illustrations-color-orange.png 0 → 100755
View file @ a2dcf052
This diff is collapsed.
doc/development/ux_guide/img/illustrations-color-purple.png 0 → 100755
View file @ a2dcf052
This diff is collapsed.
doc/development/ux_guide/img/illustrations-geometric.png 0 → 100755
View file @ a2dcf052
This diff is collapsed.
doc/development/ux_guide/img/illustrations-palette-oragne.png 0 → 100755
View file @ a2dcf052
This diff is collapsed.
doc/development/ux_guide/img/illustrations-palette-purple.png 0 → 100755
View file @ a2dcf052
This diff is collapsed.
doc/development/ux_guide/index.md
View file @ a2dcf052
This diff is collapsed.
doc/development/writing_documentation.md
View file @ a2dcf052
This diff is collapsed.
doc/install/database_mysql.md
View file @ a2dcf052
This diff is collapsed.
doc/install/kubernetes/gitlab_chart.md
View file @ a2dcf052
This diff is collapsed.
doc/install/kubernetes/index.md
View file @ a2dcf052
This diff is collapsed.
doc/topics/autodevops/index.md
View file @ a2dcf052
This diff is collapsed.
doc/user/project/integrations/kubernetes.md
View file @ a2dcf052
This diff is collapsed.
doc/user/project/merge_requests/fast_forward_merge.md 0 → 100644
View file @ a2dcf052
This diff is collapsed.
doc/user/project/merge_requests/img/ff_merge_mr.png 0 → 100644
View file @ a2dcf052
This diff is collapsed.
doc/user/project/merge_requests/img/ff_merge_rebase_locally.png 0 → 100644
View file @ a2dcf052
This diff is collapsed.
doc/user/project/merge_requests/index.md
View file @ a2dcf052
This diff is collapsed.
doc/user/project/pages/introduction.md
View file @ a2dcf052
This diff is collapsed.
doc/user/project/settings/index.md
View file @ a2dcf052
This diff is collapsed.
doc/workflow/README.md
View file @ a2dcf052
This diff is collapsed.
features/project/ff_merge_requests.feature 0 → 100644
View file @ a2dcf052
This diff is collapsed.
features/steps/project/ff_merge_requests.rb 0 → 100644
View file @ a2dcf052
This diff is collapsed.
features/steps/shared/diff_note.rb
View file @ a2dcf052
This diff is collapsed.
lib/api/api_guard.rb
View file @ a2dcf052
This diff is collapsed.
lib/api/custom_attributes_endpoints.rb 0 → 100644
View file @ a2dcf052
This diff is collapsed.
lib/api/entities.rb
View file @ a2dcf052
This diff is collapsed.
lib/api/helpers.rb
View file @ a2dcf052
This diff is collapsed.
lib/api/internal.rb
View file @ a2dcf052
This diff is collapsed.
lib/api/notification_settings.rb
View file @ a2dcf052
This diff is collapsed.
lib/api/users.rb
View file @ a2dcf052
This diff is collapsed.
lib/backup/repository.rb
View file @ a2dcf052
This diff is collapsed.
lib/banzai/filter/markdown_filter.rb
View file @ a2dcf052
This diff is collapsed.
lib/github/client.rb
View file @ a2dcf052
This diff is collapsed.
lib/github/import.rb
View file @ a2dcf052
This diff is collapsed.
lib/github/import/issue.rb 0 → 100644
View file @ a2dcf052
This diff is collapsed.
lib/github/import/legacy_diff_note.rb 0 → 100644
View file @ a2dcf052
This diff is collapsed.
lib/github/import/merge_request.rb 0 → 100644
View file @ a2dcf052
This diff is collapsed.
lib/github/import/note.rb 0 → 100644
View file @ a2dcf052
This diff is collapsed.
lib/gitlab/bare_repository_importer.rb
View file @ a2dcf052
This diff is collapsed.
lib/gitlab/ci/pipeline/chain/base.rb 0 → 100644
View file @ a2dcf052
This diff is collapsed.
lib/gitlab/ci/pipeline/chain/create.rb 0 → 100644
View file @ a2dcf052
This diff is collapsed.
lib/gitlab/ci/pipeline/chain/helpers.rb 0 → 100644
View file @ a2dcf052
This diff is collapsed.
lib/gitlab/ci/pipeline/chain/sequence.rb 0 → 100644
View file @ a2dcf052
This diff is collapsed.
lib/gitlab/ci/pipeline/chain/skip.rb 0 → 100644
View file @ a2dcf052
This diff is collapsed.
lib/gitlab/ci/pipeline/chain/validate/abilities.rb 0 → 100644
View file @ a2dcf052
This diff is collapsed.
lib/gitlab/ci/pipeline/chain/validate/config.rb 0 → 100644
View file @ a2dcf052
This diff is collapsed.
lib/gitlab/ci/pipeline/chain/validate/repository.rb 0 → 100644
View file @ a2dcf052
This diff is collapsed.
lib/gitlab/ci/pipeline/duration.rb 0 → 100644
View file @ a2dcf052
This diff is collapsed.
lib/gitlab/ci/pipeline_duration.rb deleted 100644 → 0
View file @ e0fc02f1
This diff is collapsed.
lib/gitlab/git/diff.rb
View file @ a2dcf052
This diff is collapsed.
lib/gitlab/git/hook.rb
View file @ a2dcf052
This diff is collapsed.
lib/gitlab/git/hooks_service.rb
View file @ a2dcf052
This diff is collapsed.
lib/gitlab/git/operation_service.rb
View file @ a2dcf052
This diff is collapsed.
lib/gitlab/git/repository.rb
View file @ a2dcf052
This diff is collapsed.
lib/gitlab/git/user.rb
View file @ a2dcf052
This diff is collapsed.
lib/gitlab/git_access.rb
View file @ a2dcf052
This diff is collapsed.
lib/gitlab/gitaly_client.rb
View file @ a2dcf052
This diff is collapsed.
lib/gitlab/gitaly_client/commit_service.rb
View file @ a2dcf052
This diff is collapsed.
lib/gitlab/gitaly_client/operation_service.rb 0 → 100644
View file @ a2dcf052
This diff is collapsed.
lib/gitlab/gitaly_client/ref_service.rb
View file @ a2dcf052
This diff is collapsed.
lib/gitlab/gitaly_client/util.rb
View file @ a2dcf052
This diff is collapsed.
lib/gitlab/kubernetes.rb
View file @ a2dcf052
This diff is collapsed.
lib/gitlab/ldap/access.rb
View file @ a2dcf052
This diff is collapsed.
lib/gitlab/ldap/adapter.rb
View file @ a2dcf052
This diff is collapsed.
lib/gitlab/ldap/person.rb
View file @ a2dcf052
This diff is collapsed.
lib/gitlab/ldap/user.rb
View file @ a2dcf052
This diff is collapsed.
lib/gitlab/o_auth/user.rb
View file @ a2dcf052
This diff is collapsed.
lib/gitlab/saml/user.rb
View file @ a2dcf052
This diff is collapsed.
lib/gitlab/shell.rb
View file @ a2dcf052
This diff is collapsed.
lib/gitlab/workhorse.rb
View file @ a2dcf052
This diff is collapsed.
lib/tasks/gitlab/shell.rake
View file @ a2dcf052
This diff is collapsed.
lib/tasks/gitlab/storage.rake 0 → 100644
View file @ a2dcf052
This diff is collapsed.
locale/bg/gitlab.po
View file @ a2dcf052
This diff is collapsed.
locale/de/gitlab.po
View file @ a2dcf052
This diff is collapsed.
locale/en/gitlab.po
View file @ a2dcf052
This diff is collapsed.
locale/eo/gitlab.po
View file @ a2dcf052
This diff is collapsed.
locale/es/gitlab.po
View file @ a2dcf052
This diff is collapsed.
locale/fr/gitlab.po
View file @ a2dcf052
This diff is collapsed.
locale/gitlab.pot
View file @ a2dcf052
This diff is collapsed.
locale/it/gitlab.po
View file @ a2dcf052
This diff is collapsed.
locale/ja/gitlab.po
View file @ a2dcf052
This diff is collapsed.
locale/ko/gitlab.po
View file @ a2dcf052
This diff is collapsed.
locale/nl_NL/gitlab.po
View file @ a2dcf052
This diff is collapsed.
locale/pt_BR/gitlab.po
View file @ a2dcf052
This diff is collapsed.
locale/ru/gitlab.po
View file @ a2dcf052
This diff is collapsed.
locale/uk/gitlab.po
View file @ a2dcf052
This diff is collapsed.
locale/zh_CN/gitlab.po
View file @ a2dcf052
This diff is collapsed.
locale/zh_HK/gitlab.po
View file @ a2dcf052
This diff is collapsed.
locale/zh_TW/gitlab.po
View file @ a2dcf052
This diff is collapsed.
qa/README.md
View file @ a2dcf052
This diff is collapsed.
qa/qa/page/admin/menu.rb
View file @ a2dcf052
This diff is collapsed.
scripts/lint-changelog-yaml 0 → 100755
View file @ a2dcf052
This diff is collapsed.
scripts/static-analysis
View file @ a2dcf052
This diff is collapsed.
spec/factories/gitaly/commit.rb 0 → 100644
View file @ a2dcf052
This diff is collapsed.
spec/factories/gitaly/commit_author.rb 0 → 100644
View file @ a2dcf052
This diff is collapsed.
spec/factories/projects.rb
View file @ a2dcf052
This diff is collapsed.
spec/factories/user_custom_attributes.rb 0 → 100644
View file @ a2dcf052
This diff is collapsed.
spec/features/copy_as_gfm_spec.rb
View file @ a2dcf052
This diff is collapsed.
spec/features/issues/form_spec.rb
View file @ a2dcf052
This diff is collapsed.
spec/features/issues_spec.rb
View file @ a2dcf052
This diff is collapsed.
spec/features/merge_requests/widget_spec.rb
View file @ a2dcf052
This diff is collapsed.
spec/features/projects/commit/diff_notes_spec.rb 0 → 100644
View file @ a2dcf052
This diff is collapsed.
spec/features/projects/fork_spec.rb 0 → 100644
View file @ a2dcf052
This diff is collapsed.
spec/features/signup_spec.rb
View file @ a2dcf052
This diff is collapsed.
spec/finders/users_finder_spec.rb
View file @ a2dcf052
This diff is collapsed.
spec/fixtures/config/kubeconfig.yml
View file @ a2dcf052
This diff is collapsed.
spec/helpers/projects_helper_spec.rb
View file @ a2dcf052
This diff is collapsed.
spec/javascripts/blob/pdf/index_spec.js
View file @ a2dcf052
This diff is collapsed.
spec/javascripts/build_spec.js
View file @ a2dcf052
This diff is collapsed.
spec/javascripts/issuable_context_spec.js 0 → 100644
View file @ a2dcf052
This diff is collapsed.
spec/javascripts/line_highlighter_spec.js
View file @ a2dcf052
This diff is collapsed.
spec/javascripts/merge_request_tabs_spec.js
View file @ a2dcf052
This diff is collapsed.
spec/javascripts/right_sidebar_spec.js
View file @ a2dcf052
This diff is collapsed.
spec/lib/github/client_spec.rb 0 → 100644
View file @ a2dcf052
This diff is collapsed.
spec/lib/github/import/legacy_diff_note_spec.rb 0 → 100644
View file @ a2dcf052
This diff is collapsed.
spec/lib/github/import/note_spec.rb 0 → 100644
View file @ a2dcf052
This diff is collapsed.
spec/lib/gitlab/ci/pipeline/chain/create_spec.rb 0 → 100644
View file @ a2dcf052
This diff is collapsed.
spec/lib/gitlab/ci/pipeline/chain/sequence_spec.rb 0 → 100644
View file @ a2dcf052
This diff is collapsed.
spec/lib/gitlab/ci/pipeline/chain/skip_spec.rb 0 → 100644
View file @ a2dcf052
This diff is collapsed.
spec/lib/gitlab/ci/pipeline/chain/validate/abilities_spec.rb 0 → 100644
View file @ a2dcf052
This diff is collapsed.
spec/lib/gitlab/ci/pipeline/chain/validate/config_spec.rb 0 → 100644
View file @ a2dcf052
This diff is collapsed.
spec/lib/gitlab/ci/pipeline/chain/validate/repository_spec.rb 0 → 100644
View file @ a2dcf052
This diff is collapsed.
spec/lib/gitlab/git/commit_spec.rb
View file @ a2dcf052
This diff is collapsed.
spec/lib/gitlab/git/diff_collection_spec.rb
View file @ a2dcf052
This diff is collapsed.
spec/lib/gitlab/git/diff_spec.rb
View file @ a2dcf052
This diff is collapsed.
spec/lib/gitlab/git/hook_spec.rb
View file @ a2dcf052
This diff is collapsed.
spec/lib/gitlab/git/hooks_service_spec.rb
View file @ a2dcf052
This diff is collapsed.
spec/lib/gitlab/git/repository_spec.rb
View file @ a2dcf052
This diff is collapsed.
spec/lib/gitlab/git/user_spec.rb
View file @ a2dcf052
This diff is collapsed.
spec/lib/gitlab/gitaly_client/operation_service_spec.rb 0 → 100644
View file @ a2dcf052
This diff is collapsed.
spec/lib/gitlab/gitaly_client/util_spec.rb 0 → 100644
View file @ a2dcf052
This diff is collapsed.
spec/lib/gitlab/gitaly_client_spec.rb
View file @ a2dcf052
This diff is collapsed.
spec/lib/gitlab/o_auth/user_spec.rb
View file @ a2dcf052
This diff is collapsed.
spec/lib/gitlab/saml/user_spec.rb
View file @ a2dcf052
This diff is collapsed.
spec/lib/gitlab/shell_spec.rb
View file @ a2dcf052
This diff is collapsed.
spec/lib/gitlab/workhorse_spec.rb
View file @ a2dcf052
This diff is collapsed.
spec/migrations/update_notes_type_for_import_spec.rb 0 → 100644
View file @ a2dcf052
This diff is collapsed.
spec/models/ci/pipeline_variable_spec.rb
View file @ a2dcf052
This diff is collapsed.
spec/models/gpg_key_spec.rb
View file @ a2dcf052
This diff is collapsed.
spec/models/project_spec.rb
View file @ a2dcf052
This diff is collapsed.
spec/models/repository_spec.rb
View file @ a2dcf052
This diff is collapsed.
spec/models/user_custom_attribute_spec.rb 0 → 100644
View file @ a2dcf052
This diff is collapsed.
spec/models/user_spec.rb
View file @ a2dcf052
This diff is collapsed.
spec/policies/global_policy_spec.rb
View file @ a2dcf052
This diff is collapsed.
spec/policies/namespace_policy_spec.rb 0 → 100644
View file @ a2dcf052
This diff is collapsed.
spec/requests/api/helpers_spec.rb
View file @ a2dcf052
This diff is collapsed.
spec/requests/api/users_spec.rb
View file @ a2dcf052
This diff is collapsed.
spec/services/emails/create_service_spec.rb
View file @ a2dcf052
This diff is collapsed.
spec/services/merge_requests/ff_merge_service_spec.rb 0 → 100644
View file @ a2dcf052
This diff is collapsed.
spec/services/projects/fork_service_spec.rb
View file @ a2dcf052
This diff is collapsed.
spec/services/tags/create_service_spec.rb
View file @ a2dcf052
This diff is collapsed.
spec/services/users/update_service_spec.rb
View file @ a2dcf052
This diff is collapsed.
spec/support/test_env.rb
View file @ a2dcf052
This diff is collapsed.
spec/support/update_invalid_issuable.rb
View file @ a2dcf052
This diff is collapsed.
spec/tasks/gitlab/storage_rake_spec.rb 0 → 100644
View file @ a2dcf052
This diff is collapsed.
spec/views/shared/issuable/_participants.html.haml.rb 0 → 100644
View file @ a2dcf052
This diff is collapsed.
spec/workers/post_receive_spec.rb
View file @ a2dcf052
This diff is collapsed.
spec/workers/project_migrate_hashed_storage_worker_spec.rb 0 → 100644
View file @ a2dcf052
This diff is collapsed.
spec/workers/storage_migrator_worker_spec.rb 0 → 100644
View file @ a2dcf052
This diff is collapsed.
yarn.lock
View file @ a2dcf052
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