summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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 '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
| | |
* | | Merge branch 'fe-ac-review-app-changes-33418' into 'master'Phil Hughes2018-10-2210-61/+427
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Frontend: Review app changes Closes #33418 See merge request gitlab-org/gitlab-ce!22363
| * | | Frontend: Review app changesFilipa Lacerda2018-10-2210-61/+427
|/ / /
* | | Merge branch 'fix-base64-encoded-file-uploads' into 'master'Phil Hughes2018-10-223-36/+47
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove base64 encoding from files that contain plain text Closes #48746 See merge request gitlab-org/gitlab-ce!22425
| * | | Remove base64 encoding from files that contain plain textJacques Erasmus2018-10-223-36/+47
|/ / /
* | | Merge branch '52690-clean-up-windows-scroll-in-job-spec-test' into 'master'Filipa Lacerda2018-10-221-27/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove window scroll in features/project/job_spec Closes #52690 See merge request gitlab-org/gitlab-ce!22512
| * | | Remove window scroll in features/project/job_specSteve Azzopardi2018-10-221-27/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have some tests that execute `execute_script "window.scrollTo(0,0)"` which is not needed since we are just checking the dom, which end up in a some slower tests. Move the `before` block for `when job starts environment` sub contextes to one block since all of the are the same. Some formatting fixes to be consistent. closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52690
* | | | Merge branch 'use-raw-file-format' into 'master'Grzegorz Bizon2018-10-2224-76/+2722
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add RAW file format which is used to store security reports Closes gitlab-ee#7996 See merge request gitlab-org/gitlab-ce!22365
| * | | | Make all legacy security reports to use raw formatuse-raw-file-formatKamil Trzciński2018-10-1624-76/+2722
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - This introduces and uses `:raw` format for all legacy reports, the ones that do not have yet proper parsers on Backend - Raw format is needed to make Frontend be able to parse reports, without the need of decompressing, - This also extends fixtures to seed security reports with database, even though parser code is part of EE
* | | | | Merge branch 'rails5-fix-delete-blob' into 'master'Grzegorz Bizon2018-10-222-1/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Rails5: fix delete blob See merge request gitlab-org/gitlab-ce!22456
| * | | | | Rails5: fix delete blobJasper Maes2018-10-182-1/+6
| | | | | |
* | | | | | Merge branch 'frozen-string-enable-lib-gitlab' into 'master'Rémy Coutable2018-10-22151-22/+327
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable frozen string for lib/gitlab/*.rb See merge request gitlab-org/gitlab-ce!22440
| * | | | | | Enable frozen string for lib/gitlab/*.rbgfyoung2018-10-22151-22/+327
|/ / / / / /
* | | | | | Merge branch '51366-custom-repos-trait-docs' into 'master'Rémy Coutable2018-10-221-0/+31
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document the :repository and :custom_repo traits Closes #51366 See merge request gitlab-org/gitlab-ce!22480
| * | | | | | Document the :repository and :custom_repo traitsNick Thomas2018-10-191-0/+31
| | | | | | |
* | | | | | | Merge branch '52978-update-git-repos-for-dev' into 'master'Rémy Coutable2018-10-221-5/+5
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the moved Git repos for developers Closes #52978 See merge request gitlab-org/gitlab-ce!22510
| * | | | | | Update the moved Git repos for developersTakuya Noguchi2018-10-221-5/+5
|/ / / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | | | | Merge branch 'docs/mr-template-moving-tiers' into 'master'Marcia Ramos2018-10-211-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "Moving tiers" item to docs MR template See merge request gitlab-org/gitlab-ce!22486
| * | | | | | Add "Moving tiers" item to docs MR templateAchilleas Pipinellis2018-10-191-0/+1
| | | | | | |
* | | | | | | Merge branch 'patch-32' into 'master'Stan Hu2018-10-211-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix a typo in repositories.md (contend -> content) See merge request gitlab-org/gitlab-ce!22508
| * | | | | | | fix a typo in repositories.md (contend -> content)Maurits2018-10-211-1/+1
|/ / / / / / /
* | | | | | | Merge branch ↵Douwe Maan2018-10-194-42/+45
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '52772-assign-me-quick-action-doesn-t-work-if-there-is-extra-white-space' into 'master' Resolve "/assign me quick action doesn't work if there is extra white space" Closes #52772 See merge request gitlab-org/gitlab-ce!22402
| * | | | | | | Resolve "/assign me quick action doesn't work if there is extra white space"Cindy Pallares 🦉2018-10-194-42/+45
|/ / / / / / /
View Lorry Controller Status