summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Improve cron_jobs loading error messagesbug/sidekiq-cron-better-errorGabriel Mazetto2016-07-182-1/+9
|
* Merge branch 'docker-registry-work-with-redirect' into 'master' Rémy Coutable2016-07-185-35/+138
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make docker registry work with location redirects when external storage is used ## What does this MR do? Honor `Location:` header when working with local registry. Location makes it possible to download manifests from external storage. ## What are the relevant issue numbers? Fixed https://gitlab.com/gitlab-org/gitlab-ce/issues/18477 ## Remark Adding `FollowRedirects` makes that we leak `Authorization:` in followed requests. That is why it is implemented manually and we are explicitly removing `Authorization` header. cc @marin @twk3 See merge request !4677
| * Update CHANGELOGdocker-registry-work-with-redirectKamil Trzciński2016-07-151-1/+0
| |
| * Make rubocop happyKamil Trzcinski2016-07-151-1/+1
| |
| * Add CHANGELOGKamil Trzcinski2016-07-151-0/+1
| |
| * Explicitly remove authorization token and make sure that invalid addresses ↵Kamil Trzcinski2016-07-153-51/+122
| | | | | | | | are properly handled
| * Allow blob to be redirectedKamil Trzcinski2016-07-151-3/+34
| |
| * Make docker registry work with location redirects when external storage is usedKamil Trzcinski2016-07-152-1/+2
| |
* | Merge branch 'pending-tab' into 'master' Rémy Coutable2016-07-187-21/+90
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Pending Tab to Builds ## What does this MR do? Add Pending Tab to Builds and separate "running" and "pending" jobs in UI. ## Why was this MR needed? Increase visibility to "pending" . ## What are the relevant issue numbers? Closes #19408 ## Screenshots Before: ![Zrzut_ekranu_2016-07-05_o_11.52.48](/uploads/01dc1f3664f5aacb2ec09d52d19c521e/Zrzut_ekranu_2016-07-05_o_11.52.48.png) After: ![Zrzut_ekranu_2016-07-05_o_11.51.34](/uploads/f3be02427996fecf50c65dd51ce1b9fb/Zrzut_ekranu_2016-07-05_o_11.51.34.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [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) cc @ubudzisz @yorickpeterse @grzesiek @tmaczukin @zj [@chastell](https://github.com/chastell) [@tomash](https://github.com/tomash) See merge request !5084
| * | Modify test for Build tabsKatarzyna Kobierska2016-07-181-18/+26
| | |
| * | Add tests to project builds for pending tabKatarzyna Kobierska2016-07-182-5/+13
| | | | | | | | | | | | | | | | | | Fix CHANGELOG Fix build spec for pending tab
| * | Remove unused .js-running-count classKatarzyna Kobierska2016-07-182-6/+6
| | |
| * | Add test for new pending tab and update tests for running tabKatarzyna Kobierska2016-07-181-1/+35
| | |
| * | Add Pending Tab to Admin BuildsKatarzyna Kobierska2016-07-185-4/+23
| | | | | | | | | | | | | | | | | | Add Pending Tab to Project Builds Update CHANGELOG
* | | Merge branch 'fix/import-no-repo' into 'master' Rémy Coutable2016-07-185-10/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Allow empty repos on import/export Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19849 See merge request !5312
| * | | added changelogJames Lopez2016-07-181-0/+1
| | | |
| * | | allow empty repos on import/exportJames Lopez2016-07-184-10/+5
|/ / /
* | | Merge branch 'api-isssues-due-date' into 'master' Rémy Coutable2016-07-185-13/+53
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Expose due_date for issues ## What does this MR do? Add support for the `due_date` of issues to the API. ## What are the relevant issue numbers? Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/18696 ## Does this MR meet the acceptance criteria? - [x] [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) - [x] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [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) See merge request !5212
| * | | API: Expose due_date for issuesapi-isssues-due-dateRobert Schilling2016-07-125-13/+53
| | | |
* | | | Merge branch 'track-pipeline-user' into 'master' Rémy Coutable2016-07-1813-6/+39
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Track a user who creates a Pipeline ## What does this MR do? This adds additional column to pipelines to track user who is creating pipelines. ## Why was this MR needed? This is to make it possible to show all pipelines created by specific user and to later solve: https://gitlab.com/gitlab-org/gitlab-ce/issues/18054 ## What are the relevant issue numbers? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18992 - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [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 !5272
| * | | | Make rubocop happytrack-pipeline-userKamil Trzcinski2016-07-152-2/+2
| | | | |
| * | | | Add index for user_id of pipelineKamil Trzcinski2016-07-152-1/+9
| | | | |
| * | | | Track a user who created a pipelineKamil Trzcinski2016-07-1512-6/+31
| | |_|/ | |/| |
* | | | Merge branch 'fix-deployment-creation-on-build-retry' into 'master' Rémy Coutable2016-07-183-0/+18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix creation of deployment on build that is retried, redeployed or rollback ## What does this MR do? Add missing `environment` to be copied when retrying a build. ## Why was this MR needed? The retried builds did not create a deployments. ## What are the relevant issue numbers? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19521 - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [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 !5275
| * | | | Fix creation of deployment on build that is retried, redeployed or rollbackfix-deployment-creation-on-build-retryKamil Trzcinski2016-07-163-0/+18
| | | | |
* | | | | Merge branch 'allow-to-pull-public-images' into 'master' Rémy Coutable2016-07-186-26/+139
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow to access Container Registry for Public and Internal projects ## What does this MR do? Adds missing ability `read_container_image` for `public scope` which affects users accessing public and internal projects. ## Why was this MR needed? Previously, we allowed to use container registry for anonymous users, but did not allow to do the same for logged in. This MR makes it possible. ## What are the relevant issue numbers? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18176 https://gitlab.com/gitlab-org/gitlab-ce/issues/19668 https://gitlab.com/gitlab-org/gitlab-ce/issues/19117 ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [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 !5279
| * | | | | Allow to access Container Registry for Public and Internal projectsallow-to-pull-public-imagesKamil Trzcinski2016-07-156-26/+139
| | | | | |
* | | | | | Merge branch 'fix-stage-status-show-for-pipelines' into 'master' Rémy Coutable2016-07-183-6/+21
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix stage status shown for pipelines ## What does this MR do? Properly calculates a status of stage when shown on a list of pipelines ## Why was this MR needed? Previously we were calculating a status for all builds, including retried ones. This were affecting a overall stage status when a build were retried. ## What are the relevant issue numbers? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18896 https://gitlab.com/gitlab-org/gitlab-ce/issues/18150 - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [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 !5277
| * | | | | | Fix stage status shown for pipelinesfix-stage-status-show-for-pipelinesKamil Trzcinski2016-07-153-6/+21
| |/ / / / /
* | | | | | Merge branch 'fix/import-export-retry-settings' into 'master' Rémy Coutable2016-07-182-1/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Limit number of project export retries to 3 I think 3 should be a sufficient number of retries - at the moment we were doing 20+ This will only send a maximum of 3 emails if the project export went wrong. Tested - project import is not affected. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18966 See merge request !5267
| * | | | | added changelogJames Lopez2016-07-181-0/+1
| | | | | |
| * | | | | limit project expor retry to only 3James Lopez2016-07-181-1/+1
| | | | | |
* | | | | | Merge branch 'fix-lfs-ci-fetch' into 'master' Rémy Coutable2016-07-186-733/+772
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix LFS CI fetch ## What does this MR do? Fixes LFS fetching for CI objects that were kind of broken. ## Why was this MR needed? This also refactors LFS tests to be a blackbox tests instead of whitebox tests. Actually testing GrackAuth instead of LFSRouter. ## Related isssues Resolves: https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/issues/1199 - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [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 !5270
| * | | | | | Fix LFS specsfix-lfs-ci-fetchKamil Trzcinski2016-07-153-3/+3
| | | | | | |
| * | | | | | Fix fetching LFS objects for private CI projectsKamil Trzcinski2016-07-153-2/+8
| | | | | | |
| * | | | | | Refactor LFS specs to use requests instead of LfsRouterKamil Trzcinski2016-07-152-730/+763
| | | | | | |
* | | | | | | Merge branch 'allow-blank-import-url' into 'master' Rémy Coutable2016-07-183-5/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow a project import URL to be blank to prevent false positives in validation Projects that happen to have blank import URLs were failing validation, causing project settings not to be saved. Loosen the requirement and don't try to use the import data if the URL isn't present. Closes #19893 See merge request !5309
| * | | | | | | use method in validates statementJames Lopez2016-07-181-1/+1
| | | | | | | |
| * | | | | | | Fix spec to set import_url before attempting to create import_dataallow-blank-import-urlStan Hu2016-07-171-1/+1
| | | | | | | |
| * | | | | | | Allow a project import URL to be blank to prevent false positivesStan Hu2016-07-172-4/+4
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | preventing settings from being saved
* | | | | | | Merge branch 'normalize_emoji_aliases_paths' into 'master' Rémy Coutable2016-07-186-7/+43
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix not normalized emoji paths ## What does this MR do? It normalizes emoji names in `api` and `toggle_award` ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? User was able to store +1 and thumbsup to databse, causing UI inconsistency. ## What are the relevant issue numbers? Fixes #19104 ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [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) See merge request !5060
| * | | | | | Fix not normalized emoji pathsdixpac2016-07-146-7/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * There where path where +1 was stored as +1 not as thumbsup that was causing problems such as showing thumbsup icon 2 time. I fixed this to always normalize and store +1 as tumbsup
* | | | | | | Merge branch '19907-deploy' into 'master' Kamil Trzciński2016-07-172-11/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Pipelines view has manual actions" ## What does this MR do? Removes the deploy button from pipelines ## Why was this MR needed? The button didn't do anything ## What are the relevant issue numbers? Closes #19907 ## Screenshots (if relevant) <img src="/uploads/9488cf238f67463f7dac8f9dbc34f7e1/Screen_Shot_2016-07-16_at_5.52.10_PM.png" width="300px"> See merge request !5299
| * | | | | | | Align cancel and retry buttons19907-deployAnnabel Dunstone2016-07-162-1/+3
| | | | | | | |
| * | | | | | | Remove deploy to production buttonAnnabel Dunstone2016-07-161-10/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'doc-ci-anchor-yaml-fix' into 'master' Achilleas Pipinellis2016-07-171-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix CI yaml example ## What does this MR do? Fixes a typo in a CI yaml example. ## What are the relevant issue numbers? Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/19888 See merge request !5304
| * | | | | | Fix CI yaml exampleAchilleas Pipinellis2016-07-171-2/+2
|/ / / / / /
* | | | | | Merge branch ↵Stan Hu2016-07-162-4/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '19842-cloning-a-gitlab-wiki-returns-the-repo-not-the-repo-s-wiki' into 'master' Fix a bug where the project's repository path was returned instead of the wiki path Closes #19842 See merge request !5292
| * | | | | | Fix a bug where the project's repository path was returned instead of the ↵19842-cloning-a-gitlab-wiki-returns-the-repo-not-the-repo-s-wikiAlejandro Rodríguez2016-07-152-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | wiki path
* | | | | | | Merge branch 'syntax-highlight-unknown-language' into 'master' Robert Speicher2016-07-162-14/+35
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't fail to highlight when Rouge doesn't have a lexer Fixes issue introduced by upgrade to Rouge 2.0 (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4691) See merge request !5291