Commit 7c4ef7b9 authored by GitLab Bot's avatar GitLab Bot

Add latest changes from gitlab-org/gitlab@master

parent 77d15aff
- expanded = expanded_by_default?
%section.qa-deploy-keys-settings.settings.no-animate#js-deploy-keys-settings{ class: ('expanded' if expanded) }
%section.qa-deploy-keys-settings.settings.no-animate#js-deploy-keys-settings{ class: ('expanded' if expanded), data: { qa_selector: 'deploy_keys_settings' } }
.settings-header
%h4
Deploy Keys
......
......@@ -872,8 +872,9 @@ standby nodes.
If a node fails, it can be removed from the cluster, or added back as a standby
after it has been restored to service.
- If you want to remove the node from the cluster, on any other node in the
cluster, run:
##### Remove a standby from the cluster
From any other node in the cluster, run:
```shell
gitlab-ctl repmgr standby unregister --node=X
......@@ -893,13 +894,15 @@ after it has been restored to service.
959789412
```
Then you will use this id to unregister the node:
Then you will use this ID to unregister the node:
```shell
gitlab-ctl repmgr standby unregister --node=959789412
```
- To add the node as a standby server:
##### Add a node as a standby server
From the stnadby node, run:
```shell
gitlab-ctl repmgr standby follow NEW_MASTER
......@@ -912,6 +915,28 @@ after it has been restored to service.
this will cause a split, and the old master will need to be resynced from
scratch by performing a `gitlab-ctl repmgr standby setup NEW_MASTER`.
##### Add a failed master back into the cluster as a standby node
Once `repmgrd` and PostgreSQL are runnning, the node will need to follow the new
as a standby node.
```
gitlab-ctl repmgr standby follow NEW_MASTER
```
Once the node is following the new master as a standby, the node needs to be
[unregistered from the cluster on the new master node](#remove-a-standby-from-the-cluster).
Once the old master node has been unregistered from the cluster, it will need
to be setup as a new standby:
```
gitlab-ctl repmgr standby setup NEW_MASTER
```
Failure to unregister and readd the old master node can lead to subsequent failovers
not working.
#### Alternate configurations
##### Database authorization
......
......@@ -160,18 +160,6 @@ GIT_CURL_VERBOSE=1 GIT_TRACE=1 git clone <repository>
## Projects
### Find projects
```ruby
# A single project
project = Project.find_by_full_path('PROJECT_PATH')
# All projects in a particular namespace. Can be a username, a group
# ('gitlab-org'), or even include subgroups ('gitlab-org/distribution')
namespace = Namespace.find_by_full_path('NAMESPACE_PATH')
projects = namespace.all_projects
```
### Clear a project's cache
```ruby
......@@ -407,35 +395,6 @@ end
## Users
### Finding users
```ruby
# By username
user = User.find_by(username: '')
# By primary email
user = User.find_by(email: '')
# By any email (primary or secondary)
user = User.find_by_any_email('')
# Admins
User.admins
admin = User.admins.first
```
### Block
```ruby
User.find_by_username().block!
```
### Unblock
```ruby
User.find_by_username().active
```
### Skip reconfirmation
```ruby
......@@ -476,13 +435,6 @@ User.find(123).personal_access_tokens.create(
)
```
### Disable 2FA on a user
```ruby
user = User.find_by_username('username')
user.disable_two_factor!
```
### Active users & Historical users
```ruby
......@@ -546,20 +498,6 @@ group = Group.find_by_full_path 'group'
user.max_member_access_for_group group.id
```
### Change user password
```ruby
password = "your password"
user = User.find_by_username('your username')
password_attributes = {
password: password,
password_confirmation: password,
password_automatically_set: false
}
result = Users::UpdateService.new(user, password_attributes.merge(user: user)).execute
```
## Groups
### Count unique users in a group and sub-groups
......@@ -706,13 +644,6 @@ conflicting_permanent_redirects.destroy_all
## Merge Requests
### Find Merge Request
```ruby
m = project.merge_requests.find_by(iid: <IID>)
m = MergeRequest.find_by_title('NEEDS UNIQUE TITLE!!!')
```
### Close a merge request properly (if merged but still marked as open)
```ruby
......
......@@ -17,12 +17,22 @@ module QA
element :deploy_tokens_settings
end
view 'app/views/projects/deploy_keys/_index.html.haml' do
element :deploy_keys_settings
end
def expand_deploy_tokens(&block)
expand_section(:deploy_tokens_settings) do
Settings::DeployTokens.perform(&block)
end
end
def expand_deploy_keys(&block)
expand_section(:deploy_keys_settings) do
Settings::DeployKeys.perform(&block)
end
end
def expand_runners_settings(&block)
expand_section(:runners_settings_content) do
Settings::Runners.perform(&block)
......
......@@ -7,10 +7,6 @@ module QA
class Repository < Page::Base
include Common
view 'app/views/projects/deploy_keys/_index.html.haml' do
element :deploy_keys_settings
end
view 'app/views/projects/protected_branches/shared/_index.html.haml' do
element :protected_branches_settings
end
......@@ -19,12 +15,6 @@ module QA
element :mirroring_repositories_settings_section
end
def expand_deploy_keys(&block)
expand_section(:deploy_keys_settings) do
DeployKeys.perform(&block)
end
end
def expand_protected_branches(&block)
expand_section(:protected_branches_settings) do
ProtectedBranches.perform(&block)
......
......@@ -23,7 +23,7 @@ module QA
def fabricate!
project.visit!
Page::Project::Menu.perform(&:go_to_repository_settings)
Page::Project::Menu.perform(&:go_to_ci_cd_settings)
Page::Project::Settings::CICD.perform do |setting|
setting.expand_deploy_keys do |page|
......
......@@ -3,7 +3,7 @@
module QA
context 'Release' do
describe 'Deploy key creation' do
it 'user adds a deploy key', quarantine: 'https://gitlab.com/gitlab-org/gitlab/issues/208761' do
it 'user adds a deploy key' do
Flow::Login.sign_in
key = Runtime::Key::RSA.new
......
......@@ -35,7 +35,7 @@ module QA
]
keys.each do |(key_class, bits)|
it "user sets up a deploy key with #{key_class}(#{bits}) to clone code using pipelines", quarantine: 'https://gitlab.com/gitlab-org/gitlab/issues/208761' do
it "user sets up a deploy key with #{key_class}(#{bits}) to clone code using pipelines" do
key = key_class.new(*bits)
Resource::DeployKey.fabricate_via_browser_ui! do |resource|
......
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