summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | Remove empty spec describe blocksGeorge Tsiolis2018-10-184-14/+5
| | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'update-runner-chart-to-0-1-34' into 'master'Kamil Trzciński2018-10-193-4/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update used version of Runner Helm Chart to 0.1.34 Closes gitlab-runner#3642 See merge request gitlab-org/gitlab-ce!22274
| * | | | | | | | | | | | | | | Update used version of Runner Helm Chart to 0.1.34Tomasz Maczukin2018-10-193-4/+9
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Update VERSION to 11.5.0-prev11.5.0.preGitLab Release Tools Bot2018-10-191-1/+1
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Update CHANGELOG.md for 11.4.0GitLab Release Tools Bot2018-10-19200-1007/+225
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | | | Merge branch 'ccr/43034_issues_controller_100_queries' into 'master'Douglas Barbosa Alexandre2018-10-197-46/+141
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add preload for routes and namespaces for issues controller. Closes #43034 See merge request gitlab-org/gitlab-ce!21651
| * | | | | | | | | | | | | | Add preload in issues controllerChantal Rollison2018-10-187-46/+141
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch ↵Annabel Dunstone Gray2018-10-194-9/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '52299-follow-up-from-resolve-add-status-message-from-within-user-menu' into 'master' Adjust size and alignment of emojis of user status in user menu Closes #52299 See merge request gitlab-org/gitlab-ce!22194
| * | | | | | | | | | | | | | | Adjust size and alignment of emojis of user status in user menuDennis Tang2018-10-194-9/+20
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'add-gl-link-to-markdown-header' into 'master'Annabel Dunstone Gray2018-10-1913-38/+56
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change markdown header tab anchor links to buttons See merge request gitlab-org/gitlab-ce!21988
| * | | | | | | | | | | | | | | Change markdown header tab anchor links to buttonsGeorge Tsiolis2018-10-1913-38/+56
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'revert-62d8b906' into 'master'Phil Hughes2018-10-191-145/+145
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'winh-prettier-job-app' into 'master'" See merge request gitlab-org/gitlab-ce!22489
| * | | | | | | | | | | | | | | Revert "Merge branch 'winh-prettier-job-app' into 'master'"Filipa Lacerda2018-10-191-145/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts merge request !22463
* | | | | | | | | | | | | | | | Merge branch 'mr-file-tree-inline-fluid-width-fix' into 'master'Filipa Lacerda2018-10-193-1/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed merge request fill tree not respecting fluid width Closes #52916 See merge request gitlab-org/gitlab-ce!22487
| * | | | | | | | | | | | | | | | Fixed merge request fill tree not respecting fluid widthPhil Hughes2018-10-193-1/+14
| |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug where the merge request fill tree would not respect the users fluid width preference. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52916
* | | | | | | | | | | | | | | | Merge branch 'bvl-remove-forked-project-link' into 'master'Sean McGivern2018-10-1934-251/+217
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove ForkedProjectLink model Closes #38883 See merge request gitlab-org/gitlab-ce!22226
| * | | | | | | | | | | | | | | | Remove the `ForkedProjectLink` modelBob Van Landuyt2018-10-1934-251/+217
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the `ForkedProjectLink` model that has been replaced by the `ForkNetworkMember` and `ForkNetwork` combination. All existing relations have been adjusted to use these new models. The `forked_project_link` table has been dropped. The "Forks" count on the admin dashboard has been updated to count all `ForkNetworkMember` rows and deduct the number of `ForkNetwork` rows. This is because now the "root-project" of a fork network also has a `ForkNetworkMember` row. This count could become inaccurate when the root of a fork network is deleted.
* | | | | | | | | | | | | | | | | Merge branch 'doc-edit-config-file-path-kaniko' into 'master'Achilleas Pipinellis2018-10-191-3/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Change path where to create the config.json file when using kaniko See merge request gitlab-org/gitlab-ce!22075
| * | | | | | | | | | | | | | | | | Change path where to create the config.json fileValerio Baldisserotto2018-10-031-3/+2
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch ↵Achilleas Pipinellis2018-10-191-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'docs/52918-shared-runners-still-showing-in-list-projects-runner-when-shared-runners-disabled-for-project' into 'master' Fix documentation for list runners Closes #52918 See merge request gitlab-org/gitlab-ce!22490
| * | | | | | | | | | | | | | | | | | Fix documentation for list runnersSteve Azzopardi2018-10-191-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We are specifying that we will only return the shared runners on two condition; 1 if project has any available 2 if shared runners are enabled. 2 is not correct. In the admin UI, when the user press "disable shared runners" we still show the runners to show what kind of runners are available when the user enables them. We want the API to mimic this behavior from the UI. closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52918
* | | | | | | | | | | | | | | | | | | Merge branch 'fix-bamboo-results' into 'master'Grzegorz Bizon2018-10-193-5/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correctly process Bamboo API results Closes #51950 See merge request gitlab-org/gitlab-ce!21970
| * | | | | | | | | | | | | | | | | | | Correctly process Bamboo API resultsAlex Lossent2018-10-193-5/+16
| | |_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bamboo API returns an array of results as per https://docs.atlassian.com/atlassian-bamboo/REST/6.2.5/#d2e786
* | | | | | | | | | | | | | | | | | | Merge branch 'docs/highlight-mentions' into 'master'Marcia Ramos2018-10-191-3/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document highlighted mentions See merge request gitlab-org/gitlab-ce!22488
| * | | | | | | | | | | | | | | | | | Document highlighted mentionsAchilleas Pipinellis2018-10-191-3/+6
| | |_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'docs/download-2fa-codes' into 'master'Achilleas Pipinellis2018-10-191-5/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation: Add mention that recovery codes are downloadable. See merge request gitlab-org/gitlab-ce!22483
| * | | | | | | | | | | | | | | | | Add mention that recovery codes are downloadable.Evan Read2018-10-191-5/+7
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'ml-update-test-plan' into 'master'Sean McGivern2018-10-191-18/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Test plan.md : add ~"test plan" and update attributes See merge request gitlab-org/gitlab-ce!22269
| * | | | | | | | | | | | | | | | Update Test plan.mdMark Lapierre2018-10-101-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add ~"test plan" label and update attributes
* | | | | | | | | | | | | | | | | Merge branch '52692-catch-redirect-loops' into 'master'Stan Hu2018-10-195-2/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Catch `RedirectionTooDeep` Exception in webhooks Closes #52692 See merge request gitlab-org/gitlab-ce!22447
| * | | | | | | | | | | | | | | | | Catch `RedirectionTooDeep` Exception in webhooksHeinrich Lee Yu2018-10-195-2/+40
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'ac-review-app-changes-33418' into 'master'Nick Thomas2018-10-199-36/+258
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose changed URLs in MR ci_environments_status See merge request gitlab-org/gitlab-ce!22228
| * | | | | | | | | | | | | | | | | Show modified and added public paths in MRAlessio Caiazza2018-10-184-0/+68
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Move ci_environments_status to a modelAlessio Caiazza2018-10-189-36/+190
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GET :namespace/merge_requests/:id/ci_environments_status complexity already reached a limit for a direct serialization from an hash computed at within the controller function. Here we introduce a virtual model EnvironmentStatus and its serializer.
* | | | | | | | | | | | | | | | | | Merge branch 'docs/docker-build' into 'master'Evan Read2018-10-194-45/+93
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the ways needed to authenticate to the registry via CI/CD Closes gitlab-com/support-forum#3825 See merge request gitlab-org/gitlab-ce!21538
| * | | | | | | | | | | | | | | | | | Add the ways needed to authenticate to the registry via CI/CDAchilleas Pipinellis2018-10-184-45/+93
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'triggering-pipeline-api-docs' into 'master'Evan Read2018-10-191-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Triggering Pipelines docs to API readme See merge request gitlab-org/gitlab-ce!22473
| * | | | | | | | | | | | | | | | | | Add Triggering Pipelines docs to API readmeAchilleas Pipinellis2018-10-181-0/+1
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'sh-add-audit-logging-json-ce' into 'master'Stan Hu2018-10-185-4/+76
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for JSON logging for audit events See merge request gitlab-org/gitlab-ce!22471
| * | | | | | | | | | | | | | | | | | | Add support for JSON logging for audit eventsStan Hu2018-10-185-4/+76
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will add audit_json.log that writes one line per audit event. For example: { "severity":"INFO", "time":"2018-10-17T17:38:22.523Z", "author_id":3, "entity_id":2, "entity_type":"Project", "change":"visibility", "from":"Private", "to":"Public", "author_name":"John Doe4", "target_id":2, "target_type":"Project", "target_details":"namespace2/project2" }
* | | | | | | | | | | | | | | | | | | Merge branch 'winh-prettier-job-app' into 'master'Clement Ho2018-10-181-145/+145
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make app/assets/javascripts/jobs/components/job_app.vue prettier See merge request gitlab-org/gitlab-ce!22463
| * | | | | | | | | | | | | | | | | | Make app/assets/javascripts/jobs/components/job_app.vue prettierWinnie Hellmann2018-10-181-145/+145
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch '43422-Update-images-in-group-docs' into 'master'Achilleas Pipinellis2018-10-189-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revised images in group docs to address gitlab-org/gitlab-ce#43422 Closes #43422 See merge request gitlab-org/gitlab-ce!22031
| * | | | | | | | | | | | | | | | | | | Revised images in group docs to address gitlab-org/gitlab-ce#43422Marc Schwede2018-10-189-0/+5
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge branch 'patch-29' into 'master'Achilleas Pipinellis2018-10-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix param typo in Notes documentation See merge request gitlab-org/gitlab-ce!22406
| * | | | | | | | | | | | | | | | | | Fix param typo in notes.mdArtur Pomadowski2018-10-161-1/+1
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'patch-29' into 'master'Achilleas Pipinellis2018-10-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Should be `start_in` not `start_key` See merge request gitlab-org/gitlab-ce!22422
| * | | | | | | | | | | | | | | | | | | Should be `start_in` not `start_key`Shane A. Stillwell2018-10-171-1/+1
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'sh-associate-rakefile-ruby' into 'master'Clement Ho2018-10-182-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Associate Rakefile with Ruby icon in diffs Closes #52654 See merge request gitlab-org/gitlab-ce!22341
| * | | | | | | | | | | | | | | | | | | | Associate Rakefile with Ruby icon in diffsStan Hu2018-10-132-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52654