Skip to content

G
gitlab-ce
Commit 404e618c authored by GitLab Bot's avatar GitLab Bot
Browse files
Options

Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-06-09 

# Conflicts:
#	app/views/devise/shared/_signup_box.html.haml
#	locale/gitlab.pot

[ci skip]
parents cd74f408 f646a8b9
Show whitespace changes
Inline Side-by-side
Showing with 91 additions and 39 deletions
.gitlab-ci.yml
View file @ 404e618c
image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.4.4-golang-1.9-git-2.17-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29" image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.4.4-golang-1.9-git-2.17-chrome-67.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29"
.dedicated-runner: &dedicated-runner .dedicated-runner: &dedicated-runner
retry: 1 retry: 1
......
Gemfile.lock
View file @ 404e618c
...@@ -385,8 +385,8 @@ GEM ...@@ -385,8 +385,8 @@ GEM
grape-entity (0.7.1) grape-entity (0.7.1)
activesupport (>= 4.0) activesupport (>= 4.0)
multi_json (>= 1.3.2) multi_json (>= 1.3.2)
grape-path-helpers (1.0.4) grape-path-helpers (1.0.5)
activesupport (~> 4) activesupport (>= 4, < 5.1)
grape (~> 1.0) grape (~> 1.0)
rake (~> 12) rake (~> 12)
grape_logging (1.7.0) grape_logging (1.7.0)
......
Gemfile.rails5.lock
View file @ 404e618c
...@@ -310,7 +310,7 @@ GEM ...@@ -310,7 +310,7 @@ GEM
gettext_i18n_rails (>= 0.7.1) gettext_i18n_rails (>= 0.7.1)
po_to_json (>= 1.0.0) po_to_json (>= 1.0.0)
rails (>= 3.2.0) rails (>= 3.2.0)
gitaly-proto (0.100.0) gitaly-proto (0.101.0)
google-protobuf (~> 3.1) google-protobuf (~> 3.1)
grpc (~> 1.10) grpc (~> 1.10)
github-linguist (5.3.3) github-linguist (5.3.3)
...@@ -388,10 +388,10 @@ GEM ...@@ -388,10 +388,10 @@ GEM
grape-entity (0.7.1) grape-entity (0.7.1)
activesupport (>= 4.0) activesupport (>= 4.0)
multi_json (>= 1.3.2) multi_json (>= 1.3.2)
grape-path-helpers (1.0.0) grape-path-helpers (1.0.5)
activesupport activesupport (>= 4, < 5.1)
grape (~> 1.0) grape (~> 1.0)
rake rake (~> 12)
grape_logging (1.7.0) grape_logging (1.7.0)
grape grape
graphiql-rails (1.4.10) graphiql-rails (1.4.10)
...@@ -529,6 +529,7 @@ GEM ...@@ -529,6 +529,7 @@ GEM
mime-types-data (~> 3.2015) mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521) mime-types-data (3.2016.0521)
mimemagic (0.3.0) mimemagic (0.3.0)
mini_magick (4.8.0)
mini_mime (1.0.0) mini_mime (1.0.0)
mini_portile2 (2.3.0) mini_portile2 (2.3.0)
minitest (5.7.0) minitest (5.7.0)
...@@ -1082,7 +1083,7 @@ DEPENDENCIES ...@@ -1082,7 +1083,7 @@ DEPENDENCIES
gettext (~> 3.2.2) gettext (~> 3.2.2)
gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.3) gettext_i18n_rails_js (~> 1.3)
gitaly-proto (~> 0.100.0) gitaly-proto (~> 0.101.0)
github-linguist (~> 5.3.3) github-linguist (~> 5.3.3)
gitlab-flowdock-git-hook (~> 1.0.1) gitlab-flowdock-git-hook (~> 1.0.1)
gitlab-gollum-lib (~> 4.2) gitlab-gollum-lib (~> 4.2)
...@@ -1127,6 +1128,7 @@ DEPENDENCIES ...@@ -1127,6 +1128,7 @@ DEPENDENCIES
loofah (~> 2.2) loofah (~> 2.2)
mail_room (~> 0.9.1) mail_room (~> 0.9.1)
method_source (~> 0.8) method_source (~> 0.8)
mini_magick
minitest (~> 5.7.0) minitest (~> 5.7.0)
mousetrap-rails (~> 1.4.6) mousetrap-rails (~> 1.4.6)
mysql2 (~> 0.4.10) mysql2 (~> 0.4.10)
......
app/assets/stylesheets/bootstrap_migration.scss
View file @ 404e618c
...@@ -118,10 +118,6 @@ code { ...@@ -118,10 +118,6 @@ code {
} }
} }
.code {
padding: 9.5px;
}
table { table {
// Remove any table border lines // Remove any table border lines
border-spacing: 0; border-spacing: 0;
......
app/services/projects/destroy_service.rb
View file @ 404e618c
...@@ -136,6 +136,7 @@ module Projects ...@@ -136,6 +136,7 @@ module Projects
raise_error('Failed to remove some tags in project container registry. Please try again or contact administrator.') raise_error('Failed to remove some tags in project container registry. Please try again or contact administrator.')
end end
log_destroy_event
trash_repositories! trash_repositories!
# Rails attempts to load all related records into memory before # Rails attempts to load all related records into memory before
...@@ -149,6 +150,10 @@ module Projects ...@@ -149,6 +150,10 @@ module Projects
end end
end end
def log_destroy_event
log_info("Attempting to destroy #{project.full_path} (#{project.id})")
end
## ##
# This method makes sure that we correctly remove registry tags # This method makes sure that we correctly remove registry tags
# for legacy image repository (when repository path equals project path). # for legacy image repository (when repository path equals project path).
......
app/views/devise/shared/_signup_box.html.haml
View file @ 404e618c
...@@ -29,7 +29,10 @@ ...@@ -29,7 +29,10 @@
- terms_link = link_to s_("I accept the|Terms of Service and Privacy Policy"), terms_path, target: "_blank" - terms_link = link_to s_("I accept the|Terms of Service and Privacy Policy"), terms_path, target: "_blank"
- accept_terms_label = _("I accept the %{terms_link}") % { terms_link: terms_link } - accept_terms_label = _("I accept the %{terms_link}") % { terms_link: terms_link }
= accept_terms_label.html_safe = accept_terms_label.html_safe
<<<<<<< HEAD
= render 'devise/shared/ee/email_opted_in', f: f = render 'devise/shared/ee/email_opted_in', f: f
=======
>>>>>>> upstream/master
%div %div
- if Gitlab::Recaptcha.enabled? - if Gitlab::Recaptcha.enabled?
= recaptcha_tags = recaptcha_tags
......
app/views/projects/artifacts/browse.html.haml
View file @ 404e618c
...@@ -9,10 +9,10 @@ ...@@ -9,10 +9,10 @@
.tree-holder .tree-holder
.nav-block .nav-block
%ul.breadcrumb.repo-breadcrumb %ul.breadcrumb.repo-breadcrumb
%li %li.breadcrumb-item
= link_to 'Artifacts', browse_project_job_artifacts_path(@project, @build) = link_to 'Artifacts', browse_project_job_artifacts_path(@project, @build)
- path_breadcrumbs do |title, path| - path_breadcrumbs do |title, path|
%li %li.breadcrumb-item
= link_to truncate(title, length: 40), browse_project_job_artifacts_path(@project, @build, path) = link_to truncate(title, length: 40), browse_project_job_artifacts_path(@project, @build, path)
.tree-controls .tree-controls
......
changelogs/unreleased/blackst0ne-bump-grape-path-helpers-gem-to-1-0-5.yml 0 → 100644
View file @ 404e618c
---
title: Bump grape-path-helpers to 1.0.5
merge_request: 19604
author: "@blackst0ne"
type: other
doc/topics/autodevops/index.md
View file @ 404e618c
...@@ -213,11 +213,11 @@ full use of Auto DevOps. If this is your fist time, we recommend you follow the ...@@ -213,11 +213,11 @@ full use of Auto DevOps. If this is your fist time, we recommend you follow the
To enable Auto DevOps to your project: To enable Auto DevOps to your project:
1. Check that your project doesn't have a `.gitlab-ci.yml`, or remove it otherwise 1. Check that your project doesn't have a `.gitlab-ci.yml`, or remove it otherwise
1. Go to your project's **Settings > CI/CD > General pipelines settings** and 1. Go to your project's **Settings > CI/CD > Auto DevOps**
find the Auto DevOps section
1. Select "Enable Auto DevOps" 1. Select "Enable Auto DevOps"
1. Optionally, but recommended, add in the [base domain](#auto-devops-base-domain) 1. Optionally, but recommended, add in the [base domain](#auto-devops-base-domain)
that will be used by Kubernetes to deploy your application that will be used by Kubernetes to [deploy your application](#auto-deploy)
and choose the [deployment strategy](#deployment-strategy)
1. Hit **Save changes** for the changes to take effect 1. Hit **Save changes** for the changes to take effect
Once saved, an Auto DevOps pipeline will be triggered on the default branch. Once saved, an Auto DevOps pipeline will be triggered on the default branch.
...@@ -234,6 +234,24 @@ in **Admin Area > Settings > Continuous Integration and Deployment**. Doing that ...@@ -234,6 +234,24 @@ in **Admin Area > Settings > Continuous Integration and Deployment**. Doing that
all the projects that haven't explicitly set an option will have Auto DevOps all the projects that haven't explicitly set an option will have Auto DevOps
enabled by default. enabled by default.
### Deployment strategy
> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/38542) in GitLab 11.0.
You can change the deployment strategy used by Auto DevOps by going to your
project's **Settings > CI/CD > Auto DevOps**.
The available options are:
- **Continuous deployment to production** - enables [Auto Deploy](#auto-deploy)
by setting the [`STAGING_ENABLED`](#deploy-policy-for-staging-and-production-environments) and
[`INCREMENTAL_ROLLOUT_ENABLED`](#incremental-rollout-to-production) variables
to false.
- **Automatic deployment to staging, manual deployment to production** - sets the
[`STAGING_ENABLED`](#deploy-policy-for-staging-and-production-environments) and
[`INCREMENTAL_ROLLOUT_ENABLED`](#incremental-rollout-to-production) variables
to true, and the user is responsible for manually deploying to staging and production.
## Stages of Auto DevOps ## Stages of Auto DevOps
The following sections describe the stages of Auto DevOps. Read them carefully The following sections describe the stages of Auto DevOps. Read them carefully
...@@ -652,6 +670,9 @@ service: ...@@ -652,6 +670,9 @@ service:
> [Introduced](https://gitlab.com/gitlab-org/gitlab-ci-yml/merge_requests/160) > [Introduced](https://gitlab.com/gitlab-org/gitlab-ci-yml/merge_requests/160)
in GitLab 10.8. in GitLab 10.8.
TIP: **Tip:**
You can also set this inside your [project's settings](#deployment-strategy).
The normal behavior of Auto DevOps is to use Continuous Deployment, pushing The normal behavior of Auto DevOps is to use Continuous Deployment, pushing
automatically to the `production` environment every time a new pipeline is run automatically to the `production` environment every time a new pipeline is run
on the default branch. However, there are cases where you might want to use a on the default branch. However, there are cases where you might want to use a
...@@ -682,6 +703,9 @@ If `CANARY_ENABLED` is defined in your project (e.g., set `CANARY_ENABLED` to ...@@ -682,6 +703,9 @@ If `CANARY_ENABLED` is defined in your project (e.g., set `CANARY_ENABLED` to
> [Introduced](https://gitlab.com/gitlab-org/gitlab-ee/issues/5415) in GitLab 10.8. > [Introduced](https://gitlab.com/gitlab-org/gitlab-ee/issues/5415) in GitLab 10.8.
TIP: **Tip:**
You can also set this inside your [project's settings](#deployment-strategy).
When you have a new version of your app to deploy in production, you may want When you have a new version of your app to deploy in production, you may want
to use an incremental rollout to replace just a few pods with the latest code. to use an incremental rollout to replace just a few pods with the latest code.
This will allow you to first check how the app is behaving, and later manually This will allow you to first check how the app is behaving, and later manually
......
locale/gitlab.pot
View file @ 404e618c
...@@ -8,8 +8,13 @@ msgid "" ...@@ -8,8 +8,13 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gitlab 1.0.0\n" "Project-Id-Version: gitlab 1.0.0\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
<<<<<<< HEAD
"POT-Creation-Date: 2018-06-08 18:27+0200\n" "POT-Creation-Date: 2018-06-08 18:27+0200\n"
"PO-Revision-Date: 2018-06-08 18:27+0200\n" "PO-Revision-Date: 2018-06-08 18:27+0200\n"
=======
"POT-Creation-Date: 2018-06-08 18:19+0200\n"
"PO-Revision-Date: 2018-06-08 18:19+0200\n"
>>>>>>> upstream/master
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n" "Language: \n"
...@@ -272,7 +277,7 @@ msgstr "" ...@@ -272,7 +277,7 @@ msgstr ""
msgid "Account" msgid "Account"
msgstr "" msgstr ""
msgid "Account and limit settings" msgid "Account and limit"
msgstr "" msgstr ""
msgid "Active" msgid "Active"
...@@ -955,9 +960,12 @@ msgstr "" ...@@ -955,9 +960,12 @@ msgstr ""
msgid "CI/CD for external repo" msgid "CI/CD for external repo"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "CI/CD settings" msgid "CI/CD settings"
msgstr "" msgstr ""
=======
>>>>>>> upstream/master
msgid "CICD|An explicit %{ci_file} needs to be specified before you can begin using Continuous Integration and Delivery." msgid "CICD|An explicit %{ci_file} needs to be specified before you can begin using Continuous Integration and Delivery."
msgstr "" msgstr ""
...@@ -3047,6 +3055,7 @@ msgstr "" ...@@ -3047,6 +3055,7 @@ msgstr ""
msgid "Import repository" msgid "Import repository"
msgstr "" msgstr ""
<<<<<<< HEAD
msgid "ImportButtons|Connect repositories from" msgid "ImportButtons|Connect repositories from"
msgstr "" msgstr ""
...@@ -3059,6 +3068,8 @@ msgstr "" ...@@ -3059,6 +3068,8 @@ msgstr ""
msgid "Improve search with Advanced Global Search and GitLab Enterprise Edition." msgid "Improve search with Advanced Global Search and GitLab Enterprise Edition."
msgstr "" msgstr ""
=======
>>>>>>> upstream/master
msgid "Include a Terms of Service agreement and Privacy Policy that all users must accept." msgid "Include a Terms of Service agreement and Privacy Policy that all users must accept."
msgstr "" msgstr ""
...@@ -4460,7 +4471,7 @@ msgstr "" ...@@ -4460,7 +4471,7 @@ msgstr ""
msgid "Repository maintenance" msgid "Repository maintenance"
msgstr "" msgstr ""
msgid "Repository mirror settings" msgid "Repository mirror"
msgstr "" msgstr ""
msgid "Repository storage" msgid "Repository storage"
...@@ -4543,9 +4554,6 @@ msgstr "" ...@@ -4543,9 +4554,6 @@ msgstr ""
msgid "Runners can be placed on separate users, servers, and even on your local machine." msgid "Runners can be placed on separate users, servers, and even on your local machine."
msgstr "" msgstr ""
msgid "Runners settings"
msgstr ""
msgid "Running" msgid "Running"
msgstr "" msgstr ""
...@@ -5124,6 +5132,7 @@ msgid "Team" ...@@ -5124,6 +5132,7 @@ msgid "Team"
msgstr "" msgstr ""
msgid "Terms of Service Agreement and Privacy Policy" msgid "Terms of Service Agreement and Privacy Policy"
<<<<<<< HEAD
msgstr "" msgstr ""
msgid "Terms of Service and Privacy Policy" msgid "Terms of Service and Privacy Policy"
...@@ -5133,6 +5142,11 @@ msgid "Thanks! Don't show me this again" ...@@ -5133,6 +5142,11 @@ msgid "Thanks! Don't show me this again"
msgstr "" msgstr ""
msgid "The Advanced Global Search in GitLab is a powerful search service that saves you time. Instead of creating duplicate code and wasting time, you can now search for code within other teams that can help your own project." msgid "The Advanced Global Search in GitLab is a powerful search service that saves you time. Instead of creating duplicate code and wasting time, you can now search for code within other teams that can help your own project."
=======
msgstr ""
msgid "Terms of Service and Privacy Policy"
>>>>>>> upstream/master
msgstr "" msgstr ""
msgid "The Issue Tracker is the place to add things that need to be improved or solved in a project" msgid "The Issue Tracker is the place to add things that need to be improved or solved in a project"
...@@ -5390,6 +5404,9 @@ msgstr "" ...@@ -5390,6 +5404,9 @@ msgstr ""
msgid "Timeago|%s days remaining" msgid "Timeago|%s days remaining"
msgstr "" msgstr ""
msgid "Timeago|%s hours ago"
msgstr ""
msgid "Timeago|%s hours remaining" msgid "Timeago|%s hours remaining"
msgstr "" msgstr ""
...@@ -5405,6 +5422,9 @@ msgstr "" ...@@ -5405,6 +5422,9 @@ msgstr ""
msgid "Timeago|%s months remaining" msgid "Timeago|%s months remaining"
msgstr "" msgstr ""
msgid "Timeago|%s seconds ago"
msgstr ""
msgid "Timeago|%s seconds remaining" msgid "Timeago|%s seconds remaining"
msgstr "" msgstr ""
...@@ -5420,46 +5440,43 @@ msgstr "" ...@@ -5420,46 +5440,43 @@ msgstr ""
msgid "Timeago|%s years remaining" msgid "Timeago|%s years remaining"
msgstr "" msgstr ""
msgid "Timeago|1 day remaining" msgid "Timeago|1 day ago"
msgstr ""
msgid "Timeago|1 hour remaining"
msgstr "" msgstr ""
msgid "Timeago|1 minute remaining" msgid "Timeago|1 day remaining"
msgstr "" msgstr ""
msgid "Timeago|1 month remaining" msgid "Timeago|1 hour ago"
msgstr "" msgstr ""
msgid "Timeago|1 week remaining" msgid "Timeago|1 hour remaining"
msgstr "" msgstr ""
msgid "Timeago|1 year remaining" msgid "Timeago|1 minute ago"
msgstr "" msgstr ""
msgid "Timeago|Past due" msgid "Timeago|1 minute remaining"
msgstr "" msgstr ""
msgid "Timeago|a day ago" msgid "Timeago|1 month ago"
msgstr "" msgstr ""
msgid "Timeago|a month ago" msgid "Timeago|1 month remaining"
msgstr "" msgstr ""
msgid "Timeago|a week ago" msgid "Timeago|1 week ago"
msgstr "" msgstr ""
msgid "Timeago|a year ago" msgid "Timeago|1 week remaining"
msgstr "" msgstr ""
msgid "Timeago|about %s hours ago" msgid "Timeago|1 year ago"
msgstr "" msgstr ""
msgid "Timeago|about a minute ago" msgid "Timeago|1 year remaining"
msgstr "" msgstr ""
msgid "Timeago|about an hour ago" msgid "Timeago|Past due"
msgstr "" msgstr ""
msgid "Timeago|in %s days" msgid "Timeago|in %s days"
...@@ -5501,7 +5518,7 @@ msgstr "" ...@@ -5501,7 +5518,7 @@ msgstr ""
msgid "Timeago|in 1 year" msgid "Timeago|in 1 year"
msgstr "" msgstr ""
msgid "Timeago|less than a minute ago" msgid "Timeago|just now"
msgstr "" msgstr ""
msgid "Timeago|right now" msgid "Timeago|right now"
......
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