summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '34130-null-pipes' into 'master'Fatih Acet2018-02-153-0/+15
|\ | | | | | | | | Resolve "Merge request says "Could not connect to the CI server", no CI or integration is configured" See merge request gitlab-org/gitlab-ce!17053
| * Prevent MR Widget error when no CI configured34130-null-pipesSimon Knox2018-02-123-0/+15
| |
* | Merge branch 'sh-add-env-variables-for-ldap-qa' into 'master'Grzegorz Bizon2018-02-153-2/+18
|\ \ | | | | | | | | | | | | Add LDAP_USERNAME and LDAP_PASSWORD user environment variables for QA See merge request gitlab-org/gitlab-ce!17141
| * | Add LDAP_USERNAME and LDAP_PASSWORD user environment variables for QAsh-add-env-variables-for-ldap-qaStan Hu2018-02-143-2/+18
| | |
* | | Merge branch 'patch-28' into 'master'Stan Hu (Admin)2018-02-151-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Add the missing "Security Products" Team label and sort them alphabetically See merge request gitlab-org/gitlab-ce!16961
| * | | Add the missing "Security Products" Team label and sort them alphabeticallyOlivier Gonzalez2018-02-061-1/+1
| | | |
* | | | Merge branch '43271-remove-seeded-root-user-project-limit' into 'master'Stan Hu2018-02-151-1/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove root user 100 project limit Closes #43271 See merge request gitlab-org/gitlab-ce!17126
| * | | | Remove root user 100 project limit to rely on default 100,00043271-remove-seeded-root-user-project-limitEric Eastwood2018-02-141-1/+0
| | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/43271
* | | | | Merge branch 'mc/fix/project-variables-scope' into 'master'Kamil Trzciński2018-02-146-6/+94
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Project variables validate without any scopes disregarding environment_scope" Closes #43191 See merge request gitlab-org/gitlab-ce!17086
| * | | | | Improve validation message and add changelogmc/fix/project-variables-scopeKamil Trzciński2018-02-143-2/+7
| | | | | |
| * | | | | Refactor variable duplicates error messageMatija Čupić2018-02-141-1/+1
| | | | | |
| * | | | | Add more information in variable_duplicates validator error messageMatija Čupić2018-02-133-4/+6
| | | | | |
| * | | | | Refactor outer anonymous function into a do blockMatija Čupić2018-02-131-1/+3
| | | | | |
| * | | | | Add specs for VariableDuplicates validatorMatija Čupić2018-02-131-0/+67
| | | | | |
| * | | | | Disable public send cop in variables duplicates validatorMatija Čupić2018-02-131-1/+1
| | | | | |
| * | | | | Extend variable JSON Schema with optional environment_scopeMatija Čupić2018-02-131-1/+2
| | | | | |
| * | | | | Validate project variables by scopeMatija Čupić2018-02-131-1/+1
| | | | | |
| * | | | | Extend variables_duplicates validator with scope handlingMatija Čupić2018-02-131-2/+13
| | | | | |
* | | | | | Merge branch 'fl-mr-widget-4' into 'master'Tim Zallmann2018-02-147-60/+86
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | Moves mr widget components into vue files See merge request gitlab-org/gitlab-ce!17110
| * | | | | Moves mr widget components into vue filesfl-mr-widget-4Filipa Lacerda2018-02-137-60/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds i18n Improves test cases
* | | | | | Merge branch 'update-namespaces-api-docs' into 'master'Achilleas Pipinellis2018-02-141-5/+5
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | Make parent_id field integer/null value instead of string See merge request gitlab-org/gitlab-ce!17085
| * | | | | Make parent_id field integer/null value instead of stringupdate-namespaces-api-docsTomasz Maczukin2018-02-131-5/+5
| | | | | |
* | | | | | Merge branch 'qa/rs-suppress-git-output' into 'master'Rémy Coutable2018-02-142-3/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Suppress git output when running QA as a non-default user Closes gitlab-qa#157 See merge request gitlab-org/gitlab-ce!17006
| * | | | | | Suppress git output when running QA as a non-default userRobert Speicher2018-02-141-2/+12
| | | | | | |
| * | | | | | Add Runtime::User.default_nameRobert Speicher2018-02-141-1/+5
|/ / / / / /
* | | | | | Merge branch '41722-track-gcp-billing-enabled-project-changes' into 'master'Kamil Trzciński2018-02-144-23/+109
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Track GCP Billing enabled project changes" Closes #41722 See merge request gitlab-org/gitlab-ce!16962
| * | | | | | Count all billing_state transitions with labels41722-track-gcp-billing-enabled-project-changesMatija Čupić2018-02-122-19/+16
| | | | | | |
| * | | | | | Fix GCP cluster feature specMatija Čupić2018-02-121-2/+2
| | | | | | |
| * | | | | | Log billing state changes in CheckGcpProjectBillingWorkerMatija Čupić2018-02-121-0/+13
| | | | | | |
| * | | | | | Refactor CheckGcpProjectBillingWorkerMatija Čupić2018-02-123-41/+34
| | | | | | |
| * | | | | | Use Prometheus counter instead of redisMatija Čupić2018-02-122-14/+9
| | | | | | |
| * | | | | | Add missing newline in CheckGcpProjectBillingWorker specMatija Čupić2018-02-121-0/+1
| | | | | | |
| * | | | | | Add specs for billing_enabled change counterMatija Čupić2018-02-121-0/+66
| | | | | | |
| * | | | | | Implement billing_enabled change counterMatija Čupić2018-02-121-0/+21
| | | | | | |
* | | | | | | Merge branch ↵Kamil Trzciński2018-02-143-2/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '39885-ensure-users-cannot-create-environments-with-leading-slashes' into 'master' Resolve "Environment with starting slash in name causes error" Closes #39885 See merge request gitlab-org/gitlab-ce!17071
| * | | | | | | Update issue-39885.ymlKamil Trzciński2018-02-141-2/+2
| | | | | | | |
| * | | | | | | Ensure users can't create environments with leading or trailing slashes ↵39885-ensure-users-cannot-create-environments-with-leading-slashesDylan Griffith2018-02-133-2/+16
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | (Fixes #39885)
* | | | | | | Merge branch ↵Rémy Coutable2018-02-143-120/+58
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '43240-external-tracker-issues-don-t-have-the-correct-closing-text-appended-to-mrs' into 'master' Resolve "External tracker issues don't have the correct closing text appended to MRs" Closes #1 et #43240 See merge request gitlab-org/gitlab-ce!17109
| * | | | | | | Fix closing issues text added to MRs for external issue trackersSean McGivern2018-02-143-120/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before, this would: 1. Not use the correct reference for non-JIRA external trackers. 2. Append 'Closes ' if an external tracker was enabled, but no issue matched the branch name.
* | | | | | | | Merge branch 'process-update' into 'master'Marin Jankovski2018-02-141-5/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Process document with changes to the exception request process. See merge request gitlab-org/gitlab-ce!17118
| * | | | | | | | Update Process document with changes to the exception request process.Marin Jankovski2018-02-141-5/+8
| | | | | | | | |
* | | | | | | | | Merge branch 'feature-flags-for-user-apps' into 'master'Achilleas Pipinellis2018-02-141-1/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clarify what kind of feature flags we support See merge request gitlab-org/gitlab-ce!17113
| * | | | | | | | | clarify what kind of feature flags we supportJob van der Voort2018-02-141-1/+6
| | | | | | | | | |
* | | | | | | | | | Merge branch 'ce-port-ee-f531c07299' into 'master'Sean McGivern2018-02-141-8/+7
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a too strict array-matching expectation See merge request gitlab-org/gitlab-ce!17093
| * | | | | | | | | | Fix a too strict array-matching expectationRémy Coutable2018-02-141-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | Merge branch 'jramsay-i18n-proofreader-process-docs' into 'master'Douwe Maan2018-02-142-31/+54
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add clearer proofreader process to docs See merge request gitlab-org/gitlab-ce!17103
| * | | | | | | | | | Fix punctuation and address feedbackjramsay-i18n-proofreader-process-docsJames Ramsay2018-02-132-6/+8
| | | | | | | | | | |
| * | | | | | | | | | Add clearer proofreader process to docsJames Ramsay2018-02-132-27/+48
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'mk-fix-pg-undefined-table-ci-errors' into 'master'Rémy Coutable2018-02-146-32/+15
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Build Is Red: Admin > Users > Impersonation Tokens token creation allows creation of a token" Closes gitlab-ee#4914 See merge request gitlab-org/gitlab-ce!17102
| * | | | | | | | | | | Avoid dropping tables in testMichael Kozono2018-02-146-32/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And use :migration tag to use deletion strategy, and to avoid caching tables, and to lock into a particular schema. Attempting to fix intermittent spec errors `PG::UndefinedTable: ERROR: relation "public.untracked_files_for_uploads" does not exist`.
View Lorry Controller Status