BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit 8e6c9e9b by Filipa Lacerda
Options

Merge branch 'master' into 29326-update-documentation

* master: Resolve transient failure in spec/models/user_spec.rb Execute inflections initializer earlier Fix alignment of resolve discussion button Update templates with new CI variables Fix inconsistent deploy key documentation in UI
parents c5083357 4e18e72e
Showing with 54 additions and 47 deletions
app/assets/stylesheets/pages/notes.scss
...@@ -384,7 +384,7 @@ ul.notes { ...@@ -384,7 +384,7 @@ ul.notes {
top: 0; top: 0;
.note-action-button { .note-action-button {
margin-left: 10px; margin-left: 8px;
} }
} }
...@@ -400,8 +400,7 @@ ul.notes { ...@@ -400,8 +400,7 @@ ul.notes {
} }
.note-action-button { .note-action-button {
display: inline-block; display: inline;
margin-left: 0;
line-height: 20px; line-height: 20px;
@media (min-width: $screen-sm-min) { @media (min-width: $screen-sm-min) {
...@@ -540,7 +539,6 @@ ul.notes { ...@@ -540,7 +539,6 @@ ul.notes {
} }
.line-resolve-btn { .line-resolve-btn {
display: inline-block;
position: relative; position: relative;
top: 2px; top: 2px;
padding: 0; padding: 0;
...@@ -563,8 +561,9 @@ ul.notes { ...@@ -563,8 +561,9 @@ ul.notes {
} }
svg { svg {
position: relative;
fill: $gray-darkest; fill: $gray-darkest;
height: 15px;
width: 15px;
} }
} }
......
app/views/projects/deploy_keys/_index.html.haml
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
%h4.prepend-top-0 %h4.prepend-top-0
Deploy Keys Deploy Keys
%p %p
Deploy keys allow read-only access to your repository. Deploy keys can be used for CI, staging or production servers. You can create a deploy key or add an existing one. Deploy keys allow read-only or read-write (if enabled) access to your repository. Deploy keys can be used for CI, staging or production servers. You can create a deploy key or add an existing one.
.col-lg-9 .col-lg-9
%h5.prepend-top-0 %h5.prepend-top-0
Create a new deploy key for this project Create a new deploy key for this project
......
app/views/projects/notes/_note.html.haml
...@@ -43,18 +43,17 @@ ...@@ -43,18 +43,17 @@
"inline-template" => true, "inline-template" => true,
"ref" => "note_#{note.id}" } "ref" => "note_#{note.id}" }
.note-action-button %button.note-action-button.line-resolve-btn{ type: "button",
class: ("is-disabled" unless can_resolve),
":class" => "{ 'is-active': isResolved }",
":aria-label" => "buttonText",
"@click" => "resolve",
":title" => "buttonText",
"v-show" => "!loading",
":ref" => "'button'" }
= icon("spin spinner", "v-show" => "loading") = icon("spin spinner", "v-show" => "loading")
%button.line-resolve-btn{ type: "button",
class: ("is-disabled" unless can_resolve),
":class" => "{ 'is-active': isResolved }",
":aria-label" => "buttonText",
"@click" => "resolve",
":title" => "buttonText",
"v-show" => "!loading",
":ref" => "'button'" }
= render "shared/icons/icon_status_success.svg" = render "shared/icons/icon_status_success.svg"
- if current_user - if current_user
- if note.emoji_awardable? - if note.emoji_awardable?
......
changelogs/unreleased/29189-discussion-button.yml 0 → 100644
---
title: Fix alignment of resolve button
merge_request:
author:
changelogs/unreleased/29328-fix-transient-failure-in-model-user-spec.yml 0 → 100644
---
title: Add custom attributes in factories
merge_request: 9892
author: George Andrinopoulos
spec/models/user_spec.rb
...@@ -713,8 +713,9 @@ describe User, models: true do ...@@ -713,8 +713,9 @@ describe User, models: true do
describe '.search_with_secondary_emails' do describe '.search_with_secondary_emails' do
delegate :search_with_secondary_emails, to: :described_class delegate :search_with_secondary_emails, to: :described_class
let!(:user) { create(:user) } let!(:user) { create(:user, name: 'John Doe', username: 'john.doe', email: 'john.doe@example.com' ) }
let!(:email) { create(:email) } let!(:another_user) { create(:user, name: 'Albert Smith', username: 'albert.smith', email: 'albert.smith@example.com' ) }
let!(:email) { create(:email, user: another_user) }
it 'returns users with a matching name' do it 'returns users with a matching name' do
expect(search_with_secondary_emails(user.name)).to eq([user]) expect(search_with_secondary_emails(user.name)).to eq([user])
......
vendor/gitlab-ci-yml/Docker.gitlab-ci.yml
...@@ -7,7 +7,7 @@ services: ...@@ -7,7 +7,7 @@ services:
build: build:
stage: build stage: build
script: script:
- export IMAGE_TAG=$(echo -en $CI_BUILD_REF_NAME | tr -c '[:alnum:]_.-' '-') - export IMAGE_TAG=$(echo -en $CI_COMMIT_REF_NAME | tr -c '[:alnum:]_.-' '-')
- docker login -u "gitlab-ci-token" -p "$CI_BUILD_TOKEN" $CI_REGISTRY - docker login -u "gitlab-ci-token" -p "$CI_JOB_TOKEN" $CI_REGISTRY
- docker build --pull -t "$CI_REGISTRY_IMAGE:$IMAGE_TAG" . - docker build --pull -t "$CI_REGISTRY_IMAGE:$IMAGE_TAG" .
- docker push "$CI_REGISTRY_IMAGE:$IMAGE_TAG" - docker push "$CI_REGISTRY_IMAGE:$IMAGE_TAG"
vendor/gitlab-ci-yml/Maven.gitlab-ci.yml
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
# For docker image tags see https://hub.docker.com/_/maven/ # For docker image tags see https://hub.docker.com/_/maven/
# #
# For general lifecycle information see https://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html # For general lifecycle information see https://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html
# #
# This template will build and test your projects as well as create the documentation. # This template will build and test your projects as well as create the documentation.
# #
# * Caches downloaded dependencies and plugins between invocation. # * Caches downloaded dependencies and plugins between invocation.
# * Does only verify merge requests but deploy built artifacts of the # * Does only verify merge requests but deploy built artifacts of the
# master branch. # master branch.
...@@ -24,12 +24,12 @@ variables: ...@@ -24,12 +24,12 @@ variables:
MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version -DinstallAtEnd=true -DdeployAtEnd=true" MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version -DinstallAtEnd=true -DdeployAtEnd=true"
# Cache downloaded dependencies and plugins between builds. # Cache downloaded dependencies and plugins between builds.
# To keep cache across branches add 'key: "$CI_BUILD_REF_NAME"' # To keep cache across branches add 'key: "$CI_JOB_REF_NAME"'
cache: cache:
paths: paths:
- .m2/repository - .m2/repository
# This will only validate and compile stuff and run e.g. maven-enforcer-plugin. # This will only validate and compile stuff and run e.g. maven-enforcer-plugin.
# Because some enforcer rules might check dependency convergence and class duplications # Because some enforcer rules might check dependency convergence and class duplications
# we use `test-compile` here instead of `validate`, so the correct classpath is picked up. # we use `test-compile` here instead of `validate`, so the correct classpath is picked up.
.validate: &validate .validate: &validate
......
vendor/gitlab-ci-yml/OpenShift.gitlab-ci.yml
...@@ -38,11 +38,11 @@ review: ...@@ -38,11 +38,11 @@ review:
<<: *deploy <<: *deploy
stage: review stage: review
variables: variables:
APP: $CI_BUILD_REF_NAME APP: $CI_COMMIT_REF_NAME
APP_HOST: $CI_PROJECT_NAME-$CI_BUILD_REF_NAME.$OPENSHIFT_DOMAIN APP_HOST: $CI_PROJECT_NAME-$CI_ENVIRONMENT_SLUG.$OPENSHIFT_DOMAIN
environment: environment:
name: review/$CI_BUILD_REF_NAME name: review/$CI_COMMIT_REF_SLUG
url: http://$CI_PROJECT_NAME-$CI_BUILD_REF_NAME.$OPENSHIFT_DOMAIN url: http://$CI_PROJECT_NAME-$CI_ENVIRONMENT_SLUG.$OPENSHIFT_DOMAIN
on_stop: stop-review on_stop: stop-review
only: only:
- branches - branches
...@@ -56,10 +56,10 @@ stop-review: ...@@ -56,10 +56,10 @@ stop-review:
- oc delete all -l "app=$APP" - oc delete all -l "app=$APP"
when: manual when: manual
variables: variables:
APP: $CI_BUILD_REF_NAME APP: $CI_COMMIT_REF_NAME
GIT_STRATEGY: none GIT_STRATEGY: none
environment: environment:
name: review/$CI_BUILD_REF_NAME name: review/$CI_COMMIT_REF_SLUG
action: stop action: stop
only: only:
- branches - branches
......
vendor/gitlab-ci-yml/autodeploy/Kubernetes.gitlab-ci.yml
...@@ -24,12 +24,12 @@ build: ...@@ -24,12 +24,12 @@ build:
production: production:
stage: production stage: production
variables: variables:
CI_ENVIRONMENT_URL: http://production.$KUBE_DOMAIN CI_ENVIRONMENT_URL: http://$CI_PROJECT_NAME.$KUBE_DOMAIN
script: script:
- command deploy - command deploy
environment: environment:
name: production name: production
url: http://production.$KUBE_DOMAIN url: http://$CI_PROJECT_NAME.$KUBE_DOMAIN
when: manual when: manual
only: only:
- master - master
...@@ -37,24 +37,24 @@ production: ...@@ -37,24 +37,24 @@ production:
staging: staging:
stage: staging stage: staging
variables: variables:
CI_ENVIRONMENT_URL: http://staging.$KUBE_DOMAIN CI_ENVIRONMENT_URL: http://$CI_PROJECT_NAME-staging.$KUBE_DOMAIN
script: script:
- command deploy - command deploy
environment: environment:
name: staging name: staging
url: http://staging.$KUBE_DOMAIN url: http://$CI_PROJECT_NAME-staging.$KUBE_DOMAIN
only: only:
- master - master
review: review:
stage: review stage: review
variables: variables:
CI_ENVIRONMENT_URL: http://$CI_ENVIRONMENT_SLUG.$KUBE_DOMAIN CI_ENVIRONMENT_URL: http://$CI_PROJECT_NAME-$CI_ENVIRONMENT_SLUG.$KUBE_DOMAIN
script: script:
- command deploy - command deploy
environment: environment:
name: review/$CI_BUILD_REF_NAME name: review/$CI_COMMIT_REF_NAME
url: http://$CI_ENVIRONMENT_SLUG.$KUBE_DOMAIN url: http://$CI_PROJECT_NAME-$CI_ENVIRONMENT_SLUG.$KUBE_DOMAIN
on_stop: stop_review on_stop: stop_review
only: only:
- branches - branches
...@@ -68,7 +68,7 @@ stop_review: ...@@ -68,7 +68,7 @@ stop_review:
script: script:
- command destroy - command destroy
environment: environment:
name: review/$CI_BUILD_REF_NAME name: review/$CI_COMMIT_REF_NAME
action: stop action: stop
when: manual when: manual
only: only:
......
vendor/gitlab-ci-yml/autodeploy/OpenShift.gitlab-ci.yml
# Explaination on the scripts: # Explanation on the scripts:
# https://gitlab.com/gitlab-examples/openshift-deploy/blob/master/README.md # https://gitlab.com/gitlab-examples/openshift-deploy/blob/master/README.md
image: registry.gitlab.com/gitlab-examples/openshift-deploy image: registry.gitlab.com/gitlab-examples/openshift-deploy
...@@ -24,12 +24,12 @@ build: ...@@ -24,12 +24,12 @@ build:
production: production:
stage: production stage: production
variables: variables:
CI_ENVIRONMENT_URL: http://production.$KUBE_DOMAIN CI_ENVIRONMENT_URL: http://$CI_PROJECT_NAME.$KUBE_DOMAIN
script: script:
- command deploy - command deploy
environment: environment:
name: production name: production
url: http://production.$KUBE_DOMAIN url: http://$CI_PROJECT_NAME.$KUBE_DOMAIN
when: manual when: manual
only: only:
- master - master
...@@ -37,24 +37,24 @@ production: ...@@ -37,24 +37,24 @@ production:
staging: staging:
stage: staging stage: staging
variables: variables:
CI_ENVIRONMENT_URL: http://staging.$KUBE_DOMAIN CI_ENVIRONMENT_URL: http://$CI_PROJECT_NAME-staging.$KUBE_DOMAIN
script: script:
- command deploy - command deploy
environment: environment:
name: staging name: staging
url: http://staging.$KUBE_DOMAIN url: http://$CI_PROJECT_NAME-staging.$KUBE_DOMAIN
only: only:
- master - master
review: review:
stage: review stage: review
variables: variables:
CI_ENVIRONMENT_URL: http://$CI_ENVIRONMENT_SLUG.$KUBE_DOMAIN CI_ENVIRONMENT_URL: http://$CI_PROJECT_NAME-$CI_ENVIRONMENT_SLUG.$KUBE_DOMAIN
script: script:
- command deploy - command deploy
environment: environment:
name: review/$CI_BUILD_REF_NAME name: review/$CI_COMMIT_REF_NAME
url: http://$CI_ENVIRONMENT_SLUG.$KUBE_DOMAIN url: http://$CI_PROJECT_NAME-$CI_ENVIRONMENT_SLUG.$KUBE_DOMAIN
on_stop: stop_review on_stop: stop_review
only: only:
- branches - branches
...@@ -68,7 +68,7 @@ stop_review: ...@@ -68,7 +68,7 @@ stop_review:
script: script:
- command destroy - command destroy
environment: environment:
name: review/$CI_BUILD_REF_NAME name: review/$CI_COMMIT_REF_NAME
action: stop action: stop
when: manual when: manual
only: only:
......
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