Commit 6dd13180 authored by Clement Ho's avatar Clement Ho

Merge branch 'master' into bootstrap4

parents 601c485c 76e276cb
...@@ -855,3 +855,15 @@ gitlab_git_test: ...@@ -855,3 +855,15 @@ gitlab_git_test:
cache: {} cache: {}
script: script:
- spec/support/prepare-gitlab-git-test-for-commit --check-for-changes - spec/support/prepare-gitlab-git-test-for-commit --check-for-changes
no_ee_check:
<<: *dedicated-runner
<<: *except-docs-and-qa
variables:
SETUP_DB: "false"
before_script: []
cache: {}
script:
- scripts/no-ee-check
only:
- //@gitlab-org/gitlab-ce
This diff is collapsed.
...@@ -174,6 +174,9 @@ gem 'httparty', '~> 0.13.3' ...@@ -174,6 +174,9 @@ gem 'httparty', '~> 0.13.3'
# Colored output to console # Colored output to console
gem 'rainbow', '~> 2.2' gem 'rainbow', '~> 2.2'
# Progress bar
gem 'ruby-progressbar'
# GitLab settings # GitLab settings
gem 'settingslogic', '~> 2.0.9' gem 'settingslogic', '~> 2.0.9'
...@@ -293,7 +296,7 @@ group :metrics do ...@@ -293,7 +296,7 @@ group :metrics do
gem 'influxdb', '~> 0.2', require: false gem 'influxdb', '~> 0.2', require: false
# Prometheus # Prometheus
gem 'prometheus-client-mmap', '~> 0.9.2' gem 'prometheus-client-mmap', '~> 0.9.3'
gem 'raindrops', '~> 0.18' gem 'raindrops', '~> 0.18'
end end
......
...@@ -623,7 +623,7 @@ GEM ...@@ -623,7 +623,7 @@ GEM
parser parser
unparser unparser
procto (0.0.3) procto (0.0.3)
prometheus-client-mmap (0.9.2) prometheus-client-mmap (0.9.3)
pry (0.10.4) pry (0.10.4)
coderay (~> 1.1.0) coderay (~> 1.1.0)
method_source (~> 0.8.1) method_source (~> 0.8.1)
...@@ -1108,7 +1108,7 @@ DEPENDENCIES ...@@ -1108,7 +1108,7 @@ DEPENDENCIES
peek-sidekiq (~> 1.0.3) peek-sidekiq (~> 1.0.3)
pg (~> 0.18.2) pg (~> 0.18.2)
premailer-rails (~> 1.9.7) premailer-rails (~> 1.9.7)
prometheus-client-mmap (~> 0.9.2) prometheus-client-mmap (~> 0.9.3)
pry-byebug (~> 3.4.1) pry-byebug (~> 3.4.1)
pry-rails (~> 0.3.4) pry-rails (~> 0.3.4)
rack-attack (~> 4.4.1) rack-attack (~> 4.4.1)
...@@ -1143,6 +1143,7 @@ DEPENDENCIES ...@@ -1143,6 +1143,7 @@ DEPENDENCIES
rubocop-rspec (~> 1.22.1) rubocop-rspec (~> 1.22.1)
ruby-fogbugz (~> 0.2.1) ruby-fogbugz (~> 0.2.1)
ruby-prof (~> 0.17.0) ruby-prof (~> 0.17.0)
ruby-progressbar
ruby_parser (~> 3.8) ruby_parser (~> 3.8)
rufus-scheduler (~> 3.4) rufus-scheduler (~> 3.4)
rugged (~> 0.27) rugged (~> 0.27)
......
10.8.0-pre 11.0.0-pre
...@@ -2,10 +2,7 @@ import $ from 'jquery'; ...@@ -2,10 +2,7 @@ import $ from 'jquery';
import timeago from 'timeago.js'; import timeago from 'timeago.js';
import dateFormat from 'vendor/date.format'; import dateFormat from 'vendor/date.format';
import { pluralize } from './text_utility'; import { pluralize } from './text_utility';
import { import { languageCode, s__ } from '../../locale';
languageCode,
s__,
} from '../../locale';
window.timeago = timeago; window.timeago = timeago;
window.dateFormat = dateFormat; window.dateFormat = dateFormat;
...@@ -17,11 +14,37 @@ window.dateFormat = dateFormat; ...@@ -17,11 +14,37 @@ window.dateFormat = dateFormat;
* *
* @param {Boolean} abbreviated * @param {Boolean} abbreviated
*/ */
const getMonthNames = (abbreviated) => { const getMonthNames = abbreviated => {
if (abbreviated) { if (abbreviated) {
return [s__('Jan'), s__('Feb'), s__('Mar'), s__('Apr'), s__('May'), s__('Jun'), s__('Jul'), s__('Aug'), s__('Sep'), s__('Oct'), s__('Nov'), s__('Dec')]; return [
s__('Jan'),
s__('Feb'),
s__('Mar'),
s__('Apr'),
s__('May'),
s__('Jun'),
s__('Jul'),
s__('Aug'),
s__('Sep'),
s__('Oct'),
s__('Nov'),
s__('Dec'),
];
} }
return [s__('January'), s__('February'), s__('March'), s__('April'), s__('May'), s__('June'), s__('July'), s__('August'), s__('September'), s__('October'), s__('November'), s__('December')]; return [
s__('January'),
s__('February'),
s__('March'),
s__('April'),
s__('May'),
s__('June'),
s__('July'),
s__('August'),
s__('September'),
s__('October'),
s__('November'),
s__('December'),
];
}; };
/** /**
...@@ -29,7 +52,8 @@ const getMonthNames = (abbreviated) => { ...@@ -29,7 +52,8 @@ const getMonthNames = (abbreviated) => {
* @param {date} date * @param {date} date
* @returns {String} * @returns {String}
*/ */
export const getDayName = date => ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'][date.getDay()]; export const getDayName = date =>
['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'][date.getDay()];
/** /**
* @example * @example
...@@ -55,7 +79,7 @@ export function getTimeago() { ...@@ -55,7 +79,7 @@ export function getTimeago() {
if (!timeagoInstance) { if (!timeagoInstance) {
const localeRemaining = function getLocaleRemaining(number, index) { const localeRemaining = function getLocaleRemaining(number, index) {
return [ return [
[s__('Timeago|less than a minute ago'), s__('Timeago|in a while')], [s__('Timeago|less than a minute ago'), s__('Timeago|right now')],
[s__('Timeago|less than a minute ago'), s__('Timeago|%s seconds remaining')], [s__('Timeago|less than a minute ago'), s__('Timeago|%s seconds remaining')],
[s__('Timeago|about a minute ago'), s__('Timeago|1 minute remaining')], [s__('Timeago|about a minute ago'), s__('Timeago|1 minute remaining')],
[s__('Timeago|%s minutes ago'), s__('Timeago|%s minutes remaining')], [s__('Timeago|%s minutes ago'), s__('Timeago|%s minutes remaining')],
...@@ -73,7 +97,7 @@ export function getTimeago() { ...@@ -73,7 +97,7 @@ export function getTimeago() {
}; };
const locale = function getLocale(number, index) { const locale = function getLocale(number, index) {
return [ return [
[s__('Timeago|less than a minute ago'), s__('Timeago|in a while')], [s__('Timeago|less than a minute ago'), s__('Timeago|right now')],
[s__('Timeago|less than a minute ago'), s__('Timeago|in %s seconds')], [s__('Timeago|less than a minute ago'), s__('Timeago|in %s seconds')],
[s__('Timeago|about a minute ago'), s__('Timeago|in 1 minute')], [s__('Timeago|about a minute ago'), s__('Timeago|in 1 minute')],
[s__('Timeago|%s minutes ago'), s__('Timeago|in %s minutes')], [s__('Timeago|%s minutes ago'), s__('Timeago|in %s minutes')],
...@@ -102,7 +126,7 @@ export function getTimeago() { ...@@ -102,7 +126,7 @@ export function getTimeago() {
* For the given element, renders a timeago instance. * For the given element, renders a timeago instance.
* @param {jQuery} $els * @param {jQuery} $els
*/ */
export const renderTimeago = ($els) => { export const renderTimeago = $els => {
const timeagoEls = $els || document.querySelectorAll('.js-timeago-render'); const timeagoEls = $els || document.querySelectorAll('.js-timeago-render');
// timeago.js sets timeouts internally for each timeago value to be updated in real time // timeago.js sets timeouts internally for each timeago value to be updated in real time
...@@ -119,7 +143,7 @@ export const localTimeAgo = ($timeagoEls, setTimeago = true) => { ...@@ -119,7 +143,7 @@ export const localTimeAgo = ($timeagoEls, setTimeago = true) => {
if (setTimeago) { if (setTimeago) {
// Recreate with custom template // Recreate with custom template
$(el).tooltip({ $(el).tooltip({
template: '<div class="tooltip local-timeago" role="tooltip"><div class="arrow"></div><div class="tooltip-inner"></div></div>', template: '<div class="tooltip local-timeago" role="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',
}); });
} }
...@@ -141,7 +165,9 @@ export const timeFor = (time, expiredLabel) => { ...@@ -141,7 +165,9 @@ export const timeFor = (time, expiredLabel) => {
if (new Date(time) < new Date()) { if (new Date(time) < new Date()) {
return expiredLabel || s__('Timeago|Past due'); return expiredLabel || s__('Timeago|Past due');
} }
return getTimeago().format(time, `${timeagoLanguageCode}-remaining`).trim(); return getTimeago()
.format(time, `${timeagoLanguageCode}-remaining`)
.trim();
}; };
export const getDayDifference = (a, b) => { export const getDayDifference = (a, b) => {
...@@ -161,7 +187,7 @@ export const getDayDifference = (a, b) => { ...@@ -161,7 +187,7 @@ export const getDayDifference = (a, b) => {
export function timeIntervalInWords(intervalInSeconds) { export function timeIntervalInWords(intervalInSeconds) {
const secondsInteger = parseInt(intervalInSeconds, 10); const secondsInteger = parseInt(intervalInSeconds, 10);
const minutes = Math.floor(secondsInteger / 60); const minutes = Math.floor(secondsInteger / 60);
const seconds = secondsInteger - (minutes * 60); const seconds = secondsInteger - minutes * 60;
let text = ''; let text = '';
if (minutes >= 1) { if (minutes >= 1) {
...@@ -178,8 +204,34 @@ export function dateInWords(date, abbreviated = false, hideYear = false) { ...@@ -178,8 +204,34 @@ export function dateInWords(date, abbreviated = false, hideYear = false) {
const month = date.getMonth(); const month = date.getMonth();
const year = date.getFullYear(); const year = date.getFullYear();
const monthNames = [s__('January'), s__('February'), s__('March'), s__('April'), s__('May'), s__('June'), s__('July'), s__('August'), s__('September'), s__('October'), s__('November'), s__('December')]; const monthNames = [
const monthNamesAbbr = [s__('Jan'), s__('Feb'), s__('Mar'), s__('Apr'), s__('May'), s__('Jun'), s__('Jul'), s__('Aug'), s__('Sep'), s__('Oct'), s__('Nov'), s__('Dec')]; s__('January'),
s__('February'),
s__('March'),
s__('April'),
s__('May'),
s__('June'),
s__('July'),
s__('August'),
s__('September'),
s__('October'),
s__('November'),
s__('December'),
];
const monthNamesAbbr = [
s__('Jan'),
s__('Feb'),
s__('Mar'),
s__('Apr'),
s__('May'),
s__('Jun'),
s__('Jul'),
s__('Aug'),
s__('Sep'),
s__('Oct'),
s__('Nov'),
s__('Dec'),
];
const monthName = abbreviated ? monthNamesAbbr[month] : monthNames[month]; const monthName = abbreviated ? monthNamesAbbr[month] : monthNames[month];
...@@ -210,7 +262,7 @@ export const monthInWords = (date, abbreviated = false) => { ...@@ -210,7 +262,7 @@ export const monthInWords = (date, abbreviated = false) => {
* *
* @param {Date} date * @param {Date} date
*/ */
export const totalDaysInMonth = (date) => { export const totalDaysInMonth = date => {
if (!date) { if (!date) {
return 0; return 0;
} }
...@@ -223,12 +275,20 @@ export const totalDaysInMonth = (date) => { ...@@ -223,12 +275,20 @@ export const totalDaysInMonth = (date) => {
* *
* @param {Date} date * @param {Date} date
*/ */
export const getSundays = (date) => { export const getSundays = date => {
if (!date) { if (!date) {
return []; return [];
} }
const daysToSunday = ['Saturday', 'Friday', 'Thursday', 'Wednesday', 'Tuesday', 'Monday', 'Sunday']; const daysToSunday = [
'Saturday',
'Friday',
'Thursday',
'Wednesday',
'Tuesday',
'Monday',
'Sunday',
];
const month = date.getMonth(); const month = date.getMonth();
const year = date.getFullYear(); const year = date.getFullYear();
......
...@@ -351,7 +351,7 @@ import Cookies from 'js-cookie'; ...@@ -351,7 +351,7 @@ import Cookies from 'js-cookie';
}, },
getCommitButtonText() { getCommitButtonText() {
const initial = 'Commit conflict resolution'; const initial = 'Commit to source branch';
const inProgress = 'Committing...'; const inProgress = 'Committing...';
return this.state ? this.state.isSubmitting ? inProgress : initial : initial; return this.state ? this.state.isSubmitting ? inProgress : initial : initial;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
import tooltip from '../../vue_shared/directives/tooltip'; import tooltip from '../../vue_shared/directives/tooltip';
export default { export default {
name: 'MRWidgetAuthor', name: 'MrWidgetAuthor',
directives: { directives: {
tooltip, tooltip,
}, },
......
<script> <script>
import mrWidgetAuthor from './mr_widget_author.vue'; import MrWidgetAuthor from './mr_widget_author.vue';
export default { export default {
name: 'MRWidgetAuthorTime', name: 'MRWidgetAuthorTime',
components: { components: {
mrWidgetAuthor, MrWidgetAuthor,
}, },
props: { props: {
actionText: { actionText: {
......
<script> <script>
import Flash from '../../../flash'; import Flash from '../../../flash';
import statusIcon from '../mr_widget_status_icon.vue'; import statusIcon from '../mr_widget_status_icon.vue';
import mrWidgetAuthor from '../../components/mr_widget_author.vue'; import MrWidgetAuthor from '../../components/mr_widget_author.vue';
import eventHub from '../../event_hub'; import eventHub from '../../event_hub';
export default { export default {
name: 'MRWidgetMergeWhenPipelineSucceeds', name: 'MRWidgetMergeWhenPipelineSucceeds',
components: { components: {
mrWidgetAuthor, MrWidgetAuthor,
statusIcon, statusIcon,
}, },
props: { props: {
......
...@@ -329,6 +329,10 @@ ...@@ -329,6 +329,10 @@
&.invalid { &.invalid {
@include status-color($gray-dark, color("gray"), $gray-darkest); @include status-color($gray-dark, color("gray"), $gray-darkest);
border-color: $gray-darkest; border-color: $gray-darkest;
&:not(span):hover {
color: $gray;
}
} }
} }
......
...@@ -286,6 +286,14 @@ $colors: ( ...@@ -286,6 +286,14 @@ $colors: (
} }
.resolve-conflicts-form { .resolve-conflicts-form {
padding-top: $gl-padding; h4 {
margin-top: 0;
}
.resolve-info {
@media (max-width: $screen-md-max) {
margin-bottom: $gl-padding;
}
}
} }
} }
module Groups module Groups
module Settings module Settings
class BadgesController < Groups::ApplicationController class BadgesController < Groups::ApplicationController
include GrapeRouteHelpers::NamedRouteMatcher include API::Helpers::RelatedResourcesHelpers
before_action :authorize_admin_group! before_action :authorize_admin_group!
def index def index
@badge_api_endpoint = api_v4_groups_badges_path(id: @group.id) @badge_api_endpoint = expose_url(api_v4_groups_badges_path(id: @group.id))
end end
end end
end end
......
module Projects module Projects
module Settings module Settings
class BadgesController < Projects::ApplicationController class BadgesController < Projects::ApplicationController
include GrapeRouteHelpers::NamedRouteMatcher include API::Helpers::RelatedResourcesHelpers
before_action :authorize_admin_project! before_action :authorize_admin_project!
def index def index
@badge_api_endpoint = api_v4_projects_badges_path(id: @project.id) @badge_api_endpoint = expose_url(api_v4_projects_badges_path(id: @project.id))
end end
end end
end end
......
...@@ -894,6 +894,13 @@ class Project < ActiveRecord::Base ...@@ -894,6 +894,13 @@ class Project < ActiveRecord::Base
Gitlab::Routing.url_helpers.project_url(self) Gitlab::Routing.url_helpers.project_url(self)
end end
def readme_url
readme = repository.readme
if readme
Gitlab::Routing.url_helpers.project_blob_url(self, File.join(default_branch, readme.path))
end
end
def new_issuable_address(author, address_type) def new_issuable_address(author, address_type)
return unless Gitlab::IncomingEmail.supports_issue_creation? && author return unless Gitlab::IncomingEmail.supports_issue_creation? && author
......
...@@ -596,7 +596,7 @@ class Repository ...@@ -596,7 +596,7 @@ class Repository
cache_method :gitlab_ci_yml cache_method :gitlab_ci_yml
def xcode_project? def xcode_project?
file_on_head(:xcode_config).present? file_on_head(:xcode_config, :tree).present?
end end
cache_method :xcode_project? cache_method :xcode_project?
...@@ -920,11 +920,21 @@ class Repository ...@@ -920,11 +920,21 @@ class Repository
end end
end end
def file_on_head(type) def file_on_head(type, object_type = :blob)
if head = tree(:head) return unless head = tree(:head)
head.blobs.find do |blob|
Gitlab::FileDetector.type_of(blob.path) == type objects =
case object_type
when :blob
head.blobs
when :tree
head.trees
else
raise ArgumentError, "Object type #{object_type} is not supported"
end end
objects.find do |object|
Gitlab::FileDetector.type_of(object.path) == type
end end
end end
......
...@@ -109,7 +109,7 @@ class User < ActiveRecord::Base ...@@ -109,7 +109,7 @@ class User < ActiveRecord::Base
has_many :created_projects, foreign_key: :creator_id, class_name: 'Project' has_many :created_projects, foreign_key: :creator_id, class_name: 'Project'
has_many :users_star_projects, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent has_many :users_star_projects, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent
has_many :starred_projects, through: :users_star_projects, source: :project has_many :starred_projects, through: :users_star_projects, source: :project
has_many :project_authorizations has_many :project_authorizations, dependent: :delete_all # rubocop:disable Cop/ActiveRecordDependent
has_many :authorized_projects, through: :project_authorizations, source: :project has_many :authorized_projects, through: :project_authorizations, source: :project
has_many :user_interacted_projects has_many :user_interacted_projects
...@@ -165,8 +165,7 @@ class User < ActiveRecord::Base ...@@ -165,8 +165,7 @@ class User < ActiveRecord::Base
validate :signup_domain_valid?, on: :create, if: ->(user) { !user.created_by_id } validate :signup_domain_valid?, on: :create, if: ->(user) { !user.created_by_id }
before_validation :sanitize_attrs before_validation :sanitize_attrs
before_validation :set_notification_email, if: :email_changed? before_validation :set_notification_email, if: :new_record?
before_save :set_notification_email, if: :email_changed? # in case validation is skipped
before_validation :set_public_email, if: :public_email_changed? before_validation :set_public_email, if: :public_email_changed?
before_save :set_public_email, if: :public_email_changed? # in case validation is skipped before_save :set_public_email, if: :public_email_changed? # in case validation is skipped
before_save :ensure_incoming_email_token before_save :ensure_incoming_email_token
...@@ -179,8 +178,21 @@ class User < ActiveRecord::Base ...@@ -179,8 +178,21 @@ class User < ActiveRecord::Base
after_update :username_changed_hook, if: :username_changed? after_update :username_changed_hook, if: :username_changed?
after_destroy :post_destroy_hook after_destroy :post_destroy_hook
after_destroy :remove_key_cache after_destroy :remove_key_cache
after_commit :update_emails_with_primary_email, on: :update, if: -> { previous_changes.key?('email') } after_commit(on: :update) do
after_commit :update_invalid_gpg_signatures, on: :update, if: -> { previous_changes.key?('email') } if previous_changes.key?('email')
# Grab previous_email here since previous_changes changes after
# #update_emails_with_primary_email and #update_notification_email are called
previous_email = previous_changes[:email][0]
update_emails_with_primary_email(previous_email)
update_invalid_gpg_signatures
if previous_email == notification_email
self.notification_email = email
save
end
end
end
after_initialize :set_projects_limit after_initialize :set_projects_limit
...@@ -546,8 +558,7 @@ class User < ActiveRecord::Base ...@@ -546,8 +558,7 @@ class User < ActiveRecord::Base
# hash and `_was` variables getting munged. # hash and `_was` variables getting munged.
# By using an `after_commit` instead of `after_update`, we avoid the recursive callback # By using an `after_commit` instead of `after_update`, we avoid the recursive callback
# scenario, though it then requires us to use the `previous_changes` hash # scenario, though it then requires us to use the `previous_changes` hash
def update_emails_with_primary_email def update_emails_with_primary_email(previous_email)
previous_email = previous_changes[:email][0] # grab this before the DestroyService is called
primary_email_record = emails.find_by(email: email) primary_email_record = emails.find_by(email: email)
Emails::DestroyService.new(self, user: self).execute(primary_email_record) if primary_email_record Emails::DestroyService.new(self, user: self).execute(primary_email_record) if primary_email_record
...@@ -772,13 +783,13 @@ class User < ActiveRecord::Base ...@@ -772,13 +783,13 @@ class User < ActiveRecord::Base
end end
def set_notification_email def set_notification_email
if notification_email.blank? || !all_emails.include?(notification_email) if notification_email.blank? || all_emails.exclude?(notification_email)
self.notification_email = email self.notification_email = email
end end
end end
def set_public_email def set_public_email
if public_email.blank? || !all_emails.include?(public_email) if public_email.blank? || all_emails.exclude?(public_email)
self.public_email = '' self.public_email = ''
end end
end end
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
= nav_link(path: 'projects#show', html_options: { class: "fly-out-top-item" } ) do = nav_link(path: 'projects#show', html_options: { class: "fly-out-top-item" } ) do
= link_to project_path(@project) do = link_to project_path(@project) do
%strong.fly-out-top-item-name %strong.fly-out-top-item-name
= _('Overview') = _('Project')
%li.divider.fly-out-top-item %li.divider.fly-out-top-item
= nav_link(path: 'projects#show') do = nav_link(path: 'projects#show') do
= link_to project_path(@project), title: _('Project details'), class: 'shortcuts-project' do = link_to project_path(@project), title: _('Project details'), class: 'shortcuts-project' do
......
...@@ -11,6 +11,6 @@ ...@@ -11,6 +11,6 @@
Showing Showing
%strong.cred {{conflictsCountText}} %strong.cred {{conflictsCountText}}
between between
%strong {{conflictsData.sourceBranch}} %strong.ref-name {{conflictsData.sourceBranch}}
and and
%strong {{conflictsData.targetBranch}} %strong.ref-name {{conflictsData.targetBranch}}
- branch_name = link_to @merge_request.source_branch, project_tree_path(@merge_request.project, @merge_request.source_branch), class: "ref-name"
- translation =_('You can resolve the merge conflict using either the Interactive mode, by choosing %{use_ours} or %{use_theirs} buttons, or by editing the files directly. Commit these changes into %{branch_name}') % { use_ours: '<code>Use Ours</code>', use_theirs: '<code>Use Theirs</code>', branch_name: branch_name }
%hr
.resolve-conflicts-form .resolve-conflicts-form
.form-group.row .form-group.row
%label.col-sm-2.col-form-label{ "for" => "commit-message" } .col-md-4
%h4= _('Resolve conflicts on source branch')
.resolve-info
= translation.html_safe
.col-md-8
%label.label-light{ "for" => "commit-message" }
#{ _('Commit message') } #{ _('Commit message') }
.col-sm-10
.commit-message-container .commit-message-container
.max-width-marker .max-width-marker
%textarea.form-control.js-commit-message#commit-message{ "v-model" => "conflictsData.commitMessage", "rows" => "5" } %textarea.form-control.js-commit-message#commit-message{ "v-model" => "conflictsData.commitMessage", "rows" => "5" }
.form-group.row .form-group.row
.offset-sm-2.col-sm-10 .col-md-offset-4.col-md-8
.row .row
.col-6 .col-6
%button.btn.btn-success.js-submit-button{ type: "button", "@click" => "commit()", ":disabled" => "!readyToCommit" } %button.btn.btn-success.js-submit-button{ type: "button", "@click" => "commit()", ":disabled" => "!readyToCommit" }
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
%br %br
%p %p
- deploy_token = link_to(_('deploy token'), help_page_path('user/project/deploy_tokens/index', anchor: 'read-container-registry-images'), target: '_blank') - deploy_token = link_to(_('deploy token'), help_page_path('user/project/deploy_tokens/index', anchor: 'read-container-registry-images'), target: '_blank')
= s_('ContainerRegistry|You can also %{deploy_token} for read-only access to the registry images.').html_safe % { deploy_token: deploy_token } = s_('ContainerRegistry|You can also use a %{deploy_token} for read-only access to the registry images.').html_safe % { deploy_token: deploy_token }
%br %br
%p %p
= s_('ContainerRegistry|Once you log in, you&rsquo;re free to create and upload a container image using the common %{build} and %{push} commands').html_safe % { build: "<code>build</code>".html_safe, push: "<code>push</code>".html_safe } = s_('ContainerRegistry|Once you log in, you&rsquo;re free to create and upload a container image using the common %{build} and %{push} commands').html_safe % { build: "<code>build</code>".html_safe, push: "<code>push</code>".html_safe }
......
---
title: Introduce new ProjectCiCdSetting model with group_runners_enabled
merge_request: 18144
author:
type: performance
---
title: Add cron job to email users on issue due date
merge_request: 17985
author: Stuart Nelson
type: added
---
title: Improves wording in new pipeline page
merge_request:
author:
type: other
---
title: Fix an issue where the notification email address would be set to an unconfirmed
email address
merge_request: 18474
author:
type: fixed
---
title: Improve tooltips in collapsed right sidebar
merge_request: 17714
author:
type: changed
---
title: Fix `joined` information on project members page
merge_request: 18290
author: Fabian Schneider
type: fixed
---
title: Fix template selector menu visibility when toggling preview mode in file edit
view
merge_request: 18118
author: Fabian Schneider
type: fixed
---
title: Use VueJS for rendering pipeline stages
merge_request:
author:
type: changed
---
title: Prevent pipeline actions in dropdown to redirct to a new page
merge_request:
author:
type: fixed
---
title: Keep current labels visible when editing them in the sidebar
merge_request:
author:
type: changed
---
title: Reconcile project templates with Auto DevOps
merge_request: 18737
author:
type: changed
---
title: Add a comma to the time estimate system notes
merge_request: 18326
author:
type: changed
title: Replace vue resource with axios in pipelines table
merge_request:
author:
type: other
\ No newline at end of file
---
title: Improve DB performance of calculating total artifacts size
merge_request: 17839
author:
type: performance
---
title: Make project deploy keys table more clearly structured
merge_request: 18279
author:
type: changed
---
title: Refactor CSS to eliminate vertical misalignment of login nav
merge_request: 16275
author: Takuya Noguchi
type: fixed
---
title: 'Allow group owner to enable runners from subgroups (#41981)'
merge_request: 18009
author:
type: fixed
---
title: Adds push mirrors to GitLab Community Edition
merge_request: 18715
author:
type: changed
---
title: Remove ahead/behind graphs on project branches on mobile
merge_request: 18415
author: Takuya Noguchi
type: other
---
title: Show new branch/mr button even when branch exists
merge_request: 17712
author: Jacopo Beschi @jacopo-beschi
type: added
---
title: Rubocop rule to avoid returning from a block
merge_request: 18000
author: Jacopo Beschi @jacopo-beschi
type: added
---
title: Fix discussions API setting created_at for notable in a group or notable in
a project in a group with owners
merge_request: 18464
author:
type: fixed
---
title: Reduce queries on merge requests list page for merge requests from forks
merge_request: 18561
author:
type: performance
---
title: Breaks commit not found message in pipelines table
merge_request:
author:
type: fixed
---
title: Create settings section for autodevops
merge_request: 18321
author:
type: changed
---
title: Add GCP signup offer to cluster index / create pages
merge_request: 18684
author:
type: added
---
title: Display merge commit SHA in merge widget after merge
merge_request: 18722
author:
type: added
---
title: Replace GKE acronym with Google Kubernetes Engine
merge_request:
author:
type: other
---
title: Use RFC 3676 mail signature delimiters
merge_request: 17979
author: Enrico Scholz
type: changed
---
title: Enable specifying variables when executing a manual pipeline
merge_request: 18440
author:
type: changed
---
title: Removes modal boards store and mixins from global scope
merge_request:
author:
type: other
---
title: Verifiy if pipeline has commit idetails and render information in MR widget
when branch is deleted
merge_request:
author:
type: fixed
---
title: Expose Deploy Token data as environment varialbes on CI/CD jobs
merge_request: 18414
author:
type: added
---
title: Fix pipeline status in branch/tag tree page
merge_request: 17995
author:
type: fixed
---
title: Now `rake cache:clear` will also clear pipeline status cache
merge_request: 18257
author:
type: fixed
---
title: Make toggle markdown preview shortcut only toggle selected field
merge_request:
author:
type: fixed
---
title: Clean up WebIDE status bar and add useful info
merge_request:
author:
type: changed
---
title: Remove branch name from the status bar of WebIDE
merge_request:
author:
type: changed
---
title: Add the signature verfication badge to the compare view
merge_request: 18245
author: Marc Shaw
type: added
---
title: Fix confirmation modal for deleting a protected branch
merge_request: 18176
author: Paul Bonaud @PaulRbR
type: fixed
---
title: Adds illustration for when job log was erased
merge_request:
author:
type: fixed
---
title: Update faraday_middlewar to 0.12.2
merge_request: 18397
author: Takuya Noguchi
type: security
---
title: Fix tabs container styles to make RSS button clickable
merge_request: 18559
author:
type: fixed
---
title: Fix undefined `html_escape` method during markdown rendering
merge_request: 18418
author:
type: fixed
---
title: Correct text and functionality for delete user / delete user and contributions
modal.
merge_request: 18463
author: Marc Schwede
type: fixed
---
title: Don't automatically remove artifacts for pages jobs after pages:deploy has
run
merge_request: 18628
author:
type: fixed
---
title: Ensure member notifications are sent after the member actual creation/update in the DB
merge_request: 18538
author:
type: fixed
---
title: Fix project creation for user endpoint when jobs_enabled parameter supplied
merge_request:
author:
type: fixed
---
title: Update links to /ci/lint with ones to project ci/lint
merge_request: 18539
author: Takuya Noguchi
type: fixed
---
title: Replace time_ago_in_words with JS-based one
merge_request: 18607
author: Takuya Noguchi
type: performance
---
title: Expose readme url in Project API
merge_request: 18960
author: Imre Farkas
type: changed
---
title: Resolve Import/Export ci_cd_settings error updating the project
merge_request: 46049
author:
type: fixed
---
title: 46210 Display logo and user dropdown on mobile for terms page and fix styling
merge_request:
author:
type: fixed
---
title: Disables RBAC on nginx-ingress
merge_request: 18947
author:
type: fixed
---
title: fixed copy to blipboard button in embed bar of snippets
merge_request: 18923
author: haseebeqx
type: fixed
---
title: Correct skewed Kubernetes popover illustration
merge_request: 18949
author:
type: fixed
---
title: Fix unassign slash command preview
merge_request: 18447
author:
type: fixed
---
title: Raise NoRepository error for non-valid repositories when calculating repository
checksum
merge_request: 18594
author:
type: fixed
---
title: ShaAttribute no longer stops startup if database is missing
merge_request: 18726
author:
type: fixed
---
title: Adds Embedded Snippets Support
merge_request: 15695
author: haseebeqx
type: added
---
title: Add NOT NULL constraints to project_authorizations.
merge_request: 18980
author:
type: other
---
title: Transition to atomic internal ids for all models.
merge_request: 44259
author:
type: other
---
title: Increase text limit for GPG keys (mysql only).
merge_request: 19069
author:
type: other
---
title: Replace "Click" with "Select" to be more inclusive of people with accessibility
requirements
merge_request: 18386
author: Mark Lapierre
type: other
---
title: Add Copy metadata quick action
merge_request: 16473
author: Mateusz Bajorski
type: added
---
title: Add CI_COMMIT_MESSAGE, CI_COMMIT_TITLE and CI_COMMIT_DESCRIPTION predefined variables
merge_request: 18672
author:
type: added
---
title: Add loading icon padding for pipeline environments
merge_request: 18631
author: George Tsiolis
type: fixed
---
title: Add padding to profile description
merge_request: 18663
author: George Tsiolis
type: changed
---
title: Align project avatar on small viewports
merge_request: 18513
author: George Tsiolis
type: changed
---
title: git SHA is now displayed alongside the GitLab version on the Admin Dashboard
merge_request:
author:
type: added
---
title: Add missing changelog type to docs
merge_request: 18526
author: "@blackst0ne"
type: other
---
title: 'Replace the `project/builds/artifacts.feature` spinach test with an rspec analog'
merge_request: 18729
author: '@blackst0ne'
type: other
---
title: "Replace the `project/commits/branches.feature` spinach test with an rspec analog"
merge_request: 18302
author: "@blackst0ne"
type: other
---
title: Replace the `project/commits/comments.feature` spinach test with an rspec analog
merge_request: 18356
author: "@blackst0ne"
type: other
---
title: Replace the `project/issues/milestones.feature` spinach test with an rspec analog
merge_request: 18300
author: "@blackst0ne"
type: other
---
title: Replace the `project/source/markdown_render.feature` spinach test with an rspec analog
merge_request: 18525
author: "@blackst0ne"
type: other
---
title: Break issue title for board card title and issuable header text
merge_request: 18674
author: George Tsiolis
type: changed
---
title: Allow admins to enforce accepting Terms of Service on an instance
merge_request: 18570
author:
type: added
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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