Commit 32d52eb6 authored by GitLab Bot's avatar GitLab Bot

Add latest changes from gitlab-org/gitlab@master

parent 66ce6a78
......@@ -15,27 +15,15 @@ In June 2019, Mario de la Ossa hosted a [Deep Dive] on GitLab's [Elasticsearch i
[Google Slides]: https://docs.google.com/presentation/d/1H-pCzI_LNrgrL5pJAIQgvLX8Ji0-jIKOg1QeJQzChug/edit
[PDF]: https://gitlab.com/gitlab-org/create-stage/uploads/c5aa32b6b07476fa8b597004899ec538/Elasticsearch_Deep_Dive.pdf
## Initial installation on OS X
## Supported Versions
It is recommended to use the Docker image. After installing docker you can immediately spin up an instance with
See [Version Requirements](../integration/elasticsearch.md#version-requirements).
```
docker run --name elastic56 -p 9200:9200 -p 9300:9300 -e "discovery.type=single-node" docker.elastic.co/elasticsearch/elasticsearch:5.6.12
```
and use `docker stop elastic56` and `docker start elastic56` to stop/start it.
### Installing on the host
Developers making significant changes to Elasticsearch queries should test their features against all our supported versions.
We currently only support Elasticsearch [5.6 to 6.x](../integration/elasticsearch.md#version-requirements)
Version 5.6 is available on homebrew and is the recommended version to use in order to test compatibility.
```
brew install elasticsearch@5.6
```
## Setting up development environment
There is no need to install any plugins
See the [Elasticsearch GDK setup instructions](https://gitlab.com/gitlab-org/gitlab-development-kit/blob/master/doc/howto/elasticsearch.md)
## Helpful rake tasks
......
This diff is collapsed.
......@@ -377,6 +377,11 @@ This operation is safe as there's no code using the table just yet.
Dropping tables can be done safely using a post-deployment migration, but only
if the application no longer uses the table.
## Renaming Tables
Renaming tables requires downtime as an application may continue
using the old table name during/after a database migration.
## Adding Foreign Keys
Adding foreign keys usually works in 3 steps:
......
---
redirect_to: '../instance_statistics/dev_ops_score.md'
---
This document was moved to [another location](../instance_statistics/dev_ops_score.md).
# DevOps Score
> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/issues/30469) in GitLab 9.3.
> [Renamed from Conversational Development Index](https://gitlab.com/gitlab-org/gitlab/issues/20976) in GitLab 12.6.
NOTE: **Note:**
......
......@@ -177,7 +177,7 @@ module QA
# The number of selectors should be able to be reduced after
# migration to the new spinner is complete.
# https://gitlab.com/groups/gitlab-org/-/epics/956
has_no_css?('.gl-spinner, .fa-spinner, .spinner', wait: Capybara.default_max_wait_time)
has_no_css?('.gl-spinner, .fa-spinner, .spinner', wait: QA::Support::Repeater::DEFAULT_MAX_WAIT_TIME)
end
def finished_loading_block?
......
......@@ -155,6 +155,8 @@ module QA
def merge!
click_element :merge_button if ready_to_merge?
finished_loading?
raise "Merge did not appear to be successful" unless merged?
end
......
......@@ -31,6 +31,12 @@ module QA
resource_web_url(api_post)
end
def reload!
api_get
self
end
def remove_via_api!
api_delete
end
......
......@@ -16,6 +16,7 @@ module QA
attribute :id
attribute :name
attribute :runners_token
def initialize
@path = Runtime::Namespace.name
......
......@@ -7,7 +7,7 @@ require 'rubygems'
# In newer Ruby, alias_method is not private then we don't need __send__
singleton_class.__send__(:alias_method, :require_dependency, :require) # rubocop:disable GitlabSecurity/PublicSend
$:.unshift(File.expand_path('../lib', __dir__))
$:.unshift(File.expand_path('../../lib', __dir__))
require 'rspec_flaky/report'
......
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