summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Solve code review commentsper-build-tokenKamil Trzcinski2016-09-192-1/+10
|
* Properly support Gitlab::Auth::ResultKamil Trzcinski2016-09-192-8/+8
|
* Move Gitlab::Auth.Result to separate fileKamil Trzcinski2016-09-192-14/+17
|
* Added CHANGELOGKamil Trzcinski2016-09-191-0/+1
|
* Merge branch 'master' into per-build-tokenKamil Trzcinski2016-09-19150-1176/+1674
|\
| * Merge branch 'review-apps' into 'master' Rémy Coutable2016-09-1919-72/+536
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for dynamic environments Implements proposal described in https://gitlab.com/gitlab-org/gitlab-ce/issues/21971. Specifically: - it adds a `.gitlab-ci.yml` configuration, - it allows environment name to have slashes, - it allows environment names to use CI predefined variables, - it allows to specify URL from `.gitlab-ci.yml`, - it allows the URL to use CI predefined variables, - it introduces `environment_type` to allow to easily group environments in the future See merge request !6323
| | * Fix specs failuresreview-appsKamil Trzcinski2016-09-191-1/+1
| | |
| | * Fix validation regexs (+1 squashed commit)Kamil Trzcinski2016-09-194-7/+7
| | | | | | | | | | | | | | | Squashed commits: [f9a9315] Use : to test invalid environment name
| | * Fix scope of the CI config key nodes in jobs entryGrzegorz Bizon2016-09-191-13/+13
| | |
| | * Fix environments handlingKamil Trzcinski2016-09-192-4/+3
| | |
| | * Restore validation of CI job environment nameGrzegorz Bizon2016-09-191-0/+9
| | |
| | * Fix CI job environment configuration attributesGrzegorz Bizon2016-09-194-5/+7
| | |
| | * Fix CI job environment configuration entry classGrzegorz Bizon2016-09-191-8/+11
| | |
| | * Small refactor of review apps docsAchilleas Pipinellis2016-09-191-38/+28
| | |
| | * Cleanup changesKamil Trzcinski2016-09-194-41/+8
| | |
| | * Added documentation about dynamic environmentsKamil Trzcinski2016-09-192-1/+30
| | |
| | * Added missing db/schema changesKamil Trzcinski2016-09-191-1/+2
| | |
| | * Update support for dynamic environmentsKamil Trzcinski2016-09-197-32/+49
| | |
| | * Verify expandability of variables defined as part of environmentKamil Trzcinski2016-09-195-13/+134
| | |
| | * Properly create deployment using all possible optionsKamil Trzcinski2016-09-192-7/+17
| | |
| | * Add validation of URL and validation of nameKamil Trzcinski2016-09-192-0/+35
| | |
| | * Add new CI configuration entry for the environmentGrzegorz Bizon2016-09-194-10/+157
| | |
| | * Add support for dynamic environmentsKamil Trzcinski2016-09-198-5/+139
| | | | | | | | | | | | Environments that can have a URL with predefined CI variables.
| * | Merge branch '22033-milestone-validation-returns-422' into 'master' Rémy Coutable2016-09-194-6/+41
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure validation messages are shown within the milestone form Fixes a bug where upon entering data to create an invalid milestone via the Web UI or the API would raise an exception rather than render the validation messages We'd rather render the validation messages to inform the user than raise an exception and result in a 422 error being displayed Closes #22033 See merge request !6345
| | * | Ensure validation messages are shown within the milestone formMark Fletcher2016-09-194-6/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove call to Milestone#save! instead just Milestone#save * Add safety specs to stop a regression Fixes #22033
| * | | Merge branch 'sh-reset-pushes-since-gc-before' into 'master' Yorick Peterse2016-09-191-0/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Reset pushes_since_gc counter before specs run to ensure starting point is 0 See merge request !6406
| | * | | Reset pushes_since_gc counter before specs run to ensure starting point is 0sh-reset-pushes-since-gc-beforeStan Hu2016-09-181-0/+4
| | | | |
| * | | | Merge branch '22248-fix-namespace-undefined-method' into 'master' Rémy Coutable2016-09-191-0/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Render invalid template for open merge requests without source project If source project was removed and merge request for some reason wasn't closed is rendered `invalid` template. Fix !6177 Fix #22248 See merge request !6383
| | * | | | Render invalid template for merge requests without source project and openKatarzyna Kobierska2016-09-161-0/+4
| | | | | |
| * | | | | Merge branch 'sh-add-spec-create-service-protected-branch' into 'master' Rémy Coutable2016-09-191-0/+23
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing spec for ProtectedBranches::CreateService While working on !6399, I noticed there was no spec for this class so I added one. See merge request !6405
| | * | | | Add missing spec for ProtectedBranches::CreateServicesh-add-spec-create-service-protected-branchStan Hu2016-09-181-0/+23
| | | |/ / | | |/| |
| * | | | Merge branch 'fix-board-spec-failures' into 'master' Rémy Coutable2016-09-191-105/+72
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Refactor boards_spec.rb to avoid code duplication Originally created to address #21197, but !6224 solved the intermittent spec failures. See merge request !6197
| | * | | Refactor boards_spec.rb to avoid code duplicationfix-board-spec-failuresStan Hu2016-09-161-105/+72
| | |/ / | | | | | | | | | | | | | | | | Originally created to address #21197, but !6224 solved the intermittent spec failures.
| * | | Merge branch '22286-fix-missing-status' into 'master' Stan Hu2016-09-183-9/+12
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return created status ## What does this MR do? Properly handles status created which results in 500 when viewing Merge Request pipelines. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #22286 See merge request !6404
| | * | | Add specs that target status failure22286-fix-missing-statusKamil Trzcinski2016-09-182-8/+11
| | | | |
| | * | | Return created statusKamil Trzcinski2016-09-181-1/+1
| |/ / /
| * | | Merge branch 'doc/download-latest-artifact' into 'master' Achilleas Pipinellis2016-09-182-0/+32
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document how to download the latest build artifacts ## What does this MR do? Document how to download the latest build artifacts. Closes gitlab-org/gitlab-ce#22273 See merge request !6401
| | * | | Document how to download the latest build artifactsAchilleas Pipinellis2016-09-182-0/+32
| | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | Merge branch 'update-github-doc-page' into 'master' Achilleas Pipinellis2016-09-184-35/+94
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update GitHub importer documentation to reflect current importer state ## What does this MR do? Update the Github importer documentation to reflect the current importer state. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ee/issues/904 ## Does this MR meet the acceptance criteria? - [X] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) See merge request !5987
| | * | | | Clarify why GH integration is the preferred importing methodAchilleas Pipinellis2016-09-181-4/+5
| | | | | |
| | * | | | Refactor GitHub importing documentationAchilleas Pipinellis2016-09-184-44/+92
| | | | | |
| | * | | | Update GitHub importer documentation to reflect current importer stateDouglas Barbosa Alexandre2016-09-181-0/+10
| | |/ / /
| * | | | Merge branch 'patch-3' into 'master' Achilleas Pipinellis2016-09-181-3/+3
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | improve wording on build and push images using GitLab CI docs ## What does this MR do? Improve wording on build and push images using GitLab CI docs ## Are there points in the code the reviewer needs to double check? No ## Why was this MR needed? Poor wording ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [X] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [X] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !6001
| | * | | improve wording on build and push images using GitLab CIBen Bodenmiller2016-08-251-3/+3
| | | | |
| * | | | Merge branch 'patch-5' into 'master' Stan Hu2016-09-181-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Formatting fix in doc/ci/examples/README.md Just a tiny fix of wrongly formatted markdown link. See merge request !6398
| | * | | | Formatting fix in doc/ci/examples/README.mdsknebel2016-09-181-1/+1
| |/ / / /
| * | | | Merge branch 'patch-3' into 'master' Achilleas Pipinellis2016-09-171-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | docs: fix typo, it should refer to `domain_blacklist_enabled` setting ## What does this MR do? fix the documentation ## Are there points in the code the reviewer needs to double check? N/A ## Why was this MR needed? typo fix ## What are the relevant issue numbers? N/A ## Screenshots (if relevant) N/A ## Does this MR meet the acceptance criteria? yes, it's just a typo fix in the documentation without any code or business logic changes See merge request !5899
| | * | | | docs: fix typo, it should refer to `domain_blacklist_enabled` settingBenjamin Schwarze2016-08-191-1/+1
| | | | | |
| * | | | | Merge branch 'patch-3' into 'master' Achilleas Pipinellis2016-09-171-0/+6
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document IAM Profile AWS S3 configuration key. ## What does this MR do? Document additional parameters available to the backup rake job configuration. ## Are there points in the code the reviewer needs to double check? Probably not. ## Why was this MR needed? Un-documented configuration options ## What are the relevant issue numbers? #12756 ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [X] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5910
| | * | | | Remove whitespace.Geoff Webster2016-08-191-1/+0
| | | | | |
View Lorry Controller Status