kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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
This commit is contained in:
Filipa Lacerda 2017-03-13 10:09:17 +00:00
parent c508335719 4e18e72e81
commit 8e6c9e9bd9
12 changed files with 54 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/stylesheets/pages/notes.scss
View File

@ -384,7 +384,7 @@ ul.notes {
top: 0;
.note-action-button {
margin-left: 10px;
margin-left: 8px;
}
}
@ -400,8 +400,7 @@ ul.notes {
}
.note-action-button {
display: inline-block;
margin-left: 0;
display: inline;
line-height: 20px;
@media (min-width: $screen-sm-min) {
@ -540,7 +539,6 @@ ul.notes {
}
.line-resolve-btn {
display: inline-block;
position: relative;
top: 2px;
padding: 0;
@ -563,8 +561,9 @@ ul.notes {
}
svg {
position: relative;
fill: $gray-darkest;
height: 15px;
width: 15px;
}
}

2
app/views/projects/deploy_keys/_index.html.haml
View File

@ -3,7 +3,7 @@
%h4.prepend-top-0
Deploy Keys
%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
%h5.prepend-top-0
Create a new deploy key for this project

19
app/views/projects/notes/_note.html.haml
View File

@ -43,18 +43,17 @@
"inline-template" => true,
"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")
%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 note.emoji_awardable?

4
changelogs/unreleased/29189-discussion-button.yml Normal file
View File

@ -0,0 +1,4 @@
---
title: Fix alignment of resolve button
merge_request:
author:

4
changelogs/unreleased/29328-fix-transient-failure-in-model-user-spec.yml Normal file
View File

@ -0,0 +1,4 @@
---
title: Add custom attributes in factories
merge_request: 9892
author: George Andrinopoulos

0
config/initializers/inflections.rb → config/initializers/0_inflections.rb
View File

5
spec/models/user_spec.rb
View File

@ -713,8 +713,9 @@ describe User, models: true do
describe '.search_with_secondary_emails' do
delegate :search_with_secondary_emails, to: :described_class
let!(:user) { create(:user) }
let!(:email) { create(:email) }
let!(:user) { create(:user, name: 'John Doe', username: 'john.doe', email: 'john.doe@example.com' ) }
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
expect(search_with_secondary_emails(user.name)).to eq([user])

4
vendor/gitlab-ci-yml/Docker.gitlab-ci.yml vendored
View File

@ -7,7 +7,7 @@ services:
build:
stage: build
script:
- export IMAGE_TAG=$(echo -en $CI_BUILD_REF_NAME | tr -c '[:alnum:]_.-' '-')
- docker login -u "gitlab-ci-token" -p "$CI_BUILD_TOKEN" $CI_REGISTRY
- export IMAGE_TAG=$(echo -en $CI_COMMIT_REF_NAME | tr -c '[:alnum:]_.-' '-')
- docker login -u "gitlab-ci-token" -p "$CI_JOB_TOKEN" $CI_REGISTRY
- docker build --pull -t "$CI_REGISTRY_IMAGE:$IMAGE_TAG" .
- docker push "$CI_REGISTRY_IMAGE:$IMAGE_TAG"

8
vendor/gitlab-ci-yml/Maven.gitlab-ci.yml vendored
View File

@ -3,9 +3,9 @@
# 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
#
#
# This template will build and test your projects as well as create the documentation.
#
#
# * Caches downloaded dependencies and plugins between invocation.
# * Does only verify merge requests but deploy built artifacts of the
# master branch.
@ -24,12 +24,12 @@ variables:
MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version -DinstallAtEnd=true -DdeployAtEnd=true"
# 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:
paths:
- .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
# we use `test-compile` here instead of `validate`, so the correct classpath is picked up.
.validate: &validate

12
vendor/gitlab-ci-yml/OpenShift.gitlab-ci.yml vendored
View File

@ -38,11 +38,11 @@ review:
<<: *deploy
stage: review
variables:
APP: $CI_BUILD_REF_NAME
APP_HOST: $CI_PROJECT_NAME-$CI_BUILD_REF_NAME.$OPENSHIFT_DOMAIN
APP: $CI_COMMIT_REF_NAME
APP_HOST: $CI_PROJECT_NAME-$CI_ENVIRONMENT_SLUG.$OPENSHIFT_DOMAIN
environment:
name: review/$CI_BUILD_REF_NAME
url: http://$CI_PROJECT_NAME-$CI_BUILD_REF_NAME.$OPENSHIFT_DOMAIN
name: review/$CI_COMMIT_REF_SLUG
url: http://$CI_PROJECT_NAME-$CI_ENVIRONMENT_SLUG.$OPENSHIFT_DOMAIN
on_stop: stop-review
only:
- branches
@ -56,10 +56,10 @@ stop-review:
- oc delete all -l "app=$APP"
when: manual
variables:
APP: $CI_BUILD_REF_NAME
APP: $CI_COMMIT_REF_NAME
GIT_STRATEGY: none
environment:
name: review/$CI_BUILD_REF_NAME
name: review/$CI_COMMIT_REF_SLUG
action: stop
only:
- branches

16
vendor/gitlab-ci-yml/autodeploy/Kubernetes.gitlab-ci.yml vendored
View File

@ -24,12 +24,12 @@ build:
production:
stage: production
variables:
CI_ENVIRONMENT_URL: http://production.$KUBE_DOMAIN
CI_ENVIRONMENT_URL: http://$CI_PROJECT_NAME.$KUBE_DOMAIN
script:
- command deploy
environment:
name: production
url: http://production.$KUBE_DOMAIN
url: http://$CI_PROJECT_NAME.$KUBE_DOMAIN
when: manual
only:
- master
@ -37,24 +37,24 @@ production:
staging:
stage: staging
variables:
CI_ENVIRONMENT_URL: http://staging.$KUBE_DOMAIN
CI_ENVIRONMENT_URL: http://$CI_PROJECT_NAME-staging.$KUBE_DOMAIN
script:
- command deploy
environment:
name: staging
url: http://staging.$KUBE_DOMAIN
url: http://$CI_PROJECT_NAME-staging.$KUBE_DOMAIN
only:
- master
review:
stage: review
variables:
CI_ENVIRONMENT_URL: http://$CI_ENVIRONMENT_SLUG.$KUBE_DOMAIN
CI_ENVIRONMENT_URL: http://$CI_PROJECT_NAME-$CI_ENVIRONMENT_SLUG.$KUBE_DOMAIN
script:
- command deploy
environment:
name: review/$CI_BUILD_REF_NAME
url: http://$CI_ENVIRONMENT_SLUG.$KUBE_DOMAIN
name: review/$CI_COMMIT_REF_NAME
url: http://$CI_PROJECT_NAME-$CI_ENVIRONMENT_SLUG.$KUBE_DOMAIN
on_stop: stop_review
only:
- branches
@ -68,7 +68,7 @@ stop_review:
script:
- command destroy
environment:
name: review/$CI_BUILD_REF_NAME
name: review/$CI_COMMIT_REF_NAME
action: stop
when: manual
only:

18
vendor/gitlab-ci-yml/autodeploy/OpenShift.gitlab-ci.yml vendored
View File

@ -1,4 +1,4 @@
# Explaination on the scripts:
# Explanation on the scripts:
# https://gitlab.com/gitlab-examples/openshift-deploy/blob/master/README.md
image: registry.gitlab.com/gitlab-examples/openshift-deploy
@ -24,12 +24,12 @@ build:
production:
stage: production
variables:
CI_ENVIRONMENT_URL: http://production.$KUBE_DOMAIN
CI_ENVIRONMENT_URL: http://$CI_PROJECT_NAME.$KUBE_DOMAIN
script:
- command deploy
environment:
name: production
url: http://production.$KUBE_DOMAIN
url: http://$CI_PROJECT_NAME.$KUBE_DOMAIN
when: manual
only:
- master
@ -37,24 +37,24 @@ production:
staging:
stage: staging
variables:
CI_ENVIRONMENT_URL: http://staging.$KUBE_DOMAIN
CI_ENVIRONMENT_URL: http://$CI_PROJECT_NAME-staging.$KUBE_DOMAIN
script:
- command deploy
environment:
name: staging
url: http://staging.$KUBE_DOMAIN
url: http://$CI_PROJECT_NAME-staging.$KUBE_DOMAIN
only:
- master
review:
stage: review
variables:
CI_ENVIRONMENT_URL: http://$CI_ENVIRONMENT_SLUG.$KUBE_DOMAIN
CI_ENVIRONMENT_URL: http://$CI_PROJECT_NAME-$CI_ENVIRONMENT_SLUG.$KUBE_DOMAIN
script:
- command deploy
environment:
name: review/$CI_BUILD_REF_NAME
url: http://$CI_ENVIRONMENT_SLUG.$KUBE_DOMAIN
name: review/$CI_COMMIT_REF_NAME
url: http://$CI_PROJECT_NAME-$CI_ENVIRONMENT_SLUG.$KUBE_DOMAIN
on_stop: stop_review
only:
- branches
@ -68,7 +68,7 @@ stop_review:
script:
- command destroy
environment:
name: review/$CI_BUILD_REF_NAME
name: review/$CI_COMMIT_REF_NAME
action: stop
when: manual
only: