Commit 3e93275e authored by GitLab Bot's avatar GitLab Bot

Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-18

# Conflicts:
#	app/views/layouts/header/_help_dropdown.html.haml

[ci skip]
parents e3dd2680 dfee19c4
...@@ -4,5 +4,8 @@ ...@@ -4,5 +4,8 @@
= link_to _("Help"), help_path = link_to _("Help"), help_path
- if current_user_menu?(:help) || current_user_menu?(:settings) || current_user_menu?(:profile) - if current_user_menu?(:help) || current_user_menu?(:settings) || current_user_menu?(:profile)
= render 'shared/user_dropdown_contributing_link' = render 'shared/user_dropdown_contributing_link'
<<<<<<< HEAD
- if instance_review_permitted? - if instance_review_permitted?
= render 'shared/user_dropdown_instance_review' = render 'shared/user_dropdown_instance_review'
=======
>>>>>>> upstream/master
---
title: Re-arrange help-related user menu items into new Help menu
merge_request: 22195
author:
type: added
---
title: 'Rails5: fix deployment model spec'
merge_request: 22428
author: Jasper Maes
type: other
...@@ -451,16 +451,6 @@ preview the changes. The docs URL can be found in two places: ...@@ -451,16 +451,6 @@ preview the changes. The docs URL can be found in two places:
- In the output of the `review-docs-deploy*` job, which also includes the - In the output of the `review-docs-deploy*` job, which also includes the
triggered pipeline so that you can investigate whether something went wrong triggered pipeline so that you can investigate whether something went wrong
In case the Review App URL returns 404, follow these steps to debug:
1. **Did you follow the URL from the merge request widget?** If yes, then check if
the link is the same as the one in the job output.
1. **Did you follow the URL from the job output?** If yes, then it means that
either the site is not yet deployed or something went wrong with the remote
pipeline. Give it a few minutes and it should appear online, otherwise you
can check the status of the remote pipeline from the link in the job output.
If the pipeline failed or got stuck, drop a line in the `#docs` chat channel.
TIP: **Tip:** TIP: **Tip:**
Someone that has no merge rights to the CE/EE projects (think of forks from Someone that has no merge rights to the CE/EE projects (think of forks from
contributors) will not be able to run the manual job. In that case, you can contributors) will not be able to run the manual job. In that case, you can
...@@ -472,6 +462,18 @@ working on. If you don't, the remote docs branch won't be removed either, ...@@ -472,6 +462,18 @@ working on. If you don't, the remote docs branch won't be removed either,
and the server where the Review Apps are hosted will eventually be out of and the server where the Review Apps are hosted will eventually be out of
disk space. disk space.
### Troubleshooting review apps
In case the review app URL returns 404, follow these steps to debug:
1. **Did you follow the URL from the merge request widget?** If yes, then check if
the link is the same as the one in the job output.
1. **Did you follow the URL from the job output?** If yes, then it means that
either the site is not yet deployed or something went wrong with the remote
pipeline. Give it a few minutes and it should appear online, otherwise you
can check the status of the remote pipeline from the link in the job output.
If the pipeline failed or got stuck, drop a line in the `#docs` chat channel.
### Technical aspects ### Technical aspects
If you want to know the hot details, here's what's really happening: If you want to know the hot details, here's what's really happening:
......
...@@ -142,9 +142,49 @@ fancy words. The docs should be clear and easy to understand. ...@@ -142,9 +142,49 @@ fancy words. The docs should be clear and easy to understand.
<!-- ## Troubleshooting <!-- ## Troubleshooting
Add a troubleshooting guide when possible/applicable. --> Add a troubleshooting guide when possible/applicable. -->
```
---
Notes: Notes:
- (1): Apply the [tier badges](styleguide.md#product-badges) accordingly - (1): Apply the [tier badges](https://docs.gitlab.com/ee/development/documentation/styleguide.html#product-badges) accordingly
- (2): Apply the correct format for the [GitLab version introducing the feature](styleguide.md#gitlab-versions-and-tiers) - (2): Apply the correct format for the [GitLab version introducing the feature](https://docs.gitlab.com/ee/development/documentation/styleguide.html#gitlab-versions-and-tiers)
```
## Help and feedback section
The "help and feedback" section (introduced by [!319](https://gitlab.com/gitlab-com/gitlab-docs/merge_requests/319)) displayed at the end of each document
can be omitted from the doc by adding a key into the its frontmatter:
```yaml
---
feedback: false
---
```
The default is to leave it there. If you want to omit it from a document,
you must check with a technical writer before doing so.
### Disqus
We also have integrated the docs site with Disqus (introduced by
[!151](https://gitlab.com/gitlab-com/gitlab-docs/merge_requests/151)),
allowing our users to post comments.
To omit only the comments from the feedback section, use the following
key on the frontmatter:
```yaml
---
comments: false
---
```
We are only hiding comments in main index pages, such as [the main documentation index](../../README.md), since its content is too broad to comment on. Before omitting Disqus,
you must check with a technical writer.
Note that once `feedback: false` is added to the frontmatter, it will automatically omit
Disqus, therefore, don't add both keys to the same document.
The click events in the feedback section are tracked with Google Tag Manager. The
conversions can be viewed on Google Analytics by navigating to **Behavior > Events > Top events > docs**.
...@@ -216,7 +216,7 @@ twice, which can lead to confusion during deployments. ...@@ -216,7 +216,7 @@ twice, which can lead to confusion during deployments.
| [Ingress](https://kubernetes.io/docs/concepts/services-networking/ingress/) | 10.2+ | Ingress can provide load balancing, SSL termination, and name-based virtual hosting. It acts as a web proxy for your applications and is useful if you want to use [Auto DevOps] or deploy your own web apps. | [stable/nginx-ingress](https://github.com/helm/charts/tree/master/stable/nginx-ingress) | | [Ingress](https://kubernetes.io/docs/concepts/services-networking/ingress/) | 10.2+ | Ingress can provide load balancing, SSL termination, and name-based virtual hosting. It acts as a web proxy for your applications and is useful if you want to use [Auto DevOps] or deploy your own web apps. | [stable/nginx-ingress](https://github.com/helm/charts/tree/master/stable/nginx-ingress) |
| [Prometheus](https://prometheus.io/docs/introduction/overview/) | 10.4+ | Prometheus is an open-source monitoring and alerting system useful to supervise your deployed applications. | [stable/prometheus](https://github.com/helm/charts/tree/master/stable/prometheus) | | [Prometheus](https://prometheus.io/docs/introduction/overview/) | 10.4+ | Prometheus is an open-source monitoring and alerting system useful to supervise your deployed applications. | [stable/prometheus](https://github.com/helm/charts/tree/master/stable/prometheus) |
| [GitLab Runner](https://docs.gitlab.com/runner/) | 10.6+ | GitLab Runner is the open source project that is used to run your jobs and send the results back to GitLab. It is used in conjunction with [GitLab CI/CD](https://about.gitlab.com/features/gitlab-ci-cd/), the open-source continuous integration service included with GitLab that coordinates the jobs. When installing the GitLab Runner via the applications, it will run in **privileged mode** by default. Make sure you read the [security implications](#security-implications) before doing so. | [runner/gitlab-runner](https://gitlab.com/charts/gitlab-runner) | | [GitLab Runner](https://docs.gitlab.com/runner/) | 10.6+ | GitLab Runner is the open source project that is used to run your jobs and send the results back to GitLab. It is used in conjunction with [GitLab CI/CD](https://about.gitlab.com/features/gitlab-ci-cd/), the open-source continuous integration service included with GitLab that coordinates the jobs. When installing the GitLab Runner via the applications, it will run in **privileged mode** by default. Make sure you read the [security implications](#security-implications) before doing so. | [runner/gitlab-runner](https://gitlab.com/charts/gitlab-runner) |
| [JupyterHub](http://jupyter.org/) | 11.0+ | [JupyterHub](https://jupyterhub.readthedocs.io/en/stable/) is a multi-user service for managing notebooks across a team. [Jupyter Notebooks](https://jupyter-notebook.readthedocs.io/en/latest/) provide a web-based interactive programming environment used for data analysis, visualization, and machine learning. We use [this](https://gitlab.com/gitlab-org/jupyterhub-user-image/blob/master/Dockerfile) custom Jupyter image that installs additional useful packages on top of the base Jupyter. You will also see ready-to-use DevOps Runbooks built with [Rubix](https://github.com/amit1rrr/rubix). **Note**: Authentication will be enabled for any user of the GitLab server via OAuth2. HTTPS will be supported in a future release. | [jupyter/jupyterhub](https://jupyterhub.github.io/helm-chart/) | | [JupyterHub](http://jupyter.org/) | 11.0+ | [JupyterHub](https://jupyterhub.readthedocs.io/en/stable/) is a multi-user service for managing notebooks across a team. [Jupyter Notebooks](https://jupyter-notebook.readthedocs.io/en/latest/) provide a web-based interactive programming environment used for data analysis, visualization, and machine learning. We use [this](https://gitlab.com/gitlab-org/jupyterhub-user-image/blob/master/Dockerfile) custom Jupyter image that installs additional useful packages on top of the base Jupyter. You will also see ready-to-use DevOps Runbooks built with Nurtch's [Rubix library](https://github.com/amit1rrr/rubix). More information on creating executable runbooks can be found at [Nurtch Documentation](http://docs.nurtch.com/en/latest). **Note**: Authentication will be enabled for any user of the GitLab server via OAuth2. HTTPS will be supported in a future release. | [jupyter/jupyterhub](https://jupyterhub.github.io/helm-chart/) |
## Getting the external IP address ## Getting the external IP address
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
# frozen_string_literal: true # frozen_string_literal: true
unless Rails.env.production? unless Rails.env.production?
require 'haml_lint/haml_visitor' require_dependency 'haml_lint/haml_visitor'
require 'haml_lint/linter' require_dependency 'haml_lint/linter'
require 'haml_lint/linter_registry' require_dependency 'haml_lint/linter_registry'
module HamlLint module HamlLint
class Linter::InlineJavaScript < Linter class Linter::InlineJavaScript < Linter
......
...@@ -254,8 +254,7 @@ module QA ...@@ -254,8 +254,7 @@ module QA
project.name = 'project-to-create-a-shirt' project.name = 'project-to-create-a-shirt'
end end
# Attribute inherited from the Shirt factory if present, # Attribute from the Browser UI (using the block)
# or from the Browser UI otherwise (using the block)
product :brand do product :brand do
Page::Shirt::Show.perform do |shirt_show| Page::Shirt::Show.perform do |shirt_show|
shirt_show.fetch_brand_from_page shirt_show.fetch_brand_from_page
...@@ -347,8 +346,7 @@ module QA ...@@ -347,8 +346,7 @@ module QA
project.name = 'project-to-create-a-shirt' project.name = 'project-to-create-a-shirt'
end end
# Attribute fetched from the API response if present if present, # Attribute fetched from the API response if present,
# or from the Shirt factory if present,
# or from the Browser UI otherwise (using the block) # or from the Browser UI otherwise (using the block)
product :brand do product :brand do
Page::Shirt::Show.perform do |shirt_show| Page::Shirt::Show.perform do |shirt_show|
...@@ -356,7 +354,7 @@ module QA ...@@ -356,7 +354,7 @@ module QA
end end
end end
# Attribute fetched from the API response if present if present, # Attribute fetched from the API response if present,
# or from the Shirt factory if present, # or from the Shirt factory if present,
# or a QA::Factory::Product::NoValueError is raised otherwise # or a QA::Factory::Product::NoValueError is raised otherwise
product :name product :name
...@@ -414,9 +412,9 @@ end ...@@ -414,9 +412,9 @@ end
**Notes on attributes precedence:** **Notes on attributes precedence:**
- attributes from the API response take precedence over attributes from the - attributes from the API response take precedence over attributes from the
Browser UI
- attributes from the Browser UI take precedence over attributes from the
factory (i.e inherited) factory (i.e inherited)
- attributes from the factory (i.e inherited) take precedence over attributes
from the Browser UI
- attributes without a value will raise a `QA::Factory::Product::NoValueError` error - attributes without a value will raise a `QA::Factory::Product::NoValueError` error
## Creating resources in your tests ## Creating resources in your tests
......
...@@ -57,7 +57,7 @@ describe Deployment do ...@@ -57,7 +57,7 @@ describe Deployment do
last_deployments = described_class.last_for_environment([staging, production, testing]) last_deployments = described_class.last_for_environment([staging, production, testing])
expect(last_deployments.size).to eq(2) expect(last_deployments.size).to eq(2)
expect(last_deployments).to eq(deployments.last(2)) expect(last_deployments).to match_array(deployments.last(2))
end end
end end
end end
......
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