Skip to content

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

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee into move_ff_to_ce

parents 7d21d203 6b532527
Expand all Show whitespace changes
Inline Side-by-side
Showing with 9992 additions and 2598 deletions
CHANGELOG-EE.md
View file @ cee2ecf5
Please view this file on the master branch, on stable branches it's out of date.
## 10.0.2 (2017-09-27)
- [FIXED] Send valid project path as name for Jira dev panel.
- [FIXED] Fix delta size check to handle commit or nil objects.
## 10.0.1 (2017-09-23)
- No changes.
......
CHANGELOG.md
View file @ cee2ecf5
......@@ -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)
......
Gemfile
View file @ cee2ecf5
......@@ -26,7 +26,7 @@ gem 'doorkeeper', '~> 4.2.0'
gem 'doorkeeper-openid_connect', '~> 1.1.0'
gem 'omniauth', '~> 1.4.2'
gem 'omniauth-auth0', '~> 1.4.1'
gem 'omniauth-azure-oauth2', '~> 0.0.6'
gem 'omniauth-azure-oauth2', '~> 0.0.9'
gem 'omniauth-cas3', '~> 1.1.4'
gem 'omniauth-facebook', '~> 4.0.0'
gem 'omniauth-github', '~> 1.1.1'
......
Gemfile.lock
View file @ cee2ecf5
......@@ -215,7 +215,7 @@ GEM
factory_girl_rails (4.7.0)
factory_girl (~> 4.7.0)
railties (>= 3.0.0)
faraday (0.12.1)
faraday (0.12.2)
multipart-post (>= 1.2, < 3)
faraday_middleware (0.11.0.1)
faraday (>= 0.7.4, < 1.0)
......@@ -545,10 +545,10 @@ GEM
omniauth-oauth2 (~> 1.1)
omniauth-authentiq (0.3.1)
omniauth-oauth2 (~> 1.3, >= 1.3.1)
omniauth-azure-oauth2 (0.0.6)
omniauth-azure-oauth2 (0.0.9)
jwt (~> 1.0)
omniauth (~> 1.0)
omniauth-oauth2 (~> 1.1)
omniauth-oauth2 (~> 1.4)
omniauth-cas3 (1.1.4)
addressable (~> 2.3)
nokogiri (~> 1.7, >= 1.7.1)
......@@ -574,7 +574,7 @@ GEM
omniauth-oauth (1.1.0)
oauth
omniauth (~> 1.0)
omniauth-oauth2 (1.3.1)
omniauth-oauth2 (1.4.0)
oauth2 (~> 1.0)
omniauth (~> 1.2)
omniauth-oauth2-generic (0.2.2)
......@@ -1113,7 +1113,7 @@ DEPENDENCIES
omniauth (~> 1.4.2)
omniauth-auth0 (~> 1.4.1)
omniauth-authentiq (~> 0.3.1)
omniauth-azure-oauth2 (~> 0.0.6)
omniauth-azure-oauth2 (~> 0.0.9)
omniauth-cas3 (~> 1.1.4)
omniauth-facebook (~> 4.0.0)
omniauth-github (~> 1.1.1)
......
app/assets/javascripts/boards/boards_bundle.js
View file @ cee2ecf5
......@@ -95,9 +95,6 @@ $(() => {
});
Store.rootPath = this.boardsEndpoint;
this.filterManager = new FilteredSearchBoards(Store.filter, true, [(this.milestoneTitle ? 'milestone' : null)]);
this.filterManager.setup();
// Listen for updateTokens event
eventHub.$on('updateTokens', this.updateTokens);
},
......@@ -105,6 +102,9 @@ $(() => {
eventHub.$off('updateTokens', this.updateTokens);
},
mounted () {
this.filterManager = new FilteredSearchBoards(Store.filter, true, [(this.milestoneTitle ? 'milestone' : null)]);
this.filterManager.setup();
Store.disabled = this.disabled;
gl.boardService.all()
.then(response => response.json())
......
app/assets/javascripts/cycle_analytics/components/limit_warning_component.js deleted 100644 → 0
View file @ 7d21d203
export default {
props: {
count: {
type: Number,
required: true,
},
},
template: `
<span v-if="count === 50" class="events-info pull-right">
<i class="fa fa-warning has-tooltip"
aria-hidden="true"
:title="n__('Limited to showing %d event at most', 'Limited to showing %d events at most', 50)"
data-placement="top"></i>
{{ n__('Showing %d event', 'Showing %d events', 50) }}
</span>
`,
};
app/assets/javascripts/cycle_analytics/components/limit_warning_component.vue 0 → 100644
View file @ cee2ecf5
<script>
import tooltip from '../../vue_shared/directives/tooltip';
export default {
props: {
count: {
type: Number,
required: true,
},
},
directives: {
tooltip,
},
};
</script>
<template>
<span v-if="count === 50" class="events-info pull-right">
<i
class="fa fa-warning"
v-tooltip
aria-hidden="true"
:title="n__('Limited to showing %d event at most', 'Limited to showing %d events at most', 50)"
data-placement="top"></i>
{{ n__('Showing %d event', 'Showing %d events', 50) }}
</span>
</template>
app/assets/javascripts/cycle_analytics/components/stage_code_component.js deleted 100644 → 0
View file @ 7d21d203
/* eslint-disable no-param-reassign */
import Vue from 'vue';
import userAvatarImage from '../../vue_shared/components/user_avatar/user_avatar_image.vue';
const global = window.gl || (window.gl = {});
global.cycleAnalytics = global.cycleAnalytics || {};
global.cycleAnalytics.StageCodeComponent = Vue.extend({
props: {
items: Array,
stage: Object,
},
components: {
userAvatarImage,
},
template: `
<div>
<div class="events-description">
{{ stage.description }}
<limit-warning :count="items.length" />
</div>
<ul class="stage-event-list">
<li v-for="mergeRequest in items" class="stage-event-item">
<div class="item-details">
<!-- FIXME: Pass an alt attribute here for accessibility -->
<user-avatar-image :img-src="mergeRequest.author.avatarUrl"/>
<h5 class="item-title merge-merquest-title">
<a :href="mergeRequest.url">
{{ mergeRequest.title }}
</a>
</h5>
<a :href="mergeRequest.url" class="issue-link">!{{ mergeRequest.iid }}</a>
&middot;
<span>
{{ s__('OpenedNDaysAgo|Opened') }}
<a :href="mergeRequest.url" class="issue-date">{{ mergeRequest.createdAt }}</a>
</span>
<span>
{{ s__('ByAuthor|by') }}
<a :href="mergeRequest.author.webUrl" class="issue-author-link">{{ mergeRequest.author.name }}</a>
</span>
</div>
<div class="item-time">
<total-time :time="mergeRequest.totalTime"></total-time>
</div>
</li>
</ul>
</div>
`,
});
app/assets/javascripts/cycle_analytics/components/stage_code_component.vue 0 → 100644
View file @ cee2ecf5
<script>
import userAvatarImage from '../../vue_shared/components/user_avatar/user_avatar_image.vue';
export default {
props: {
items: Array,
stage: Object,
},
components: {
userAvatarImage,
},
};
</script>
<template>
<div>
<div class="events-description">
{{ stage.description }}
<limit-warning :count="items.length" />
</div>
<ul class="stage-event-list">
<li v-for="mergeRequest in items" class="stage-event-item">
<div class="item-details">
<!-- FIXME: Pass an alt attribute here for accessibility -->
<user-avatar-image :img-src="mergeRequest.author.avatarUrl"/>
<h5 class="item-title merge-merquest-title">
<a :href="mergeRequest.url">
{{ mergeRequest.title }}
</a>
</h5>
<a :href="mergeRequest.url" class="issue-link">!{{ mergeRequest.iid }}</a>
&middot;
<span>
{{ s__('OpenedNDaysAgo|Opened') }}
<a :href="mergeRequest.url" class="issue-date">{{ mergeRequest.createdAt }}</a>
</span>
<span>
{{ s__('ByAuthor|by') }}
<a :href="mergeRequest.author.webUrl" class="issue-author-link">{{ mergeRequest.author.name }}</a>
</span>
</div>
<div class="item-time">
<total-time :time="mergeRequest.totalTime"></total-time>
</div>
</li>
</ul>
</div>
</template>
app/assets/javascripts/cycle_analytics/components/stage_component.vue 0 → 100644
View file @ cee2ecf5
<script>
import userAvatarImage from '../../vue_shared/components/user_avatar/user_avatar_image.vue';
export default {
props: {
items: Array,
stage: Object,
},
components: {
userAvatarImage,
},
};
</script>
<template>
<div>
<div class="events-description">
{{ stage.description }}
<limit-warning :count="items.length" />
</div>
<ul class="stage-event-list">
<li
v-for="(issue, i) in items"
:key="i"
class="stage-event-item">
<div class="item-details">
<!-- FIXME: Pass an alt attribute here for accessibility -->
<user-avatar-image :img-src="issue.author.avatarUrl"/>
<h5 class="item-title issue-title">
<a class="issue-title" :href="issue.url">
{{ issue.title }}
</a>
</h5>
<a :href="issue.url" class="issue-link">#{{ issue.iid }}</a>
&middot;
<span>
{{ s__('OpenedNDaysAgo|Opened') }}
<a :href="issue.url" class="issue-date">{{ issue.createdAt }}</a>
</span>
<span>
{{ s__('ByAuthor|by') }}
<a :href="issue.author.webUrl" class="issue-author-link">
{{ issue.author.name }}
</a>
</span>
</div>
<div class="item-time">
<total-time :time="issue.totalTime"/>
</div>
</li>
</ul>
</div>
</template>
app/assets/javascripts/cycle_analytics/components/stage_issue_component.js deleted 100644 → 0
View file @ 7d21d203
/* eslint-disable no-param-reassign */
import Vue from 'vue';
import userAvatarImage from '../../vue_shared/components/user_avatar/user_avatar_image.vue';
const global = window.gl || (window.gl = {});
global.cycleAnalytics = global.cycleAnalytics || {};
global.cycleAnalytics.StageIssueComponent = Vue.extend({
props: {
items: Array,
stage: Object,
},
components: {
userAvatarImage,
},
template: `
<div>
<div class="events-description">
{{ stage.description }}
<limit-warning :count="items.length" />
</div>
<ul class="stage-event-list">
<li v-for="issue in items" class="stage-event-item">
<div class="item-details">
<!-- FIXME: Pass an alt attribute here for accessibility -->
<user-avatar-image :img-src="issue.author.avatarUrl"/>
<h5 class="item-title issue-title">
<a class="issue-title" :href="issue.url">
{{ issue.title }}
</a>
</h5>
<a :href="issue.url" class="issue-link">#{{ issue.iid }}</a>
&middot;
<span>
{{ s__('OpenedNDaysAgo|Opened') }}
<a :href="issue.url" class="issue-date">{{ issue.createdAt }}</a>
</span>
<span>
{{ s__('ByAuthor|by') }}
<a :href="issue.author.webUrl" class="issue-author-link">
{{ issue.author.name }}
</a>
</span>
</div>
<div class="item-time">
<total-time :time="issue.totalTime"></total-time>
</div>
</li>
</ul>
</div>
`,
});
app/assets/javascripts/cycle_analytics/components/stage_plan_component.js deleted 100644 → 0
View file @ 7d21d203
/* eslint-disable no-param-reassign */
import Vue from 'vue';
import userAvatarImage from '../../vue_shared/components/user_avatar/user_avatar_image.vue';
import iconCommit from '../svg/icon_commit.svg';
const global = window.gl || (window.gl = {});
global.cycleAnalytics = global.cycleAnalytics || {};
global.cycleAnalytics.StagePlanComponent = Vue.extend({
props: {
items: Array,
stage: Object,
},
components: {
userAvatarImage,
},
data() {
return { iconCommit };
},
template: `
<div>
<div class="events-description">
{{ stage.description }}
<limit-warning :count="items.length" />
</div>
<ul class="stage-event-list">
<li v-for="commit in items" class="stage-event-item">
<div class="item-details item-conmmit-component">
<!-- FIXME: Pass an alt attribute here for accessibility -->
<user-avatar-image :img-src="commit.author.avatarUrl"/>
<h5 class="item-title commit-title">
<a :href="commit.commitUrl">
{{ commit.title }}
</a>
</h5>
<span>
{{ s__('FirstPushedBy|First') }}
<span class="commit-icon">${iconCommit}</span>
<a :href="commit.commitUrl" class="commit-hash-link commit-sha">{{ commit.shortSha }}</a>
{{ s__('FirstPushedBy|pushed by') }}
<a :href="commit.author.webUrl" class="commit-author-link">
{{ commit.author.name }}
</a>
</span>
</div>
<div class="item-time">
<total-time :time="commit.totalTime"></total-time>
</div>
</li>
</ul>
</div>
`,
});
app/assets/javascripts/cycle_analytics/components/stage_plan_component.vue 0 → 100644
View file @ cee2ecf5
<script>
import userAvatarImage from '../../vue_shared/components/user_avatar/user_avatar_image.vue';
import iconCommit from '../svg/icon_commit.svg';
export default {
props: {
items: Array,
stage: Object,
},
components: {
userAvatarImage,
},
computed: {
iconCommit() {
return iconCommit;
},
},
};
</script>
<template>
<div>
<div class="events-description">
{{ stage.description }}
<limit-warning :count="items.length" />
</div>
<ul class="stage-event-list">
<li
v-for="(commit, i) in items"
:key="i"
class="stage-event-item">
<div class="item-details item-conmmit-component">
<!-- FIXME: Pass an alt attribute here for accessibility -->
<user-avatar-image :img-src="commit.author.avatarUrl"/>
<h5 class="item-title commit-title">
<a :href="commit.commitUrl">
{{ commit.title }}
</a>
</h5>
<span>
{{ s__('FirstPushedBy|First') }}
<span class="commit-icon" v-html="iconCommit"></span>
<a :href="commit.commitUrl" class="commit-hash-link commit-sha">{{ commit.shortSha }}</a>
{{ s__('FirstPushedBy|pushed by') }}
<a :href="commit.author.webUrl" class="commit-author-link">
{{ commit.author.name }}
</a>
</span>
</div>
<div class="item-time">
<total-time :time="commit.totalTime" />
</div>
</li>
</ul>
</div>
</template>
app/assets/javascripts/cycle_analytics/components/stage_production_component.js deleted 100644 → 0
View file @ 7d21d203
/* eslint-disable no-param-reassign */
import Vue from 'vue';
import userAvatarImage from '../../vue_shared/components/user_avatar/user_avatar_image.vue';
const global = window.gl || (window.gl = {});
global.cycleAnalytics = global.cycleAnalytics || {};
global.cycleAnalytics.StageProductionComponent = Vue.extend({
props: {
items: Array,
stage: Object,
},
components: {
userAvatarImage,
},
template: `
<div>
<div class="events-description">
{{ stage.description }}
<limit-warning :count="items.length" />
</div>
<ul class="stage-event-list">
<li v-for="issue in items" class="stage-event-item">
<div class="item-details">
<!-- FIXME: Pass an alt attribute here for accessibility -->
<user-avatar-image :img-src="issue.author.avatarUrl"/>
<h5 class="item-title issue-title">
<a class="issue-title" :href="issue.url">
{{ issue.title }}
</a>
</h5>
<a :href="issue.url" class="issue-link">#{{ issue.iid }}</a>
&middot;
<span>
{{ s__('OpenedNDaysAgo|Opened') }}
<a :href="issue.url" class="issue-date">{{ issue.createdAt }}</a>
</span>
<span>
{{ s__('ByAuthor|by') }}
<a :href="issue.author.webUrl" class="issue-author-link">
{{ issue.author.name }}
</a>
</span>
</div>
<div class="item-time">
<total-time :time="issue.totalTime"></total-time>
</div>
</li>
</ul>
</div>
`,
});
app/assets/javascripts/cycle_analytics/components/stage_review_component.js deleted 100644 → 0
View file @ 7d21d203
/* eslint-disable no-param-reassign */
import Vue from 'vue';
import userAvatarImage from '../../vue_shared/components/user_avatar/user_avatar_image.vue';
const global = window.gl || (window.gl = {});
global.cycleAnalytics = global.cycleAnalytics || {};
global.cycleAnalytics.StageReviewComponent = Vue.extend({
props: {
items: Array,
stage: Object,
},
components: {
userAvatarImage,
},
template: `
<div>
<div class="events-description">
{{ stage.description }}
<limit-warning :count="items.length" />
</div>
<ul class="stage-event-list">
<li v-for="mergeRequest in items" class="stage-event-item">
<div class="item-details">
<!-- FIXME: Pass an alt attribute here for accessibility -->
<user-avatar-image :img-src="mergeRequest.author.avatarUrl"/>
<h5 class="item-title merge-merquest-title">
<a :href="mergeRequest.url">
{{ mergeRequest.title }}
</a>
</h5>
<a :href="mergeRequest.url" class="issue-link">!{{ mergeRequest.iid }}</a>
&middot;
<span>
{{ s__('OpenedNDaysAgo|Opened') }}
<a :href="mergeRequest.url" class="issue-date">{{ mergeRequest.createdAt }}</a>
</span>
<span>
{{ s__('ByAuthor|by') }}
<a :href="mergeRequest.author.webUrl" class="issue-author-link">{{ mergeRequest.author.name }}</a>
</span>
<template v-if="mergeRequest.state === 'closed'">
<span class="merge-request-state">
<i class="fa fa-ban"></i>
{{ mergeRequest.state.toUpperCase() }}
</span>
</template>
<template v-else>
<span class="merge-request-branch" v-if="mergeRequest.branch">
<i class= "fa fa-code-fork"></i>
<a :href="mergeRequest.branch.url">{{ mergeRequest.branch.name }}</a>
</span>
</template>
</div>
<div class="item-time">
<total-time :time="mergeRequest.totalTime"></total-time>
</div>
</li>
</ul>
</div>
`,
});
app/assets/javascripts/cycle_analytics/components/stage_review_component.vue 0 → 100644
View file @ cee2ecf5
<script>
import userAvatarImage from '../../vue_shared/components/user_avatar/user_avatar_image.vue';
export default {
props: {
items: Array,
stage: Object,
},
components: {
userAvatarImage,
},
};
</script>
<template>
<div>
<div class="events-description">
{{ stage.description }}
<limit-warning :count="items.length" />
</div>
<ul class="stage-event-list">
<li
v-for="(mergeRequest, i) in items"
:key="i"
class="stage-event-item">
<div class="item-details">
<!-- FIXME: Pass an alt attribute here for accessibility -->
<user-avatar-image :img-src="mergeRequest.author.avatarUrl"/>
<h5 class="item-title merge-merquest-title">
<a :href="mergeRequest.url">
{{ mergeRequest.title }}
</a>
</h5>
<a :href="mergeRequest.url" class="issue-link">!{{ mergeRequest.iid }}</a>
&middot;
<span>
{{ s__('OpenedNDaysAgo|Opened') }}
<a :href="mergeRequest.url" class="issue-date">{{ mergeRequest.createdAt }}</a>
</span>
<span>
{{ s__('ByAuthor|by') }}
<a :href="mergeRequest.author.webUrl" class="issue-author-link">{{ mergeRequest.author.name }}</a>
</span>
<template v-if="mergeRequest.state === 'closed'">
<span class="merge-request-state">
<i class="fa fa-ban"></i>
{{ mergeRequest.state.toUpperCase() }}
</span>
</template>
<template v-else>
<span class="merge-request-branch" v-if="mergeRequest.branch">
<i class= "fa fa-code-fork"></i>
<a :href="mergeRequest.branch.url">{{ mergeRequest.branch.name }}</a>
</span>
</template>
</div>
<div class="item-time">
<total-time :time="mergeRequest.totalTime"/>
</div>
</li>
</ul>
</div>
</template>
app/assets/javascripts/cycle_analytics/components/stage_staging_component.js deleted 100644 → 0
View file @ 7d21d203
/* eslint-disable no-param-reassign */
import Vue from 'vue';
import userAvatarImage from '../../vue_shared/components/user_avatar/user_avatar_image.vue';
import iconBranch from '../svg/icon_branch.svg';
const global = window.gl || (window.gl = {});
global.cycleAnalytics = global.cycleAnalytics || {};
global.cycleAnalytics.StageStagingComponent = Vue.extend({
props: {
items: Array,
stage: Object,
},
data() {
return { iconBranch };
},
components: {
userAvatarImage,
},
template: `
<div>
<div class="events-description">
{{ stage.description }}
<limit-warning :count="items.length" />
</div>
<ul class="stage-event-list">
<li v-for="build in items" class="stage-event-item item-build-component">
<div class="item-details">
<!-- FIXME: Pass an alt attribute here for accessibility -->
<user-avatar-image :img-src="build.author.avatarUrl"/>
<h5 class="item-title">
<a :href="build.url" class="pipeline-id">#{{ build.id }}</a>
<i class="fa fa-code-fork"></i>
<a :href="build.branch.url" class="ref-name">{{ build.branch.name }}</a>
<span class="icon-branch">${iconBranch}</span>
<a :href="build.commitUrl" class="commit-sha">{{ build.shortSha }}</a>
</h5>
<span>
<a :href="build.url" class="build-date">{{ build.date }}</a>
{{ s__('ByAuthor|by') }}
<a :href="build.author.webUrl" class="issue-author-link">
{{ build.author.name }}
</a>
</span>
</div>
<div class="item-time">
<total-time :time="build.totalTime"></total-time>
</div>
</li>
</ul>
</div>
`,
});
app/assets/javascripts/cycle_analytics/components/stage_staging_component.vue 0 → 100644
View file @ cee2ecf5
<script>
import userAvatarImage from '../../vue_shared/components/user_avatar/user_avatar_image.vue';
import iconBranch from '../svg/icon_branch.svg';
export default {
props: {
items: Array,
stage: Object,
},
components: {
userAvatarImage,
},
computed: {
iconBranch() {
return iconBranch;
},
},
};
</script>
<template>
<div>
<div class="events-description">
{{ stage.description }}
<limit-warning :count="items.length" />
</div>
<ul class="stage-event-list">
<li
v-for="(build, i) in items"
class="stage-event-item item-build-component"
:key="i">
<div class="item-details">
<!-- FIXME: Pass an alt attribute here for accessibility -->
<user-avatar-image :img-src="build.author.avatarUrl"/>
<h5 class="item-title">
<a :href="build.url" class="pipeline-id">#{{ build.id }}</a>
<i class="fa fa-code-fork"></i>
<a :href="build.branch.url" class="ref-name">{{ build.branch.name }}</a>
<span class="icon-branch" v-html="iconBranch"></span>
<a :href="build.commitUrl" class="commit-sha">{{ build.shortSha }}</a>
</h5>
<span>
<a :href="build.url" class="build-date">{{ build.date }}</a>
{{ s__('ByAuthor|by') }}
<a :href="build.author.webUrl" class="issue-author-link">
{{ build.author.name }}
</a>
</span>
</div>
<div class="item-time">
<total-time :time="build.totalTime"/>
</div>
</li>
</ul>
</div>
</template>
app/assets/javascripts/cycle_analytics/components/stage_test_component.js deleted 100644 → 0
View file @ 7d21d203
/* eslint-disable no-param-reassign */
import Vue from 'vue';
import iconBuildStatus from '../svg/icon_build_status.svg';
import iconBranch from '../svg/icon_branch.svg';
const global = window.gl || (window.gl = {});
global.cycleAnalytics = global.cycleAnalytics || {};
global.cycleAnalytics.StageTestComponent = Vue.extend({
props: {
items: Array,
stage: Object,
},
data() {
return { iconBuildStatus, iconBranch };
},
template: `
<div>
<div class="events-description">
{{ stage.description }}
<limit-warning :count="items.length" />
</div>
<ul class="stage-event-list">
<li v-for="build in items" class="stage-event-item item-build-component">
<div class="item-details">
<h5 class="item-title">
<span class="icon-build-status">${iconBuildStatus}</span>
<a :href="build.url" class="item-build-name">{{ build.name }}</a>
&middot;
<a :href="build.url" class="pipeline-id">#{{ build.id }}</a>
<i class="fa fa-code-fork"></i>
<a :href="build.branch.url" class="ref-name">{{ build.branch.name }}</a>
<span class="icon-branch">${iconBranch}</span>
<a :href="build.commitUrl" class="commit-sha">{{ build.shortSha }}</a>
</h5>
<span>
<a :href="build.url" class="issue-date">
{{ build.date }}
</a>
</span>
</div>
<div class="item-time">
<total-time :time="build.totalTime"></total-time>
</div>
</li>
</ul>
</div>
`,
});
app/assets/javascripts/cycle_analytics/components/stage_test_component.vue 0 → 100644
View file @ cee2ecf5
<script>
import iconBuildStatus from '../svg/icon_build_status.svg';
import iconBranch from '../svg/icon_branch.svg';
export default {
props: {
items: Array,
stage: Object,
},
computed: {
iconBuildStatus() {
return iconBuildStatus;
},
iconBranch() {
return iconBranch;
},
},
};
</script>
<template>
<div>
<div class="events-description">
{{ stage.description }}
<limit-warning :count="items.length" />
</div>
<ul class="stage-event-list">
<li
v-for="(build, i) in items"
:key="i"
class="stage-event-item item-build-component">
<div class="item-details">
<h5 class="item-title">
<span class="icon-build-status" v-html="iconBuildStatus"></span>
<a :href="build.url" class="item-build-name">{{ build.name }}</a>
&middot;
<a :href="build.url" class="pipeline-id">#{{ build.id }}</a>
<i class="fa fa-code-fork"></i>
<a :href="build.branch.url" class="ref-name">{{ build.branch.name }}</a>
<span class="icon-branch" v-html="iconBranch"></span>
<a :href="build.commitUrl" class="commit-sha">{{ build.shortSha }}</a>
</h5>
<span>
<a :href="build.url" class="issue-date">
{{ build.date }}
</a>
</span>
</div>
<div class="item-time">
<total-time :time="build.totalTime"/>
</div>
</li>
</ul>
</div>
</template>
app/assets/javascripts/cycle_analytics/components/total_time_component.js deleted 100644 → 0
View file @ 7d21d203
/* eslint-disable no-param-reassign */
import Vue from 'vue';
const global = window.gl || (window.gl = {});
global.cycleAnalytics = global.cycleAnalytics || {};
global.cycleAnalytics.TotalTimeComponent = Vue.extend({
props: {
time: Object,
},
template: `
<span class="total-time">
<template v-if="Object.keys(time).length">
<template v-if="time.days">{{ time.days }} <span>{{ n__('day', 'days', time.days) }}</span></template>
<template v-if="time.hours">{{ time.hours }} <span>{{ n__('Time|hr', 'Time|hrs', time.hours) }}</span></template>
<template v-if="time.mins && !time.days">{{ time.mins }} <span>{{ n__('Time|min', 'Time|mins', time.mins) }}</span></template>
<template v-if="time.seconds && Object.keys(time).length === 1 || time.seconds === 0">{{ time.seconds }} <span>{{ s__('Time|s') }}</span></template>
</template>
<template v-else>
--
</template>
</span>
`,
});
app/assets/javascripts/cycle_analytics/components/total_time_component.vue 0 → 100644
View file @ cee2ecf5
<script>
export default {
props: {
time: {
type: Object,
required: false,
default: () => ({}),
},
},
computed: {
hasData() {
return Object.keys(this.time).length;
},
},
};
</script>
<template>
<span class="total-time">
<template v-if="hasData">
<template v-if="time.days">{{ time.days }} <span>{{ n__('day', 'days', time.days) }}</span></template>
<template v-if="time.hours">{{ time.hours }} <span>{{ n__('Time|hr', 'Time|hrs', time.hours) }}</span></template>
<template v-if="time.mins && !time.days">{{ time.mins }} <span>{{ n__('Time|min', 'Time|mins', time.mins) }}</span></template>
<template v-if="time.seconds && hasDa === 1 || time.seconds === 0">{{ time.seconds }} <span>{{ s__('Time|s') }}</span></template>
</template>
<template v-else>
--
</template>
</span>
</template>
app/assets/javascripts/cycle_analytics/cycle_analytics_bundle.js
View file @ cee2ecf5
......@@ -3,60 +3,63 @@
import Vue from 'vue';
import Cookies from 'js-cookie';
import Translate from '../vue_shared/translate';
import LimitWarningComponent from './components/limit_warning_component';
import './components/stage_code_component';
import './components/stage_issue_component';
import './components/stage_plan_component';
import './components/stage_production_component';
import './components/stage_review_component';
import './components/stage_staging_component';
import './components/stage_test_component';
import './components/total_time_component';
import './cycle_analytics_service';
import './cycle_analytics_store';
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';
Vue.use(Translate);
$(() => {
const OVERVIEW_DIALOG_COOKIE = 'cycle_analytics_help_dismissed';
const cycleAnalyticsEl = document.querySelector('#cycle-analytics');
const cycleAnalyticsStore = gl.cycleAnalytics.CycleAnalyticsStore;
const cycleAnalyticsService = new gl.cycleAnalytics.CycleAnalyticsService({
requestPath: cycleAnalyticsEl.dataset.requestPath,
});
gl.cycleAnalyticsApp = new Vue({
el: '#cycle-analytics',
name: 'CycleAnalytics',
data: {
state: cycleAnalyticsStore.state,
data() {
const cycleAnalyticsEl = document.querySelector('#cycle-analytics');
const cycleAnalyticsService = new CycleAnalyticsService({
requestPath: cycleAnalyticsEl.dataset.requestPath,
});
return {
store: CycleAnalyticsStore,
state: CycleAnalyticsStore.state,
isLoading: false,
isLoadingStage: false,
isEmptyStage: false,
hasError: false,
startDate: 30,
isOverviewDialogDismissed: Cookies.get(OVERVIEW_DIALOG_COOKIE),
service: cycleAnalyticsService,
};
},
computed: {
currentStage() {
return cycleAnalyticsStore.currentActiveStage();
return this.store.currentActiveStage();
},
},
components: {
'stage-issue-component': gl.cycleAnalytics.StageIssueComponent,
'stage-plan-component': gl.cycleAnalytics.StagePlanComponent,
'stage-code-component': gl.cycleAnalytics.StageCodeComponent,
'stage-test-component': gl.cycleAnalytics.StageTestComponent,
'stage-review-component': gl.cycleAnalytics.StageReviewComponent,
'stage-staging-component': gl.cycleAnalytics.StageStagingComponent,
'stage-production-component': gl.cycleAnalytics.StageProductionComponent,
'stage-issue-component': stageComponent,
'stage-plan-component': stagePlanComponent,
'stage-code-component': stageCodeComponent,
'stage-test-component': stageTestComponent,
'stage-review-component': stageReviewComponent,
'stage-staging-component': stageStagingComponent,
'stage-production-component': stageComponent,
},
created() {
this.fetchCycleAnalyticsData();
},
methods: {
handleError() {
cycleAnalyticsStore.setErrorState(true);
this.store.setErrorState(true);
return new Flash('There was an error while fetching cycle analytics data.');
},
initDropdown() {
......@@ -77,17 +80,17 @@ $(() => {
this.isLoading = true;
cycleAnalyticsService
this.service
.fetchCycleAnalyticsData(fetchOptions)
.done((response) => {
cycleAnalyticsStore.setCycleAnalyticsData(response);
.then(resp => resp.json())
.then((response) => {
this.store.setCycleAnalyticsData(response);
this.selectDefaultStage();
this.initDropdown();
this.isLoading = false;
})
.error(() => {
.catch(() => {
this.handleError();
})
.always(() => {
this.isLoading = false;
});
},
......@@ -100,27 +103,27 @@ $(() => {
if (this.currentStage === stage) return;
if (!stage.isUserAllowed) {
cycleAnalyticsStore.setActiveStage(stage);
this.store.setActiveStage(stage);
return;
}
this.isLoadingStage = true;
cycleAnalyticsStore.setStageEvents([], stage);
cycleAnalyticsStore.setActiveStage(stage);
this.store.setStageEvents([], stage);
this.store.setActiveStage(stage);
cycleAnalyticsService
this.service
.fetchStageData({
stage,
startDate: this.startDate,
})
.done((response) => {
.then(resp => resp.json())
.then((response) => {
this.isEmptyStage = !response.events.length;
cycleAnalyticsStore.setStageEvents(response.events, stage);
this.store.setStageEvents(response.events, stage);
this.isLoadingStage = false;
})
.error(() => {
.catch(() => {
this.isEmptyStage = true;
})
.always(() => {
this.isLoadingStage = false;
});
},
......@@ -132,6 +135,6 @@ $(() => {
});
// Register global components
Vue.component('limit-warning', LimitWarningComponent);
Vue.component('total-time', gl.cycleAnalytics.TotalTimeComponent);
Vue.component('limit-warning', limitWarningComponent);
Vue.component('total-time', totalTime);
});
app/assets/javascripts/cycle_analytics/cycle_analytics_service.js
View file @ cee2ecf5
/* eslint-disable no-param-reassign */
import Vue from 'vue';
import VueResource from 'vue-resource';
const global = window.gl || (window.gl = {});
global.cycleAnalytics = global.cycleAnalytics || {};
Vue.use(VueResource);
class CycleAnalyticsService {
export default class CycleAnalyticsService {
constructor(options) {
this.requestPath = options.requestPath;
this.cycleAnalytics = Vue.resource(this.requestPath);
}
fetchCycleAnalyticsData(options) {
options = options || { startDate: 30 };
return $.ajax({
url: this.requestPath,
method: 'GET',
dataType: 'json',
contentType: 'application/json',
data: {
cycle_analytics: {
start_date: options.startDate,
},
},
});
fetchCycleAnalyticsData(options = { startDate: 30 }) {
return this.cycleAnalytics.get({ cycle_analytics: { start_date: options.startDate } });
}
fetchStageData(options) {
......@@ -30,12 +19,12 @@ class CycleAnalyticsService {
startDate,
} = options;
return $.get(`${this.requestPath}/events/${stage.name}.json`, {
return Vue.http.get(`${this.requestPath}/events/${stage.name}.json`, {
params: {
cycle_analytics: {
start_date: startDate,
},
},
});
}
}
global.cycleAnalytics.CycleAnalyticsService = CycleAnalyticsService;
app/assets/javascripts/cycle_analytics/cycle_analytics_store.js
View file @ cee2ecf5
......@@ -4,9 +4,6 @@ import { __ } from '../locale';
import '../lib/utils/text_utility';
import DEFAULT_EVENT_OBJECTS from './default_event_objects';
const global = window.gl || (window.gl = {});
global.cycleAnalytics = global.cycleAnalytics || {};
const EMPTY_STAGE_TEXTS = {
issue: __('The issue stage shows the time it takes from creating an issue to assigning the issue to a milestone, or add the issue to a list on your Issue Board. Begin creating issues to see data for this stage.'),
plan: __('The planning stage shows the time from the previous step to pushing your first commit. This time will be added automatically once you push your first commit.'),
......@@ -17,7 +14,7 @@ const EMPTY_STAGE_TEXTS = {
production: __('The production stage shows the total time it takes between creating an issue and deploying the code to production. The data will be automatically added once you have completed the full idea to production cycle.'),
};
global.cycleAnalytics.CycleAnalyticsStore = {
export default {
state: {
summary: '',
stats: '',
......
app/assets/javascripts/dispatcher.js
View file @ cee2ecf5
......@@ -602,6 +602,7 @@ import initGroupAnalytics from './init_group_analytics';
case 'groups:analytics:show':
initGroupAnalytics();
break;
}
switch (path[0]) {
case 'sessions':
......
app/assets/javascripts/fly_out_nav.js
View file @ cee2ecf5
......@@ -34,7 +34,7 @@ export const canShowActiveSubItems = (el) => {
export const canShowSubItems = () => bp.getBreakpointSize() === 'sm' || bp.getBreakpointSize() === 'md' || bp.getBreakpointSize() === 'lg';
export const getHideSubItemsInterval = () => {
if (!currentOpenMenu) return 0;
if (!currentOpenMenu || !mousePos.length) return 0;
const currentMousePos = mousePos[mousePos.length - 1];
const prevMousePos = mousePos[0];
......
app/assets/javascripts/groups/ldap_group_links.js 0 → 100644
View file @ cee2ecf5
document.addEventListener('DOMContentLoaded', () => {
const showGroupLink = () => {
const $cnLink = $('.cn-link');
const $filterLink = $('.filter-link');
const $checkedSync = $('input[name="sync_method"]:checked').val() === 'group';
$cnLink.toggle($checkedSync);
$filterLink.toggle(!$checkedSync);
};
$('input[name="sync_method"]').on('change', showGroupLink);
showGroupLink();
});
app/assets/javascripts/lib/utils/sticky.js
View file @ cee2ecf5
export const isSticky = (el, scrollY, stickyTop) => {
export const createPlaceholder = () => {
const placeholder = document.createElement('div');
placeholder.classList.add('sticky-placeholder');
return placeholder;
};
export const isSticky = (el, scrollY, stickyTop, insertPlaceholder) => {
const top = Math.floor(el.offsetTop - scrollY);
if (top <= stickyTop) {
if (top <= stickyTop && !el.classList.contains('is-stuck')) {
const placeholder = insertPlaceholder ? createPlaceholder() : null;
const heightBefore = el.offsetHeight;
el.classList.add('is-stuck');
} else {
if (insertPlaceholder) {
el.parentNode.insertBefore(placeholder, el.nextElementSibling);
placeholder.style.height = `${heightBefore - el.offsetHeight}px`;
}
} else if (top > stickyTop && el.classList.contains('is-stuck')) {
el.classList.remove('is-stuck');
if (insertPlaceholder && el.nextElementSibling && el.nextElementSibling.classList.contains('sticky-placeholder')) {
el.nextElementSibling.remove();
}
}
};
export default (el) => {
export default (el, insertPlaceholder = true) => {
if (!el) return;
const computedStyle = window.getComputedStyle(el);
......@@ -17,7 +37,7 @@ export default (el) => {
const stickyTop = parseInt(computedStyle.top, 10);
document.addEventListener('scroll', () => isSticky(el, window.scrollY, stickyTop), {
document.addEventListener('scroll', () => isSticky(el, window.scrollY, stickyTop, insertPlaceholder), {
passive: true,
});
};
app/assets/javascripts/line_highlighter.js
View file @ cee2ecf5
......@@ -28,52 +28,56 @@
// </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;
}
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;
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._hash = hash;
this.bindEvents();
this.highlightHash();
}
};
LineHighlighter.prototype.bindEvents = function() {
const $fileHolder = $(this.options.fileHolderSelector);
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() {
LineHighlighter.prototype.highlightHash = function() {
var range;
if (this._hash !== '') {
range = this.hashToRange(this._hash);
if (range[0]) {
this.highlightRange(range);
$.scrollTo("#L" + range[0], {
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 {
$.scrollTo(lineSelector, scrollOptions);
}
}
};
}
};
LineHighlighter.prototype.clickHandler = function(event) {
LineHighlighter.prototype.clickHandler = function(event) {
var current, lineNumber, range;
event.preventDefault();
this.clearHighlight();
......@@ -93,25 +97,24 @@
this.setHash(range[0], range[1]);
return this.highlightRange(range);
}
};
};
LineHighlighter.prototype.clearHighlight = function() {
return $("." + this.highlightClass).removeClass(this.highlightClass);
// Unhighlight previously highlighted lines
};
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) {
// 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+))?$/);
......@@ -122,19 +125,19 @@
} 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 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) {
// 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 = [];
......@@ -145,10 +148,10 @@
} else {
return this.highlightLine(range[0]);
}
};
};
// Set the URL hash string
LineHighlighter.prototype.setHash = function(firstLineNumber, lastLineNumber) {
// Set the URL hash string
LineHighlighter.prototype.setHash = function(firstLineNumber, lastLineNumber) {
var hash;
if (lastLineNumber) {
hash = "#L" + firstLineNumber + "-" + lastLineNumber;
......@@ -157,19 +160,17 @@
}
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) {
// 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);
window.LineHighlighter = LineHighlighter;
app/assets/javascripts/merge_request_tabs.js
View file @ cee2ecf5
......@@ -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/repo/components/repo_preview.vue
View file @ cee2ecf5
<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(() => {
......
app/assets/javascripts/repo/helpers/repo_helper.js
View file @ cee2ecf5
......@@ -178,8 +178,8 @@ const RepoHelper = {
setFile(data, file) {
const newFile = data;
newFile.url = file.url || Service.url; // Grab the URL from service, happens on page refresh.
newFile.url = file.url;
if (newFile.render_error === 'too_large' || newFile.render_error === 'collapsed') {
newFile.tooLarge = true;
}
......
app/assets/stylesheets/framework/blocks.scss
View file @ cee2ecf5
......@@ -260,7 +260,7 @@
position: relative;
border: 1px solid $blue-300;
border-radius: $border-radius-default;
background-color: $blue-25;
background-color: $blue-50;
justify-content: center;
.dismiss-button {
......
app/assets/stylesheets/framework/dropdowns.scss
View file @ cee2ecf5
......@@ -779,6 +779,14 @@
white-space: normal;
width: 100%;
&.dropdown-menu-user-link {
white-space: nowrap;
.dropdown-menu-user-username {
display: block;
}
}
// make sure the text color is not overriden
&.text-danger {
color: $brand-danger;
......
app/assets/stylesheets/framework/gitlab-theme.scss
View file @ cee2ecf5
......@@ -6,7 +6,7 @@
// Header
header.navbar-gitlab-new {
background: linear-gradient(to right, $color-900, $color-800);
background-color: $color-900;
.navbar-collapse {
color: $color-200;
......@@ -201,7 +201,7 @@ body {
@include gitlab-theme($theme-gray-900, $theme-gray-700, $theme-gray-800, $theme-gray-700, $theme-gray-700, $theme-gray-100, $theme-gray-700);
header.navbar-gitlab-new {
background: $theme-gray-100;
background-color: $theme-gray-100;
box-shadow: 0 2px 0 0 $border-color;
.logo-text svg {
......@@ -242,10 +242,10 @@ body {
&:hover {
background-color: $white-light;
box-shadow: inset 0 0 0 1px $blue-100;
box-shadow: inset 0 0 0 1px $blue-200;
.location-badge {
box-shadow: inset 0 0 0 1px $blue-100;
box-shadow: inset 0 0 0 1px $blue-200;
}
}
}
......
app/assets/stylesheets/framework/mixins.scss
View file @ cee2ecf5
......@@ -142,7 +142,43 @@
}
@mixin green-status-color {
@include status-color($green-50, $green-500, $green-700);
@include status-color($green-100, $green-500, $green-700);
}
@mixin fade($gradient-direction, $gradient-color) {
visibility: hidden;
opacity: 0;
z-index: 2;
position: absolute;
bottom: 12px;
width: 43px;
height: 30px;
transition-duration: .3s;
-webkit-transform: translateZ(0);
background: linear-gradient(to $gradient-direction, $gradient-color 45%, rgba($gradient-color, 0.4));
&.scrolling {
visibility: visible;
opacity: 1;
transition-duration: .3s;
}
.fa {
position: relative;
top: 5px;
font-size: 18px;
}
}
@mixin scrolling-links() {
overflow-x: auto;
overflow-y: hidden;
-webkit-overflow-scrolling: touch;
display: flex;
&::-webkit-scrollbar {
display: none;
}
}
@mixin fade($gradient-direction, $gradient-color) {
......
app/assets/stylesheets/framework/new-nav.scss
View file @ cee2ecf5
......@@ -306,6 +306,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;
}
......@@ -317,11 +319,6 @@ header.navbar-gitlab-new {
align-self: center;
color: $gl-text-color-secondary;
@media (max-width: $screen-xs-max) {
padding-left: 17px;
border-left: 1px solid $gl-text-color-quaternary;
}
.avatar-tile {
margin-right: 4px;
border: 1px solid $border-color;
......@@ -351,6 +348,7 @@ header.navbar-gitlab-new {
display: flex;
align-items: center;
position: relative;
padding: 2px 0;
&:not(:last-child) {
margin-right: 20px;
......@@ -386,7 +384,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 @ cee2ecf5
......@@ -461,6 +461,13 @@ $new-sidebar-collapsed-width: 50px;
font-size: 18px;
}
}
@media (max-width: $screen-xs-max) {
+ .breadcrumbs-links {
padding-left: 17px;
border-left: 1px solid $gl-text-color-quaternary;
}
}
}
@media (max-width: $screen-xs-max) {
......
app/assets/stylesheets/framework/tw_bootstrap_variables.scss
View file @ cee2ecf5
......@@ -137,7 +137,7 @@ $well-border: #eee;
//##
$code-color: $red-600;
$code-bg: lighten($red-50, 2%);
$code-bg: lighten($red-100, 2%);
$kbd-color: $white-light;
$kbd-bg: #333;
......
app/assets/stylesheets/framework/variables.scss
View file @ cee2ecf5
......@@ -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
......@@ -29,46 +30,45 @@ $gray-dark: darken($gray-light, $darken-dark-factor);
$gray-darker: #eee;
$gray-darkest: #c4c4c4;
$green-25: #f6fcf8;
$green-50: #e4f5eb;
$green-100: #bae6cc;
$green-200: #8dd5aa;
$green-300: #5fc488;
$green-400: #3cb76f;
$green-50: #f1fdf6;
$green-100: #dcf5e7;
$green-200: #b3e6c8;
$green-300: #75d09b;
$green-400: #37b96d;
$green-500: #1aaa55;
$green-600: #168f48;
$green-700: #12753a;
$green-800: #0e5a2d;
$green-900: #0a4020;
$green-950: #072b15;
$blue-25: #f6fafd;
$blue-50: #e4eff9;
$blue-100: #bcd7f1;
$blue-200: #8fbce8;
$blue-300: #62a1df;
$blue-400: #418cd8;
$blue-50: #f6fafe;
$blue-100: #e4f0fb;
$blue-200: #b8d6f4;
$blue-300: #73afea;
$blue-400: #2e87e0;
$blue-500: #1f78d1;
$blue-600: #1b69b6;
$blue-700: #17599c;
$blue-800: #134a81;
$blue-900: #0f3b66;
$blue-950: #0a2744;
$orange-25: #fffcf8;
$orange-50: #fff2e1;
$orange-100: #fedfb3;
$orange-200: #feca81;
$orange-300: #fdb44f;
$orange-400: #fca429;
$orange-50: #fffaf4;
$orange-100: #fff1de;
$orange-200: #fed69f;
$orange-300: #fdbc60;
$orange-400: #fca121;
$orange-500: #fc9403;
$orange-600: #de7e00;
$orange-700: #c26700;
$orange-800: #a35100;
$orange-900: #853b00;
$orange-800: #a35200;
$orange-900: #853c00;
$orange-950: #592800;
$red-25: #fef7f6;
$red-50: #fbe7e4;
$red-100: #f4c4bc;
$red-200: #ed9d90;
$red-50: #fef6f5;
$red-100: #fbe5e1;
$red-200: #f2b4a9;
$red-300: #e67664;
$red-400: #e05842;
$red-500: #db3b21;
......@@ -76,6 +76,7 @@ $red-600: #c0341d;
$red-700: #a62d19;
$red-800: #8b2615;
$red-900: #711e11;
$red-950: #4b140b;
// GitLab themes
......@@ -186,8 +187,8 @@ $list-text-disabled-color: $gl-text-color-tertiary;
$list-border-light: #eee;
$list-border: rgba(0, 0, 0, 0.05);
$list-text-height: 42px;
$list-warning-row-bg: $orange-50;
$list-warning-row-border: $orange-100;
$list-warning-row-bg: $orange-100;
$list-warning-row-border: $orange-200;
$list-warning-row-color: $orange-700;
/*
......@@ -216,8 +217,8 @@ $gl-sidebar-padding: 22px;
/*
* Misc
*/
$row-hover: $blue-25;
$row-hover-border: $blue-100;
$row-hover: $blue-50;
$row-hover-border: $blue-200;
$progress-color: #c0392b;
$header-height: 50px;
$new-navbar-height: 40px;
......@@ -272,8 +273,8 @@ $time-color: #999;
$project-member-show-color: #aaa;
$gl-promo-color: #aaa;
$error-bg: $red-400;
$warning-message-bg: $orange-50;
$warning-message-border: $orange-100;
$warning-message-bg: $orange-100;
$warning-message-border: $orange-200;
$warning-message-color: $orange-700;
$control-group-descr-color: #666;
$table-permission-x-bg: #d9edf7;
......@@ -459,17 +460,17 @@ $builds-trace-bg: #111;
/*
* Callout
*/
$callout-danger-bg: $red-50;
$callout-danger-border: $red-100;
$callout-danger-bg: $red-100;
$callout-danger-border: $red-200;
$callout-danger-color: $red-700;
$callout-warning-bg: $orange-50;
$callout-warning-border: $orange-100;
$callout-warning-bg: $orange-100;
$callout-warning-border: $orange-200;
$callout-warning-color: $orange-700;
$callout-info-bg: $blue-50;
$callout-info-border: $blue-100;
$callout-info-bg: $blue-100;
$callout-info-border: $blue-200;
$callout-info-color: $blue-700;
$callout-success-bg: $green-50;
$callout-success-border: $green-100;
$callout-success-bg: $green-100;
$callout-success-border: $green-200;
$callout-success-color: $green-700;
/*
......
app/assets/stylesheets/pages/boards.scss
View file @ cee2ecf5
......@@ -80,11 +80,25 @@
.boards-list {
height: calc(100vh - 50px);
}
.issue-boards-sidebar {
height: 100%;
top: 0;
}
}
}
.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 {
......@@ -108,11 +122,6 @@
height: calc(100vh - 222px);
// scss-lint:enable DuplicateProperty
min-height: 475px;
transition: width .2s;
&.is-compact {
width: calc(100% - 290px);
}
}
}
......@@ -469,14 +478,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;
}
......@@ -514,8 +515,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/convdev_index.scss
View file @ cee2ecf5
......@@ -83,7 +83,7 @@ $space-between-cards: 8px;
border-top-color: $color-low-score;
.card-score-big {
background-color: $red-25;
background-color: $red-50;
}
}
......@@ -91,7 +91,7 @@ $space-between-cards: 8px;
border-top-color: $color-average-score;
.card-score-big {
background-color: $orange-25;
background-color: $orange-50;
}
}
......@@ -99,7 +99,7 @@ $space-between-cards: 8px;
border-top-color: $color-high-score;
.card-score-big {
background-color: $green-25;
background-color: $green-50;
}
}
......
app/assets/stylesheets/pages/diff.scss
View file @ cee2ecf5
......@@ -451,7 +451,7 @@
}
.files {
margin-top: -1px;
margin-top: 1px;
.diff-file:last-child {
margin-bottom: 0;
......@@ -586,11 +586,6 @@
top: 76px;
}
+ .files,
+ .alert {
margin-top: 1px;
}
&:not(.is-stuck) .diff-stats-additions-deletions-collapsed {
display: none;
}
......@@ -605,11 +600,6 @@
.inline-parallel-buttons {
display: none;
}
+ .files,
+ .alert {
margin-top: 32px;
}
}
}
}
......
app/assets/stylesheets/pages/issuable.scss
View file @ cee2ecf5
......@@ -7,7 +7,7 @@
.is-confidential {
color: $orange-600;
background-color: $orange-50;
background-color: $orange-100;
border-radius: $border-radius-default;
padding: 5px;
margin: 0 3px 0 -4px;
......@@ -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/merge_conflicts.scss
View file @ cee2ecf5
......@@ -255,7 +255,7 @@ $colors: (
&.saved {
.editor {
border-top: solid 2px $green-200;
border-top: solid 2px $green-300;
}
}
......
app/assets/stylesheets/pages/note_form.scss
View file @ cee2ecf5
......@@ -103,7 +103,7 @@
.confidential-issue-warning {
color: $orange-600;
background-color: $orange-50;
background-color: $orange-100;
border-radius: $border-radius-default $border-radius-default 0 0;
border: 1px solid $border-gray-normal;
border-bottom: none;
......
app/assets/stylesheets/pages/pipelines.scss
View file @ cee2ecf5
......@@ -674,20 +674,20 @@ a.linked-pipeline-mini-item {
// Dropdown button animation in mini pipeline graph
&.ci-status-icon-success {
@include mini-pipeline-graph-color($green-50, $green-500, $green-600);
@include mini-pipeline-graph-color($green-100, $green-500, $green-600);
}
&.ci-status-icon-failed {
@include mini-pipeline-graph-color($red-50, $red-500, $red-600);
@include mini-pipeline-graph-color($red-100, $red-500, $red-600);
}
&.ci-status-icon-pending,
&.ci-status-icon-success_with_warnings {
@include mini-pipeline-graph-color($orange-50, $orange-500, $orange-600);
@include mini-pipeline-graph-color($orange-100, $orange-500, $orange-600);
}
&.ci-status-icon-running {
@include mini-pipeline-graph-color($blue-50, $blue-400, $blue-600);
@include mini-pipeline-graph-color($blue-100, $blue-400, $blue-600);
}
&.ci-status-icon-canceled,
......
app/assets/stylesheets/pages/profile.scss
View file @ cee2ecf5
......@@ -292,7 +292,7 @@ table.u2f-registrations {
padding: 32px;
border: 1px solid $blue-300;
border-radius: $border-radius-default;
background-color: $blue-25;
background-color: $blue-50;
position: relative;
display: flex;
justify-content: center;
......@@ -376,7 +376,7 @@ table.u2f-registrations {
.nav-wip {
border: 1px solid $blue-500;
background: $blue-25;
background: $blue-50;
padding: $gl-padding;
margin-bottom: $gl-padding;
......
app/assets/stylesheets/pages/repo.scss
View file @ cee2ecf5
......@@ -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/status.scss
View file @ cee2ecf5
......@@ -18,7 +18,7 @@
}
&.ci-failed {
@include status-color($red-50, $red-500, $red-600);
@include status-color($red-100, $red-500, $red-600);
}
&.ci-success {
......@@ -39,12 +39,12 @@
&.ci-pending,
&.ci-failed_with_warnings,
&.ci-success_with_warnings {
@include status-color($orange-50, $orange-500, $orange-700);
@include status-color($orange-100, $orange-500, $orange-700);
}
&.ci-info,
&.ci-running {
@include status-color($blue-50, $blue-500, $blue-600);
@include status-color($blue-100, $blue-500, $blue-600);
}
&.ci-created,
......
app/assets/stylesheets/test.scss
View file @ cee2ecf5
......@@ -15,3 +15,9 @@
-ms-animation: none !important;
animation: none !important;
}
// Disable sticky changes bar for tests
.diff-files-changed {
position: relative !important;
top: 0 !important;
}
app/controllers/admin/applications_controller.rb
View file @ cee2ecf5
class Admin::ApplicationsController < Admin::ApplicationController
include OauthApplications
prepend EE::Admin::ApplicationsController
before_action :set_application, only: [:show, :edit, :update, :destroy]
before_action :load_scopes, only: [:new, :create, :edit, :update]
......@@ -22,8 +23,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 +42,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 @ cee2ecf5
......@@ -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
......@@ -226,7 +226,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/concerns/oauth_applications.rb
View file @ cee2ecf5
module OauthApplications
extend ActiveSupport::Concern
prepend ::EE::Concerns::OauthApplications
included do
before_action :prepare_scopes, only: [:create, :update]
......
app/controllers/confirmations_controller.rb
View file @ cee2ecf5
class ConfirmationsController < Devise::ConfirmationsController
prepend ::EE::ConfirmationsController
def almost_there
flash[:notice] = nil
render layout: "devise_empty"
......@@ -12,10 +14,14 @@ 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
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/groups/ldap_group_links_controller.rb
View file @ cee2ecf5
......@@ -43,6 +43,6 @@ class Groups::LdapGroupLinksController < Groups::ApplicationController
end
def ldap_group_link_params
params.require(:ldap_group_link).permit(:cn, :group_access, :provider)
params.require(:ldap_group_link).permit(:cn, :filter, :group_access, :provider)
end
end
app/controllers/oauth/applications_controller.rb
View file @ cee2ecf5
......@@ -3,6 +3,7 @@ class Oauth::ApplicationsController < Doorkeeper::ApplicationsController
include Gitlab::GonHelper
include PageLayoutHelper
include OauthApplications
prepend ::EE::Oauth::ApplicationsController
before_action :verify_user_oauth_applications_enabled
before_action :authenticate_user!
......@@ -21,14 +22,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/passwords_controller.rb
View file @ cee2ecf5
......@@ -3,6 +3,8 @@ class PasswordsController < Devise::PasswordsController
before_action :prevent_ldap_reset, only: [:create]
before_action :throttle_reset, only: [:create]
prepend EE::PasswordsController
def edit
super
reset_password_token = Devise.token_generator.digest(
......
app/controllers/profiles/avatars_controller.rb
View file @ cee2ecf5
......@@ -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 @ cee2ecf5
......@@ -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 @ cee2ecf5
class Profiles::KeysController < Profiles::ApplicationController
prepend ::EE::Profiles::KeysController
skip_before_action :authenticate_user!, only: [:get_keys]
def index
......@@ -14,7 +16,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 +52,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 @ cee2ecf5
......@@ -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 @ cee2ecf5
......@@ -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 @ cee2ecf5
......@@ -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 @ cee2ecf5
......@@ -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 @ cee2ecf5
......@@ -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/sessions_controller.rb
View file @ cee2ecf5
......@@ -57,7 +57,7 @@ class SessionsController < Devise::SessionsController
return unless user && user.require_password_creation?
Users::UpdateService.new(user).execute do |user|
Users::UpdateService.new(current_user, user: user).execute do |user|
@token = user.generate_reset_token
end
......
app/helpers/avatars_helper.rb
View file @ cee2ecf5
......@@ -13,22 +13,29 @@ module AvatarsHelper
user_name = options[:user].try(:name) || options[:user_name]
avatar_url = options[:url] || avatar_icon(options[:user] || options[:user_email], avatar_size)
has_tooltip = options[:has_tooltip].nil? ? true : options[:has_tooltip]
data_attributes = {}
data_attributes = options[:data] || {}
css_class = %W[avatar s#{avatar_size}].push(*options[:css_class])
if has_tooltip
css_class.push('has-tooltip')
data_attributes = { container: 'body' }
data_attributes[:container] = 'body'
end
image_tag(
avatar_url,
class: css_class,
if options[:lazy]
css_class << 'lazy'
data_attributes[:src] = avatar_url
avatar_url = LazyImageTagHelper.placeholder_image
end
image_options = {
alt: "#{user_name}'s avatar",
title: user_name,
src: avatar_url,
data: data_attributes,
lazy: true
)
class: css_class,
title: user_name
}
tag(:img, image_options)
end
def user_avatar(options = {})
......
app/helpers/boards_helper.rb
View file @ cee2ecf5
......@@ -81,6 +81,6 @@ module BoardsHelper
end
def boards_link_text
_("Board")
s_("IssueBoards|Board")
end
end
app/helpers/projects_helper.rb
View file @ cee2ecf5
......@@ -239,8 +239,8 @@ module ProjectsHelper
end
end
def has_projects_or_name?(projects, params)
!!(params[:name] || any_projects?(projects))
def show_projects?(projects, params)
!!(params[:personal] || params[:name] || any_projects?(projects))
end
private
......
app/helpers/sorting_helper.rb
View file @ cee2ecf5
......@@ -110,6 +110,10 @@ module SortingHelper
s_('SortOptions|Due date')
end
def sort_title_less_weight
s_('SortOptions|Less weight')
end
def sort_title_due_date_later
s_('SortOptions|Due later')
end
......@@ -126,6 +130,10 @@ module SortingHelper
s_('SortOptions|Largest group')
end
def sort_title_more_weight
s_('SortOptions|More weight')
end
def sort_title_largest_repo
s_('SortOptions|Largest repository')
end
......@@ -138,10 +146,6 @@ module SortingHelper
s_('SortOptions|Last updated')
end
def sort_title_less_weight
s_('SortOptions|Less weight')
end
def sort_title_milestone
s_('SortOptions|Milestone')
end
......@@ -154,10 +158,6 @@ module SortingHelper
s_('SortOptions|Milestone due soon')
end
def sort_title_more_weight
s_('SortOptions|More weight')
end
def sort_title_name
s_('SortOptions|Name')
end
......@@ -178,6 +178,10 @@ module SortingHelper
s_('SortOptions|Oldest created')
end
def sort_title_weight
s_('SortOptions|Weight')
end
def sort_title_oldest_joined
s_('SortOptions|Oldest joined')
end
......@@ -222,10 +226,6 @@ module SortingHelper
s_('SortOptions|Most popular')
end
def sort_title_weight
s_('SortOptions|Weight')
end
# Values.
def sort_value_access_level_asc
'access_level_asc'
......
app/models/ci/pipeline.rb
View file @ cee2ecf5
......@@ -447,7 +447,7 @@ module Ci
def update_duration
return unless started_at
self.duration = Gitlab::Ci::PipelineDuration.from_pipeline(self)
self.duration = Gitlab::Ci::Pipeline::Duration.from_pipeline(self)
end
def execute_hooks
......
app/models/ci/runner.rb
View file @ cee2ecf5
......@@ -175,7 +175,7 @@ module Ci
end
def assignable_for?(project)
!locked? || projects.exists?(id: project.id)
is_shared? || projects.exists?(id: project.id)
end
def accepting_tags?(build)
......
app/models/commit.rb
View file @ cee2ecf5
......@@ -25,8 +25,8 @@ class Commit
DIFF_HARD_LIMIT_FILES = 1000
DIFF_HARD_LIMIT_LINES = 50000
# The SHA can be between 7 and 40 hex characters.
COMMIT_SHA_PATTERN = '\h{7,40}'.freeze
MIN_SHA_LENGTH = 7
COMMIT_SHA_PATTERN = /\h{#{MIN_SHA_LENGTH},40}/.freeze
def banzai_render_context(field)
context = { pipeline: :single_line, project: self.project }
......@@ -53,7 +53,7 @@ class Commit
# Truncate sha to 8 characters
def truncate_sha(sha)
sha[0..7]
sha[0..MIN_SHA_LENGTH]
end
def max_diff_options
......@@ -100,7 +100,7 @@ class Commit
def self.reference_pattern
@reference_pattern ||= %r{
(?:#{Project.reference_pattern}#{reference_prefix})?
(?<commit>\h{7,40})
(?<commit>#{COMMIT_SHA_PATTERN})
}x
end
......@@ -216,9 +216,8 @@ class Commit
@raw.respond_to?(method, include_private) || super
end
# Truncate sha to 8 characters
def short_id
@raw.short_id(7)
@raw.short_id(MIN_SHA_LENGTH)
end
def diff_refs
......
app/models/group.rb
View file @ cee2ecf5
......@@ -230,12 +230,20 @@ class Group < Namespace
ldap_group_links.first.try(:cn)
end
def ldap_filter
ldap_group_links.first.try(:filter)
end
def ldap_access
ldap_group_links.first.try(:group_access)
end
def ldap_cn_or_filter_present?
ldap_cn.present? || ldap_filter.present?
end
def ldap_synced?
Gitlab.config.ldap.enabled && ldap_cn.present?
Gitlab.config.ldap.enabled && ldap_cn_or_filter_present?
end
def post_create_hook
......
app/models/ldap_group_link.rb
View file @ cee2ecf5
......@@ -2,13 +2,28 @@ class LdapGroupLink < ActiveRecord::Base
include Gitlab::Access
belongs_to :group
validates :cn, :group_access, :group_id, presence: true
validates :cn, uniqueness: { scope: [:group_id, :provider] }
BLANK_ATTRIBUTES = %w[cn filter].freeze
with_options if: :cn do |link|
link.validates :cn, uniqueness: { scope: [:group_id, :provider] }
link.validates :cn, presence: true
link.validates :filter, absence: true
end
with_options if: :filter do |link|
link.validates :filter, uniqueness: { scope: [:group_id, :provider] }
link.validates :filter, ldap_filter: true, presence: true
link.validates :cn, absence: true
end
validates :group_access, :group_id, presence: true
validates :group_access, inclusion: { in: Gitlab::Access.all_values }
validates :provider, presence: true
scope :with_provider, ->(provider) { where(provider: provider) }
before_validation :nullify_blank_attributes
def access_field
group_access
end
......@@ -27,4 +42,10 @@ class LdapGroupLink < ActiveRecord::Base
def provider_label
config.label
end
private
def nullify_blank_attributes
BLANK_ATTRIBUTES.each { |attr| self[attr] = nil if self[attr].blank? }
end
end
app/models/license.rb
View file @ cee2ecf5
......@@ -37,6 +37,7 @@ class License < ActiveRecord::Base
cross_project_pipelines
db_load_balancing
deploy_board
extended_audit_events
file_locks
geo
group_issue_boards
......@@ -105,6 +106,7 @@ class License < ActiveRecord::Base
auditor_user
db_load_balancing
elastic_search
extended_audit_events
geo
ldap_extras
object_storage
......
app/models/project.rb
View file @ cee2ecf5
......@@ -249,6 +249,9 @@ class Project < ActiveRecord::Base
scope :pending_delete, -> { where(pending_delete: true) }
scope :without_deleted, -> { where(pending_delete: false) }
scope :with_hashed_storage, -> { where('storage_version >= 1') }
scope :with_legacy_storage, -> { where(storage_version: [nil, 0]) }
scope :sorted_by_activity, -> { reorder(last_activity_at: :desc) }
scope :sorted_by_stars, -> { reorder('projects.star_count DESC') }
......@@ -1550,13 +1553,37 @@ class Project < ActiveRecord::Base
end
def legacy_storage?
self.storage_version.nil?
[nil, 0].include?(self.storage_version)
end
def hashed_storage?
self.storage_version && self.storage_version >= 1
end
def renamed?
persisted? && path_changed?
end
def migrate_to_hashed_storage!
return if hashed_storage?
update!(repository_read_only: true)
if repo_reference_count > 0 || wiki_reference_count > 0
ProjectMigrateHashedStorageWorker.perform_in(Gitlab::ReferenceCounter::REFERENCE_EXPIRE_TIME, id)
else
ProjectMigrateHashedStorageWorker.perform_async(id)
end
end
def storage_version=(value)
super
@storage = nil if storage_version_changed?
end
def gl_repository(is_wiki:)
Gitlab::GlRepository.gl_repository(self, is_wiki)
def merge_method
if self.merge_requests_ff_only_enabled
:ff
......@@ -1589,7 +1616,7 @@ class Project < ActiveRecord::Base
def storage
@storage ||=
if self.storage_version && self.storage_version >= 1
if hashed_storage?
Storage::HashedProject.new(self)
else
Storage::LegacyProject.new(self)
......@@ -1602,6 +1629,14 @@ class Project < ActiveRecord::Base
end
end
def repo_reference_count
Gitlab::ReferenceCounter.new(gl_repository(is_wiki: false)).value
end
def wiki_reference_count
Gitlab::ReferenceCounter.new(gl_repository(is_wiki: true)).value
end
# set last_activity_at to the same as created_at
def set_last_activity_at
update_column(:last_activity_at, self.created_at)
......
app/models/repository.rb
View file @ cee2ecf5
......@@ -541,10 +541,13 @@ class Repository
cache_method :tag_count, fallback: 0
def avatar
# n+1: https://gitlab.com/gitlab-org/gitlab-ce/issues/38327
Gitlab::GitalyClient.allow_n_plus_1_calls do
if tree = file_on_head(:avatar)
tree.path
end
end
end
cache_method :avatar
def readme
......
app/models/storage/hashed_project.rb
View file @ cee2ecf5
......@@ -4,6 +4,7 @@ module Storage
delegate :gitlab_shell, :repository_storage_path, to: :project
ROOT_PATH_PREFIX = '@hashed'.freeze
STORAGE_VERSION = 1
def initialize(project)
@project = project
......
app/models/user.rb
View file @ cee2ecf5
......@@ -63,7 +63,7 @@ class User < ActiveRecord::Base
lease = Gitlab::ExclusiveLease.new("user_update_tracked_fields:#{id}", timeout: 1.hour.to_i)
return unless lease.try_obtain
Users::UpdateService.new(self).execute(validate: false)
Users::UpdateService.new(self, user: self).execute(validate: false)
end
attr_accessor :force_random_password
......@@ -545,8 +545,8 @@ class User < ActiveRecord::Base
def update_emails_with_primary_email
primary_email_record = emails.find_by(email: email)
if primary_email_record
Emails::DestroyService.new(self, email: email).execute
Emails::CreateService.new(self, email: email_was).execute
Emails::DestroyService.new(self, user: self, email: email).execute
Emails::CreateService.new(self, user: self, email: email_was).execute
end
end
......@@ -1023,7 +1023,7 @@ class User < ActiveRecord::Base
if attempts_exceeded?
lock_access! unless access_locked?
else
Users::UpdateService.new(self).execute(validate: false)
Users::UpdateService.new(self, user: self).execute(validate: false)
end
end
......@@ -1209,7 +1209,7 @@ class User < ActiveRecord::Base
&creation_block
)
Users::UpdateService.new(user).execute(validate: false)
Users::UpdateService.new(user, user: user).execute(validate: false)
user
ensure
Gitlab::ExclusiveLease.cancel(lease_key, uuid)
......
app/services/ci/create_pipeline_service.rb
View file @ cee2ecf5
......@@ -2,114 +2,57 @@ module Ci
class CreatePipelineService < BaseService
attr_reader :pipeline
def execute(source, ignore_skip_ci: false, save_on_errors: true, trigger_request: nil, schedule: nil, mirror_update: false)
SEQUENCE = [Gitlab::Ci::Pipeline::Chain::Validate::Abilities,
Gitlab::Ci::Pipeline::Chain::Validate::Repository,
Gitlab::Ci::Pipeline::Chain::Validate::Config,
Gitlab::Ci::Pipeline::Chain::Skip,
Gitlab::Ci::Pipeline::Chain::Create].freeze
def execute(source, ignore_skip_ci: false, save_on_errors: true, trigger_request: nil, schedule: nil, mirror_update: false, &block)
@pipeline = Ci::Pipeline.new(
source: source,
project: project,
ref: ref,
sha: sha,
before_sha: before_sha,
tag: tag?,
tag: tag_exists?,
trigger_requests: Array(trigger_request),
user: current_user,
pipeline_schedule: schedule,
protected: project.protected_for?(ref)
)
result = validate_project_and_git_items(mirror_update: mirror_update) ||
validate_pipeline(ignore_skip_ci: ignore_skip_ci,
save_on_errors: save_on_errors)
return result if result
begin
Ci::Pipeline.transaction do
pipeline.save!
yield(pipeline) if block_given?
# VALIDATE mirror_update!
command = OpenStruct.new(ignore_skip_ci: ignore_skip_ci,
save_incompleted: save_on_errors,
allow_mirror_update: mirror_update,
seeds_block: block,
project: project,
current_user: current_user)
Ci::CreatePipelineStagesService
.new(project, current_user)
.execute(pipeline)
end
rescue ActiveRecord::RecordInvalid => e
return error("Failed to persist the pipeline: #{e}")
end
sequence = Gitlab::Ci::Pipeline::Chain::Sequence
.new(pipeline, command, SEQUENCE)
update_merge_requests_head_pipeline
sequence.build! do |pipeline, sequence|
update_merge_requests_head_pipeline if pipeline.persisted?
if sequence.complete?
cancel_pending_pipelines if project.auto_cancel_pending_pipelines?
pipeline_created_counter.increment(source: source)
pipeline.tap(&:process!)
end
private
def validate_project_and_git_items(mirror_update: false)
unless project.builds_enabled?
return error('Pipeline is disabled')
end
if mirror_update && !project.mirror_trigger_builds?
return error('Pipeline is disabled for mirror updates')
end
unless allowed_to_trigger_pipeline?
if can?(current_user, :create_pipeline, project)
return error("Insufficient permissions for protected ref '#{ref}'")
else
return error('Insufficient permissions to create a new pipeline')
end
end
unless branch? || tag?
return error('Reference not found')
end
unless commit
return error('Commit not found')
pipeline.process!
end
end
def validate_pipeline(ignore_skip_ci:, save_on_errors:)
unless pipeline.config_processor
unless pipeline.ci_yaml_file
return error("Missing #{pipeline.ci_yaml_file_path} file")
end
return error(pipeline.yaml_errors, save: save_on_errors)
end
if !ignore_skip_ci && skip_ci?
pipeline.skip if save_on_errors
return pipeline
end
unless pipeline.has_stage_seeds?
return error('No stages / jobs for this pipeline.')
end
end
private
def allowed_to_trigger_pipeline?
if current_user
allowed_to_create?
else # legacy triggers don't have a corresponding user
!project.protected_for?(ref)
end
def commit
@commit ||= project.commit(origin_sha || origin_ref)
end
def allowed_to_create?
return unless can?(current_user, :create_pipeline, project)
access = Gitlab::UserAccess.new(current_user, project: project)
if branch?
access.can_update_branch?(ref)
elsif tag?
access.can_create_tag?(ref)
else
true # Allow it for now and we'll reject when we check ref existence
end
def sha
commit.try(:id)
end
def update_merge_requests_head_pipeline
......@@ -119,11 +62,6 @@ module Ci
.update_all(head_pipeline_id: @pipeline.id)
end
def skip_ci?
return false unless pipeline.git_commit_message
pipeline.git_commit_message =~ /\[(ci[ _-]skip|skip[ _-]ci)\]/i
end
def cancel_pending_pipelines
Gitlab::OptimisticLocking.retry_lock(auto_cancelable_pipelines) do |cancelables|
cancelables.find_each do |cancelable|
......@@ -140,14 +78,6 @@ module Ci
.created_or_pending
end
def commit
@commit ||= project.commit(origin_sha || origin_ref)
end
def sha
commit.try(:id)
end
def before_sha
params[:checkout_sha] || params[:before] || Gitlab::Git::BLANK_SHA
end
......@@ -160,41 +90,17 @@ module Ci
params[:ref]
end
def branch?
return @is_branch if defined?(@is_branch)
@is_branch =
project.repository.ref_exists?(Gitlab::Git::BRANCH_REF_PREFIX + ref)
end
def tag?
return @is_tag if defined?(@is_tag)
@is_tag =
project.repository.ref_exists?(Gitlab::Git::TAG_REF_PREFIX + ref)
def tag_exists?
project.repository.tag_exists?(ref)
end
def ref
@ref ||= Gitlab::Git.ref_name(origin_ref)
end
def valid_sha?
origin_sha && origin_sha != Gitlab::Git::BLANK_SHA
end
def error(message, save: false)
pipeline.tap do
pipeline.errors.add(:base, message)
if save
pipeline.drop
update_merge_requests_head_pipeline
end
end
end
def pipeline_created_counter
@pipeline_created_counter ||= Gitlab::Metrics.counter(:pipelines_created_total, "Counter of pipelines created")
@pipeline_created_counter ||= Gitlab::Metrics
.counter(:pipelines_created_total, "Counter of pipelines created")
end
end
end
app/services/emails/base_service.rb
View file @ cee2ecf5
module Emails
class BaseService
def initialize(user, opts)
@user = user
def initialize(current_user, opts)
@current_user = current_user
@user = opts.delete(:user)
@email = opts[:email]
end
end
......
app/services/emails/create_service.rb
View file @ cee2ecf5
module Emails
class CreateService < ::Emails::BaseService
prepend ::EE::Emails::CreateService
def execute
@user.emails.create(email: @email)
end
......
app/services/emails/destroy_service.rb
View file @ cee2ecf5
module Emails
class DestroyService < ::Emails::BaseService
prepend ::EE::Emails::DestroyService
def execute
Email.find_by_email!(@email).destroy && update_secondary_emails!
update_secondary_emails! if Email.find_by_email!(@email).destroy
end
private
def update_secondary_emails!
result = ::Users::UpdateService.new(@user).execute do |user|
result = ::Users::UpdateService.new(@current_user, user: @user).execute do |user|
user.update_secondary_emails!
end
......
app/services/geo/repository_renamed_event_store.rb
View file @ cee2ecf5
......@@ -10,14 +10,18 @@ module Geo
repository_storage_name: project.repository.storage,
repository_storage_path: project.repository_storage_path,
old_path_with_namespace: old_path_with_namespace,
new_path_with_namespace: project.full_path,
new_path_with_namespace: project.disk_path,
old_wiki_path_with_namespace: old_wiki_path_with_namespace,
new_wiki_path_with_namespace: new_wiki_path_with_namespace,
old_path: params.fetch(:old_path),
old_path: old_path,
new_path: project.path
)
end
def old_path
params.fetch(:old_path)
end
def old_path_with_namespace
params.fetch(:old_path_with_namespace)
end
......@@ -27,7 +31,7 @@ module Geo
end
def new_wiki_path_with_namespace
project.wiki.full_path
"#{project.disk_path}.wiki"
end
end
end
app/services/merge_requests/merge_service.rb
View file @ cee2ecf5
......@@ -19,7 +19,7 @@ module MergeRequests
@merge_request = merge_request
unless @merge_request.mergeable?
return log_merge_error('Merge request is not mergeable', save_message_on_model: true)
return handle_merge_error(log_message: 'Merge request is not mergeable', save_message_on_model: true)
end
check_size_limit
......@@ -27,7 +27,7 @@ module MergeRequests
@source = find_merge_source
unless @source
return log_merge_error('No source for merge', save_message_on_model: true)
return handle_merge_error(log_message: 'No source for merge', save_message_on_model: true)
end
merge_request.in_locked_state do
......@@ -38,8 +38,7 @@ module MergeRequests
end
end
rescue MergeError => e
clean_merge_jid
log_merge_error(e.message, save_message_on_model: true)
handle_merge_error(log_message: e.message, save_message_on_model: true)
end
def hooks_validation_pass?(merge_request)
......@@ -52,12 +51,12 @@ module MergeRequests
return true unless push_rule
unless push_rule.commit_message_allowed?(params[:commit_message])
log_merge_error("Commit message does not follow the pattern '#{push_rule.commit_message_regex}'", save_message_on_model: true)
handle_merge_error(log_message: "Commit message does not follow the pattern '#{push_rule.commit_message_regex}'", save_message_on_model: true)
return false
end
unless push_rule.author_email_allowed?(current_user.email)
log_merge_error("Commit author's email '#{current_user.email}' does not follow the pattern '#{push_rule.author_email_regex}'", save_message_on_model: true)
handle_merge_error(log_message: "Commit author's email '#{current_user.email}' does not follow the pattern '#{push_rule.author_email_regex}'", save_message_on_model: true)
return false
end
......@@ -103,10 +102,16 @@ module MergeRequests
@merge_request.force_remove_source_branch? ? @merge_request.author : current_user
end
def log_merge_error(message, save_message_on_model: false)
Rails.logger.error("MergeService ERROR: #{merge_request_info} - #{message}")
# Logs merge error message and cleans `MergeRequest#merge_jid`.
#
def handle_merge_error(log_message:, save_message_on_model: false)
Rails.logger.error("MergeService ERROR: #{merge_request_info} - #{log_message}")
@merge_request.update(merge_error: message) if save_message_on_model
if save_message_on_model
@merge_request.update(merge_error: log_message, merge_jid: nil)
else
clean_merge_jid
end
end
def merge_request_info
......
app/services/projects/hashed_storage_migration_service.rb 0 → 100644
View file @ cee2ecf5
module Projects
class HashedStorageMigrationService < BaseService
include Gitlab::ShellAdapter
prepend ::EE::Projects::HashedStorageMigrationService
attr_reader :old_disk_path, :new_disk_path
def initialize(project, logger = nil)
@project = project
@logger ||= Rails.logger
end
def execute
return if project.hashed_storage?
@old_disk_path = project.disk_path
has_wiki = project.wiki.repository_exists?
project.storage_version = Storage::HashedProject::STORAGE_VERSION
project.ensure_storage_path_exists
@new_disk_path = project.disk_path
result = move_repository(@old_disk_path, @new_disk_path)
if has_wiki
result &&= move_repository("#{@old_disk_path}.wiki", "#{@new_disk_path}.wiki")
end
unless result
rollback_folder_move
return
end
project.repository_read_only = false
project.save!
block_given? ? yield : result
end
private
def move_repository(from_name, to_name)
from_exists = gitlab_shell.exists?(project.repository_storage_path, "#{from_name}.git")
to_exists = gitlab_shell.exists?(project.repository_storage_path, "#{to_name}.git")
# If we don't find the repository on either original or target we should log that as it could be an issue if the
# project was not originally empty.
if !from_exists && !to_exists
logger.warn "Can't find a repository on either source or target paths for #{project.full_path} (ID=#{project.id}) ..."
return false
elsif !from_exists
# Repository have been moved already.
return true
end
gitlab_shell.mv_repository(project.repository_storage_path, from_name, to_name)
end
def rollback_folder_move
move_repository(@new_disk_path, @old_disk_path)
move_repository("#{@new_disk_path}.wiki", "#{@old_disk_path}.wiki")
end
def logger
@logger
end
end
end
app/services/users/update_service.rb
View file @ cee2ecf5
module Users
class UpdateService < BaseService
include NewUserNotifier
prepend EE::Users::UpdateService
def initialize(user, params = {})
@user = user
def initialize(current_user, params = {})
@current_user = current_user
@user = params.delete(:user)
@params = params.dup
end
......@@ -15,9 +17,7 @@ module Users
user_exists = @user.persisted?
if @user.save(validate: validate)
notify_new_user(@user, nil) unless user_exists
success
notify_success(user_exists)
else
error(@user.errors.full_messages.uniq.join('. '))
end
......@@ -31,6 +31,14 @@ module Users
true
end
protected
def notify_success(user_exists)
notify_new_user(@user, nil) unless user_exists
success
end
private
def assign_attributes(&block)
......
app/validators/ldap_filter_validator.rb 0 → 100644
View file @ cee2ecf5
# LdapFilteralidator
#
# Custom validator for LDAP filters
#
# Example:
#
# class LdapGroupLink < ActiveRecord::Base
# validates :filter, ldap_filter: true
# end
#
class LdapFilterValidator < ActiveModel::EachValidator
def validate_each(record, attribute, value)
Net::LDAP::Filter::FilterParser.parse(value)
rescue Net::LDAP::FilterSyntaxInvalidError
record.errors.add(attribute, 'must be a valid filter')
end
end
app/views/admin/groups/_form.html.haml
View file @ cee2ecf5
......@@ -37,6 +37,6 @@
= link_to 'Cancel', admin_group_path(@group), class: "btn btn-cancel"
- if ldap_enabled? && @group.persisted?
%h3.page-title Linked LDAP groups
%h3.page-title LDAP synchronizations
= render 'ldap_group_links/form', group: @group
= render 'ldap_group_links/ldap_group_links', group: @group
app/views/admin/groups/show.html.haml
View file @ cee2ecf5
......@@ -63,13 +63,12 @@
= render partial: "namespaces/shared_runner_status", locals: { namespace: @group }
.panel.panel-default
.panel-heading Linked LDAP groups
.panel-heading Active synchronizations
%ul.well-list
- if @group.ldap_group_links.any?
- @group.ldap_group_links.each do |ldap_group_link|
%li
cn:
%strong= ldap_group_link.cn
%strong= ldap_group_link.cn ? "Group: #{ldap_group_link.cn}" : "Filter: #{truncate(ldap_group_link.filter, length: 40)}"
as
%strong= ldap_group_link.human_access
......
app/views/dashboard/projects/_nav.html.haml 0 → 100644
View file @ cee2ecf5
.top-area
%ul.nav-links
= nav_link(html_options: { class: ("active" unless params[:personal].present?) }) do
= link_to s_('DashboardProjects|All'), dashboard_projects_path
= nav_link(html_options: { class: ("active" if params[:personal].present?) }) do
= link_to s_('DashboardProjects|Personal'), filter_projects_path(personal: true)
app/views/dashboard/projects/index.html.haml
View file @ cee2ecf5
......@@ -10,8 +10,9 @@
= render "projects/last_push"
%div{ class: container_class }
- if has_projects_or_name?(@projects, params)
- if show_projects?(@projects, params)
= render 'dashboard/projects_head'
= render 'nav'
= render 'projects'
- else
= render "zero_authorized_projects"
app/views/groups/group_members/_ldap_sync.html.haml
View file @ cee2ecf5
......@@ -5,8 +5,8 @@
%ul
- @group.ldap_group_links.each do |ldap_group_link|
%li
People in cn
%code= ldap_group_link.cn
People in
%code= ldap_group_link.cn ? "cn: #{ldap_group_link.cn}" : "filter: #{truncate(ldap_group_link.filter, length: 70)}"
are given
%code= ldap_group_link.human_access
access.
......
app/views/groups/ldap_group_links/index.html.haml
View file @ cee2ecf5
- page_title "LDAP Groups"
%h3.page-title Linked LDAP groups
- page_title 'LDAP Syncrhonizations'
%h3.page-title LDAP synchronizations
= render 'ldap_group_links/form', group: @group
= render 'ldap_group_links/ldap_group_links', group: @group
app/views/ldap_group_links/_form.html.haml
View file @ cee2ecf5
- content_for :page_specific_javascripts do
= webpack_bundle_tag 'ldap_group_links'
%section.ldap-group-links
= form_for [group, LdapGroupLink.new], html: { class: 'form-horizontal' } do |f|
.form-holder
.form-group.clearfix
= f.label :cn, class: 'control-label' do
.form-group.row
= f.label :cn, class: 'control-label col-sm-2' do
LDAP Server
.col-sm-10
= f.select :provider, ldap_server_select_options, {}, class: 'form-control'
.form-group.clearfix
= f.label :cn, class: 'control-label' do
.form-group.row
= f.label :cn, class: 'control-label col-sm-2' do
Sync method
.col-sm-10
.radio
= label_tag :sync_method_group do
= radio_button_tag :sync_method, :group, true
LDAP Group cn
.radio
= label_tag :sync_method_filter do
= radio_button_tag :sync_method, :filter
LDAP user filter
.form-group.row.cn-link
= f.label :cn, class: 'control-label col-sm-2' do
LDAP Group cn
.col-sm-10
= f.hidden_field :cn, placeholder: "Ex. QA group", class: "xxlarge ajax-ldap-groups-select input-mn-300"
= f.hidden_field :cn, placeholder: 'Ex. QA group', class: 'xxlarge ajax-ldap-groups-select input-mn-300'
.help-block
Synchronize #{group.name}'s members with this LDAP group.
%br
If you select an LDAP group you do not belong to you will lose ownership of #{group.name}.
.form-group.clearfix
= f.label :group_access, class: 'control-label' do
.form-group.row.filter-link
= f.label :filter, class: 'control-label col-sm-2' do
LDAP User filter
.col-sm-10
= f.text_field :filter, placeholder: 'Ex. (&(objectCategory=person)(objectClass=developer))', class: 'form-control xxlarge input-mn-300'
.help-block
- ldap_link = link_to 'LDAP Search Filter Syntax', 'https://msdn.microsoft.com/en-us/library/aa746475(v=vs.85).aspx'
This query must use valid #{ldap_link}. Synchronize #{group.name}'s members with this LDAP user filter.
%br
If you do not belong to this LDAP user filter you will lose ownership of #{group.name}.
.form-group.row
= f.label :group_access, class: 'control-label col-sm-2' do
LDAP Access
.col-sm-10
= f.select :group_access, options_for_select(GroupMember.access_level_roles), {}, class: 'form-control'
......@@ -27,4 +54,4 @@
You can manage permission levels for individual group members in the Members tab.
.form-actions
= f.submit 'Add synchronization', class: "btn btn-create"
= f.submit 'Add synchronization', class: 'btn btn-create'
app/views/ldap_group_links/_ldap_group_link.html.haml
View file @ cee2ecf5
%li
.pull-right
= link_to group_ldap_group_link_path(group, ldap_group_link), method: :delete, class: 'btn btn-danger btn-sm' do
= fa_icon('unlink', text: 'unlink')
%strong= ldap_group_link.cn
= fa_icon('unlink', text: 'Remove')
%strong= ldap_group_link.cn ? "Group: #{ldap_group_link.cn}" : "Filter: #{truncate(ldap_group_link.filter, length: 70)}"
- if ldap_group_link.config
.light
......
app/views/projects/notes/_actions.html.haml
View file @ cee2ecf5
This diff is collapsed.
app/views/shared/boards/_show.html.haml
View file @ cee2ecf5
This diff is collapsed.
app/views/shared/boards/_switcher.html.haml
View file @ cee2ecf5
This diff is collapsed.
app/views/shared/icons/_icon_status_canceled.svg 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
app/views/shared/icons/_icon_status_created.svg 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
app/views/shared/icons/_icon_status_failed.svg 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
app/views/shared/icons/_icon_status_manual.svg 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
app/views/shared/icons/_icon_status_pending.svg 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
app/views/shared/icons/_icon_status_running.svg 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
app/views/shared/icons/_icon_status_skipped.svg 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
app/views/shared/icons/_icon_status_success.svg 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
app/views/shared/icons/_icon_status_warning.svg 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
app/workers/project_migrate_hashed_storage_worker.rb 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
app/workers/storage_migrator_worker.rb 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
changelogs/unreleased-ee/feature-ldap-group-filter.yml 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
changelogs/unreleased-ee/service-desk-permissions.yml 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
changelogs/unreleased/34371-cycle-analitcs-global.yml 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
changelogs/unreleased/3523-i18n-autodevops.yml 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
changelogs/unreleased/35942-api-binary-encoding.yaml deleted 100644 → 0
View file @ 7d21d203
This diff is collapsed.
changelogs/unreleased/breadcrumbs-line-height-padding.yml 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
changelogs/unreleased/dm-bitbucket-import-truncated-shas.yml 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
changelogs/unreleased/dm-simple-project-avatar-url.yml 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
changelogs/unreleased/hashed-storage-migration-path.yml 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
changelogs/unreleased/lint-changelog-yaml.yml 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
changelogs/unreleased/project-page-clearer.yml 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
changelogs/unreleased/remove-temporary-ci-index.yml 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
changelogs/unreleased/repository-name-emojis deleted 100644 → 0
View file @ 7d21d203
This diff is collapsed.
config/sidekiq_queues.yml
View file @ cee2ecf5
This diff is collapsed.
config/webpack.config.js
View file @ cee2ecf5
This diff is collapsed.
db/migrate/20170911134018_add_filter_to_ldap_group_links.rb 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
db/migrate/20170919211300_remove_temporary_ci_builds_index.rb 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
db/schema.rb
View file @ cee2ecf5
This diff is collapsed.
doc/README.md
View file @ cee2ecf5
This diff is collapsed.
doc/administration/auth/ldap-ee.md
View file @ cee2ecf5
This diff is collapsed.
doc/administration/high_availability/consul.md 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
doc/administration/raketasks/storage.md 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
doc/administration/repository_storage_types.md 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
doc/api/commits.md
View file @ cee2ecf5
This diff is collapsed.
doc/ci/yaml/README.md
View file @ cee2ecf5
This diff is collapsed.
doc/development/README.md
View file @ cee2ecf5
This diff is collapsed.
doc/development/background_migrations.md
View file @ cee2ecf5
This diff is collapsed.
doc/development/fe_guide/index.md
View file @ cee2ecf5
This diff is collapsed.
doc/development/gitaly.md 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
doc/development/licensing.md
View file @ cee2ecf5
This diff is collapsed.
doc/development/testing.md
View file @ cee2ecf5
This diff is collapsed.
doc/gitlab-geo/README.md
View file @ cee2ecf5
This diff is collapsed.
doc/gitlab-geo/configuration.md
View file @ cee2ecf5
This diff is collapsed.
doc/gitlab-geo/configuration_source.md
View file @ cee2ecf5
This diff is collapsed.
doc/gitlab-geo/img/hashed-storage.png 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
doc/install/kubernetes/gitlab_omnibus.md
View file @ cee2ecf5
This diff is collapsed.
doc/integration/azure.md
View file @ cee2ecf5
This diff is collapsed.
doc/topics/autodevops/index.md
View file @ cee2ecf5
This diff is collapsed.
doc/university/training/gitlab_flow.md 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
doc/university/training/index.md 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
doc/university/training/topics/additional_resources.md 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
doc/university/training/topics/agile_git.md 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
doc/university/training/topics/bisect.md 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
doc/university/training/topics/cherry_picking.md 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
doc/university/training/topics/env_setup.md 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
doc/university/training/topics/explore_gitlab.md 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
doc/university/training/topics/feature_branching.md 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
doc/university/training/topics/getting_started.md 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
doc/university/training/topics/git_add.md 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
doc/university/training/topics/git_intro.md 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
doc/university/training/topics/git_log.md 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
doc/university/training/topics/gitlab_flow.md 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
doc/university/training/topics/merge_conflicts.md 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
doc/university/training/topics/merge_requests.md 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
doc/university/training/topics/rollback_commits.md 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
doc/university/training/topics/stash.md 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
doc/university/training/topics/subtree.md 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
doc/university/training/topics/tags.md 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
doc/university/training/topics/unstage.md 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
doc/university/training/user_training.md 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
doc/user/project/integrations/img/webhook_logs.png 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
doc/user/project/integrations/kubernetes.md
View file @ cee2ecf5
This diff is collapsed.
doc/user/project/issue_board.md
View file @ cee2ecf5
This diff is collapsed.
doc/user/project/issues/csv_export.md
View file @ cee2ecf5
This diff is collapsed.
doc/user/project/issues/img/button_close_issue.png 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
doc/user/project/issues/img/closing_and_related_issues.png 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
doc/user/project/issues/img/confidential_issues_create.png 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
doc/user/project/issues/img/confidential_issues_search_guest.png 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
doc/user/project/issues/img/confidential_issues_search_master.png 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
doc/user/project/issues/img/due_dates_create.png 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
doc/user/project/issues/img/due_dates_edit_sidebar.png 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
doc/user/project/issues/img/due_dates_issues_index_page.png 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
doc/user/project/issues/img/due_dates_todos.png 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
doc/user/project/issues/img/issue_board.png 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
doc/user/project/issues/img/issue_template.png 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
doc/user/project/issues/img/mention_in_issue.png 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
doc/user/project/issues/img/mention_in_merge_request.png 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
doc/user/project/issues/img/merge_request_closes_issue.png 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
doc/user/project/issues/img/new_issue.png 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
doc/user/project/issues/img/new_issue_from_issue_board.png 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
doc/user/project/issues/img/new_issue_from_open_issue.png 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
doc/user/project/issues/img/new_issue_from_projects_dashboard.png 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
doc/user/project/issues/img/new_issue_from_tracker_list.png 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
doc/user/project/issues/img/sidebar_confidential_issue.png 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
doc/user/project/issues/img/sidebar_not_confidential_issue.png 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
doc/user/project/repository/img/contributors_graph.png 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
doc/user/project/repository/img/repo_graph.png 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
doc/user/project/settings/img/general_settings.png 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
doc/user/project/settings/img/merge_requests_settings.png 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
doc/user/search/img/issues_any_assignee.png 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
doc/user/search/img/issues_assigned_to_you.png 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
doc/user/search/img/issues_author.png 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
doc/user/search/img/issues_mrs_shortcut.png 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
doc/user/search/img/left_menu_bar.png 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
doc/user/search/img/project_search.png 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
doc/user/search/img/search_issues_board.png 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
doc/user/search/img/sort_projects.png 100755 → 100644
View file @ cee2ecf5
File mode changed from 100755 to 100644
ee/app/controllers/ee/admin/applications_controller.rb 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
ee/app/controllers/ee/concerns/oauth_applications.rb 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
ee/app/controllers/ee/confirmations_controller.rb 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
ee/app/controllers/ee/oauth/applications_controller.rb 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
ee/app/controllers/ee/passwords_controller.rb 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
ee/app/controllers/ee/profiles/keys_controller.rb 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
ee/app/helpers/ee/boards_helper.rb
View file @ cee2ecf5
This diff is collapsed.
ee/app/services/ee/audit_event_service.rb
View file @ cee2ecf5
This diff is collapsed.
ee/app/services/ee/emails/base_service.rb 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
ee/app/services/ee/emails/create_service.rb 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
ee/app/services/ee/emails/destroy_service.rb 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
ee/app/services/ee/users/update_service.rb 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
ee/lib/ee/gitlab/deltas.rb
View file @ cee2ecf5
This diff is collapsed.
ee/lib/ee/gitlab/ldap/sync/group.rb
View file @ cee2ecf5
This diff is collapsed.
ee/lib/ee/gitlab/ldap/sync/groups.rb
View file @ cee2ecf5
This diff is collapsed.
ee/lib/ee/gitlab/ldap/user_filter.rb 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
features/steps/groups.rb
View file @ cee2ecf5
This diff is collapsed.
lib/api/entities.rb
View file @ cee2ecf5
This diff is collapsed.
lib/api/internal.rb
View file @ cee2ecf5
This diff is collapsed.
lib/api/notification_settings.rb
View file @ cee2ecf5
This diff is collapsed.
lib/api/users.rb
View file @ cee2ecf5
This diff is collapsed.
lib/audit/details.rb
View file @ cee2ecf5
This diff is collapsed.
lib/banzai/filter/sanitization_filter.rb
View file @ cee2ecf5
This diff is collapsed.
lib/ee/audit/changes.rb 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
lib/github/client.rb
View file @ cee2ecf5
This diff is collapsed.
lib/github/import.rb
View file @ cee2ecf5
This diff is collapsed.
lib/gitlab/bitbucket_import/importer.rb
View file @ cee2ecf5
This diff is collapsed.
lib/gitlab/checks/change_access.rb
View file @ cee2ecf5
This diff is collapsed.
lib/gitlab/ci/pipeline/chain/base.rb 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
lib/gitlab/ci/pipeline/chain/create.rb 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
lib/gitlab/ci/pipeline/chain/helpers.rb 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
lib/gitlab/ci/pipeline/chain/sequence.rb 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
lib/gitlab/ci/pipeline/chain/skip.rb 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
lib/gitlab/ci/pipeline/chain/validate/abilities.rb 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
lib/gitlab/ci/pipeline/chain/validate/config.rb 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
lib/gitlab/ci/pipeline/chain/validate/repository.rb 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
lib/gitlab/ci/pipeline/duration.rb 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
lib/gitlab/ci/pipeline_duration.rb deleted 100644 → 0
View file @ 7d21d203
This diff is collapsed.
lib/gitlab/diff/diff_refs.rb
View file @ cee2ecf5
This diff is collapsed.
lib/gitlab/diff/position.rb
View file @ cee2ecf5
This diff is collapsed.
lib/gitlab/git/repository.rb
View file @ cee2ecf5
This diff is collapsed.
lib/gitlab/gitaly_client.rb
View file @ cee2ecf5
This diff is collapsed.
lib/gitlab/gitaly_client/commit_service.rb
View file @ cee2ecf5
This diff is collapsed.
lib/gitlab/ldap/access.rb
View file @ cee2ecf5
This diff is collapsed.
lib/gitlab/markdown/pipeline.rb deleted 100644 → 0
View file @ 7d21d203
This diff is collapsed.
lib/gitlab/o_auth/user.rb
View file @ cee2ecf5
This diff is collapsed.
lib/system_check/app/git_version_check.rb
View file @ cee2ecf5
This diff is collapsed.
lib/system_check/app/ruby_version_check.rb
View file @ cee2ecf5
This diff is collapsed.
lib/tasks/gettext.rake
View file @ cee2ecf5
This diff is collapsed.
lib/tasks/gitlab/storage.rake 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
locale/bg/gitlab.po
View file @ cee2ecf5
This diff is collapsed.
locale/de/gitlab.po
View file @ cee2ecf5
This diff is collapsed.
locale/eo/gitlab.po
View file @ cee2ecf5
This diff is collapsed.
locale/es/gitlab.po
View file @ cee2ecf5
This diff is collapsed.
locale/fr/gitlab.po
View file @ cee2ecf5
This diff is collapsed.
locale/gitlab.pot
View file @ cee2ecf5
This diff is collapsed.
locale/it/gitlab.po
View file @ cee2ecf5
This diff is collapsed.
locale/ja/gitlab.po
View file @ cee2ecf5
This diff is collapsed.
locale/ko/gitlab.po
View file @ cee2ecf5
This diff is collapsed.
locale/nl_NL/gitlab.po
View file @ cee2ecf5
This diff is collapsed.
locale/pt_BR/gitlab.po
View file @ cee2ecf5
This diff is collapsed.
locale/ru/gitlab.po
View file @ cee2ecf5
This diff is collapsed.
locale/uk/gitlab.po
View file @ cee2ecf5
This diff is collapsed.
locale/zh_CN/gitlab.po
View file @ cee2ecf5
This diff is collapsed.
locale/zh_HK/gitlab.po
View file @ cee2ecf5
This diff is collapsed.
locale/zh_TW/gitlab.po
View file @ cee2ecf5
This diff is collapsed.
qa/qa/page/admin/menu.rb
View file @ cee2ecf5
This diff is collapsed.
scripts/lint-changelog-yaml 0 → 100755
View file @ cee2ecf5
This diff is collapsed.
scripts/lint-doc.sh
View file @ cee2ecf5
This diff is collapsed.
scripts/static-analysis
View file @ cee2ecf5
This diff is collapsed.
spec/ee/spec/lib/ee/gitlab/deltas_spec.rb
View file @ cee2ecf5
This diff is collapsed.
spec/ee/spec/lib/ee/gitlab/ldap/user_filter_spec.rb 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
spec/factories/groups.rb
View file @ cee2ecf5
This diff is collapsed.
spec/factories/projects.rb
View file @ cee2ecf5
This diff is collapsed.
spec/features/dashboard/projects_spec.rb
View file @ cee2ecf5
This diff is collapsed.
spec/features/groups/ldap_group_links_spec.rb 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
spec/features/login_spec.rb
View file @ cee2ecf5
This diff is collapsed.
spec/fixtures/api/schemas/public_api/v4/pipeline/basic.json 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
spec/helpers/avatars_helper_spec.rb
View file @ cee2ecf5
This diff is collapsed.
spec/helpers/projects_helper_spec.rb
View file @ cee2ecf5
This diff is collapsed.
spec/javascripts/fly_out_nav_spec.js
View file @ cee2ecf5
This diff is collapsed.
spec/javascripts/lib/utils/sticky_spec.js
View file @ cee2ecf5
This diff is collapsed.
spec/javascripts/line_highlighter_spec.js
View file @ cee2ecf5
This diff is collapsed.
spec/javascripts/merge_request_tabs_spec.js
View file @ cee2ecf5
This diff is collapsed.
spec/lib/audit/details_spec.rb
View file @ cee2ecf5
This diff is collapsed.
spec/lib/ee/audit/changes_spec.rb 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
spec/lib/github/client_spec.rb 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
spec/lib/gitlab/ci/pipeline/chain/create_spec.rb 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
spec/lib/gitlab/ci/pipeline/chain/sequence_spec.rb 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
spec/lib/gitlab/ci/pipeline/chain/skip_spec.rb 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
spec/lib/gitlab/ci/pipeline/chain/validate/abilities_spec.rb 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
spec/lib/gitlab/ci/pipeline/chain/validate/config_spec.rb 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
spec/lib/gitlab/ci/pipeline/chain/validate/repository_spec.rb 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
spec/lib/gitlab/diff/diff_refs_spec.rb
View file @ cee2ecf5
This diff is collapsed.
spec/lib/gitlab/diff/position_spec.rb
View file @ cee2ecf5
This diff is collapsed.
spec/lib/gitlab/git/commit_spec.rb
View file @ cee2ecf5
This diff is collapsed.
spec/lib/gitlab/git_access_spec.rb
View file @ cee2ecf5
This diff is collapsed.
spec/lib/system_check/base_check_spec.rb 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
spec/models/ci/runner_spec.rb
View file @ cee2ecf5
This diff is collapsed.
spec/models/ldap_group_link_spec.rb
View file @ cee2ecf5
This diff is collapsed.
spec/models/project_spec.rb
View file @ cee2ecf5
This diff is collapsed.
spec/policies/project_policy_spec.rb
View file @ cee2ecf5
This diff is collapsed.
spec/requests/api/commits_spec.rb
View file @ cee2ecf5
This diff is collapsed.
spec/requests/api/environments_spec.rb
View file @ cee2ecf5
This diff is collapsed.
spec/requests/api/projects_spec.rb
View file @ cee2ecf5
This diff is collapsed.
spec/requests/api/users_spec.rb
View file @ cee2ecf5
This diff is collapsed.
spec/requests/api/v3/projects_spec.rb
View file @ cee2ecf5
This diff is collapsed.
spec/services/audit_event_service_spec.rb
View file @ cee2ecf5
This diff is collapsed.
spec/services/emails/create_service_spec.rb
View file @ cee2ecf5
This diff is collapsed.
spec/services/users/update_service_spec.rb
View file @ cee2ecf5
This diff is collapsed.
spec/spec_helper.rb
View file @ cee2ecf5
This diff is collapsed.
spec/support/test_env.rb
View file @ cee2ecf5
This diff is collapsed.
spec/tasks/gitlab/storage_rake_spec.rb 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
spec/tasks/gitlab/task_helpers_spec.rb
View file @ cee2ecf5
This diff is collapsed.
spec/validators/ldap_filter_validator_spec.rb 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
spec/views/dashboard/projects/_nav.html.haml.rb 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
spec/workers/post_receive_spec.rb
View file @ cee2ecf5
This diff is collapsed.
spec/workers/project_migrate_hashed_storage_worker_spec.rb 0 → 100644
View file @ cee2ecf5
This diff is collapsed.
spec/workers/storage_migrator_worker_spec.rb 0 → 100644
View file @ cee2ecf5
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