summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Alias the lfs_enabled methodlfs-project-attribute-aliasCindy Pallares2018-10-223-1/+8
| | | | | | | | We currently check for `project.lfs_enabled` to display the state of lfs being enabled/disabled, but this is set to nil by default, even when lfs is enabled. Aliasing the method to #lfs_enabled? will return the correct state.
* Merge branch 'docs/refactor-repository-mirroring' into 'master'Marcia Ramos2018-10-2220-254/+297
|\ | | | | | | | | | | | | Update repository mirroring documentation to reflect current state. Closes gitlab-ee#4302 See merge request gitlab-org/gitlab-ce!21792
| * Update repository mirroring documentation to reflect current state.Evan Read2018-10-2220-254/+297
|/
* Merge branch 'leipert-danger-fix-moved-files' into 'master'Rémy Coutable2018-10-226-8/+39
|\ | | | | | | | | | | | | Teach Danger how to pick up renamed files Closes #52783 See merge request gitlab-org/gitlab-ce!22396
| * Create helper to get all changed filesleipert-danger-fix-moved-filesLukas Eipert2018-10-226-8/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Danger apparently has three different objects which could contain files you often want to check: - git.added_files - git.modified_files - git.renamed_files The problem: If a file is renamed, `modified_files` contains the file path before the rename. In some Danger checks we use `added_files` + `modified_files`, which might contain the deleted paths of renamed files, but missing the new paths of renamed files. So we need to consider `renamed_files` as well.
* | Merge branch 'patch-30' into 'master'Achilleas Pipinellis2018-10-221-74/+2
|\ \ | | | | | | | | | | | | docs-Update index.md See merge request gitlab-org/gitlab-ce!22478
| * | Update index.mdpatch-30Ray Paik2018-10-181-74/+2
| | |
* | | Merge branch 'patch-29' into 'master'Achilleas Pipinellis2018-10-221-1/+1
|\ \ \ | | | | | | | | | | | | | | | | docs-Update CONTRIBUTING.md See merge request gitlab-org/gitlab-ce!22477
| * | | Update CONTRIBUTING.mdRay Paik2018-10-181-1/+1
| |/ /
* | | Merge branch 'abuango-office365-broken-link-fix' into 'master'Achilleas Pipinellis2018-10-221-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Update Guide for Microsoft Teams Notification Integration See merge request gitlab-org/gitlab-ce!22423
| * | | Update Guide for Microsoft Teams Notification IntegrationAbubakar Siddiq Ango2018-10-221-1/+1
|/ / /
* | | Merge branch 'ce-52112-fix-review-apps-cleanup-ce' into 'master'Nick Thomas2018-10-225-86/+271
|\ \ \ | | | | | | | | | | | | | | | | Improve HelmClient and KubernetesClient See merge request gitlab-org/gitlab-ce!22375
| * | | Improve automated Review Apps cleanupce-52112-fix-review-apps-cleanup-ceRémy Coutable2018-10-225-86/+271
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'mk/backport-use-strings-for-context-description-qa' into 'master'Rémy Coutable2018-10-2232-33/+33
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | [CE backport] QA: Use strings for context descriptions See merge request gitlab-org/gitlab-ce!22469
| * | | | Use strings for context descriptionsmk/backport-use-strings-for-context-description-qaMichael Kozono2018-10-1832-33/+33
| | | | | | | | | | | | | | | | | | | | To avoid confusion with tags.
* | | | | Merge branch 'ml-qa-logging' into 'master'Nick Thomas2018-10-2211-13/+287
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QA: Log page actions Closes gitlab-qa#142 See merge request gitlab-org/gitlab-ce!22084
| * | | | | Log page actionsml-qa-loggingMark Lapierre2018-10-1911-13/+287
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Override page object methods to log the actions taken by the methods before or after the action, as appropriate. Allow page object action logging to be turned on via a QA_DEBUG env var. Unlike CHROME_HEADLESS (and the soon to arrive VERBOSE), QA_DEBUG is false by default. QA_DEBUG is used instead of just DEBUG because that enables Selenium debug logging. Mask passwords entered into fields with a QA selector with 'password' in the name. Doesn't mask sensitive data entered into any other field.
* | | | | | Merge branch 'mr-creation-source-project-filtering' into 'master'Filipa Lacerda2018-10-223-1/+31
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed source projects not filtering Closes #52728 See merge request gitlab-org/gitlab-ce!22515
| * | | | | | Fixed source projects not filteringPhil Hughes2018-10-223-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Filtering source projects in the merge request creation form would show a flash error because it is trying to filter remotely to an undefined URL. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52728
* | | | | | | Merge branch 'refactor-cluster-create-service-spec' into 'master'Dmitriy Zaporozhets2018-10-222-75/+87
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move shared examples into the only file where used (Clusters::CreateService spec) See merge request gitlab-org/gitlab-ce!22407
| * | | | | | | Move shared examples into the only file where usedrefactor-cluster-create-service-specThong Kuah2018-10-172-75/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will make it easier to perform in place adjustments, etc for future MRs involving group clusters.
* | | | | | | | Merge branch 'docs-fix-sbt-version-in-test-scala-application' into 'master'Achilleas Pipinellis2018-10-221-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update test-scala-application.md to use sbtVersion instead of sbt-version Closes #52957 See merge request gitlab-org/gitlab-ce!22514
| * | | | | | | Update test-scala-application.md to use sbtVersion instead of sbt-versiondocs-fix-sbt-version-in-test-scala-applicationRémy Coutable2018-10-221-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'drop-allow_overflow-option-duration_in_numbers' into 'master'Grzegorz Bizon2018-10-226-39/+25
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop allow overflow option duration in numbers Closes #52284 See merge request gitlab-org/gitlab-ce!22246
| * | | | | | | | Fix specdrop-allow_overflow-option-duration_in_numbersShinya Maeda2018-10-181-2/+2
| | | | | | | | |
| * | | | | | | | Add changelogShinya Maeda2018-10-181-0/+5
| | | | | | | | |
| * | | | | | | | Drop `allow_overflow` option in `TimeHelper.duration_in_numbers`Shinya Maeda2018-10-184-37/+18
| | | | | | | | |
* | | | | | | | | Merge branch 'improve-specs-for-ci-processbuildservice' into 'master'Grzegorz Bizon2018-10-221-155/+77
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve specs for Ci::ProcessBuildService Closes #52279 See merge request gitlab-org/gitlab-ce!22254
| * | | | | | | | | Simplify the specimprove-specs-for-ci-processbuildserviceShinya Maeda2018-10-181-104/+97
| | | | | | | | | |
| * | | | | | | | | Improve specs for Ci::ProcessBuildServiceShinya Maeda2018-10-181-161/+90
| |/ / / / / / / /
* | | | | | | | | Merge branch '52559-applications-api-get-delete' into 'master'Rémy Coutable2018-10-228-15/+181
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Applications API endpoints for listing and deleting entries. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52559 See merge request https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22296
| * | | | | | | | Disable offense on the appropriate line only !22296JB Vasseur2018-10-191-6/+2
| | | | | | | | |
| * | | | | | | | Remove useless braces !22296JB Vasseur2018-10-181-1/+1
| | | | | | | | |
| * | | | | | | | Code stylingJB Vasseur2018-10-181-1/+1
| | | | | | | | |
| * | | | | | | | Use ApplicationsFinder !22296JB Vasseur2018-10-181-6/+2
| | | | | | | | |
| * | | | | | | | Source cleaning !22296JB Vasseur2018-10-181-1/+1
| | | | | | | | |
| * | | | | | | | Test ApplicationsFinder !22296JB Vasseur2018-10-181-0/+22
| | | | | | | | |
| * | | | | | | | Use application finder for Doorkeeper ApplicationsJB Vasseur2018-10-152-6/+29
| | | | | | | | |
| * | | | | | | | Use have_gitlab_http_status following best practices !22296JB Vasseur2018-10-151-11/+11
| | | | | | | | |
| * | | | | | | | Do not return secret from GET /applications !22296JB Vasseur2018-10-121-1/+1
| | | | | | | | |
| * | | | | | | | disable CodeReuse/ActiveRecordJB Vasseur2018-10-121-0/+2
| | | | | | | | |
| * | | | | | | | Improve call for retrieving all applications !22296JB Vasseur2018-10-121-1/+1
| | | | | | | | |
| * | | | | | | | Add changelog !22296JB Vasseur2018-10-121-0/+5
| | | | | | | | |
| * | | | | | | | Non-authenticated user test should not have user passed in the API call !22296JB Vasseur2018-10-121-2/+2
| | | | | | | | |
| * | | | | | | | Differentiate test application valuesJB Vasseur2018-10-121-1/+1
| | | | | | | | |
| * | | | | | | | Hit the databaseJB Vasseur2018-10-111-2/+2
| | | | | | | | |
| * | | | | | | | Fix unauthorized user tests and add non-authenticated user testsJB Vasseur2018-10-111-3/+19
| | | | | | | | |
| * | | | | | | | Fix testsJB Vasseur2018-10-111-5/+7
| | | | | | | | |
| * | | | | | | | Support GET /applications and DELETE /applications/:id endpoints #52559JB Vasseur2018-10-113-2/+104
| | | | | | | | |
| * | | | | | | | Expose id and name attributes to Applications APIJB Vasseur2018-10-111-0/+2
| | | | | | | | |
View Lorry Controller Status