summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add guide on how to reset runners tokendocs/add-runner-token-resetSteve Azzopardi2019-04-091-6/+43
|
* Merge branch 'docs-fix-page-specific-javascript-link' into 'master'Achilleas Pipinellis2019-04-091-3/+3
|\ | | | | | | | | Fix page specific JavaScript link in documentation See merge request gitlab-org/gitlab-ce!27162
| * Fix page specific JavaScript link in documentationMark Florian2019-04-091-3/+3
|/
* Merge branch 'docs/update-registry-user' into 'master'Achilleas Pipinellis2019-04-091-17/+18
|\ | | | | | | | | Update auth with registry docs See merge request gitlab-org/gitlab-ce!27148
| * Update auth with registry docsEvan Read2019-04-091-17/+18
|/
* Merge branch '46326-environment-url-validation' into 'master'Kamil Trzciński2019-04-092-0/+42
|\ | | | | | | | | | | | | Add environment url validation Closes #46326 See merge request gitlab-org/gitlab-ce!26805
| * Add environment url validationWolphin2019-04-092-0/+42
|/
* Merge branch 'prevent-running-mr-pipelines-when-target-updated' into 'master'Kamil Trzciński2019-04-093-9/+40
|\ | | | | | | | | Create pipelines for merge requests **only** when source branch is updated See merge request gitlab-org/gitlab-ce!26921
| * Prevent triggering pipelines when target branch is updatedprevent-running-mr-pipelines-when-target-updatedShinya Maeda2019-04-083-9/+40
| | | | | | | | | | | | Currently, pipelines for merge requests are triggered when source or target branch is updated. However, we should create only when source branch is updated, because it runs unexpected pipelines.
* | Merge branch '30157-api-expose-single-environment' into 'master'Kamil Trzciński2019-04-0911-4/+322
|\ \ | | | | | | | | | | | | | | | | | | Add new API endpoint to expose single environment Closes #30157 See merge request gitlab-org/gitlab-ce!26887
| * | Add new API endpoint to expose single environmentKrasimir Angelov2019-04-0911-4/+322
|/ / | | | | | | | | | | | | | | This is resolving https://gitlab.com/gitlab-org/gitlab-ce/issues/30157. Implement new API endpoint `/projects/:id/environments/:environment_id` to expose single environment. Include information for environment's last deployment if there is one.
* | Merge branch 'winh-jest-no-jasmine-globals' into 'master'Kushal Pandya2019-04-097-13/+14
|\ \ | | | | | | | | | | | | Enable ESLint rule jest/no-jasmine-globals See merge request gitlab-org/gitlab-ce!27137
| * | Replace jasmine.createSpy() with jest.fn()Winnie Hellmann2019-04-093-3/+3
| | |
| * | Run yarn eslint --fixWinnie Hellmann2019-04-094-10/+10
| | |
| * | Enable ESLint rule jest/no-jasmine-globalsWinnie Hellmann2019-04-091-0/+1
| | |
* | | Merge branch ↵Phil Hughes2019-04-092-1/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'ce-6099-move-ee-differences-for-app-views-admin-users-show-html-haml' into 'master' CE backport: Move EE differences for `app/views/admin/users/show.html.haml` Closes gitlab-ee#6099 See merge request gitlab-org/gitlab-ce!26874
| * | | CE port: Move EE differences for `app/views/admin/users/show.html.haml`ce-6099-move-ee-differences-for-app-views-admin-users-show-html-hamlDennis Tang2019-04-092-1/+8
| | | |
* | | | Merge branch '59708-vendor-css' into 'master'Phil Hughes2019-04-095-92/+101
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a vendors folder for third party CSS Closes #59694 and #59708 See merge request gitlab-org/gitlab-ce!27119
| * | | | Adds a vendors folder for third party CSSFilipa Lacerda2019-04-095-92/+101
|/ / / / | | | | | | | | | | | | Does not run stylelint for the vendors folder
* | | | Merge branch 'note-body-ee-differences' into 'master'Filipa Lacerda2019-04-092-3/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed EE differences in note_body.vue Closes gitlab-ee#9968 See merge request gitlab-org/gitlab-ce!27126
| * | | | Fixed EE differences in note_body.vuePhil Hughes2019-04-082-3/+13
| | | | |
* | | | | Merge branch 'winh-filtered_search_boards' into 'master'Phil Hughes2019-04-091-0/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove EE-specific changes from FilteredSearchBoards (CE-backport) See merge request gitlab-org/gitlab-ce!27122
| * | | | | Remove EE-specific changes from FilteredSearchBoardswinh-filtered_search_boardsWinnie Hellmann2019-04-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 250c9b9ecfc35b6b828f6e1a471a803f74daf7f2)
* | | | | | Merge branch 'revert-e4b2c3b0' into 'master'Stan Hu2019-04-091-0/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'fix-ide-web-worker-relative-url' into 'master'" Closes #60217 See merge request gitlab-org/gitlab-ce!26066
| * | | | | | Revert "Merge branch 'fix-ide-web-worker-relative-url' into 'master'"revert-e4b2c3b0Mike Greiling2019-04-091-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts merge request !26015
* | | | | | | Merge branch 'issue-58418-release-notes' into 'master'Rémy Coutable2019-04-0910-21/+106
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set Release Name When Adding Release Notes to an Existing Tag Closes #58418 See merge request gitlab-org/gitlab-ce!26807
| * | | | | | | Set release name when adding release notes to an existing tagJason Goodman2019-04-0910-21/+106
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Also set the release sha and author
* | | | | | | Merge branch 'gitlab-managed-apps' into 'master'Evan Read2019-04-091-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | Name GitLab managed apps See merge request gitlab-org/gitlab-ce!27129
| * | | | | | Name GitLab managed appsgitlab-managed-appsSid Sijbrandij2019-04-081-1/+1
| | | | | | |
* | | | | | | Merge branch 'fix_qa_auto_devops_ci_masking_variable' into 'master'Ramya Authappan2019-04-091-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QA: Change CI value to something that can be masked See merge request gitlab-org/gitlab-ce!27146
| * | | | | | | Change value to something that can be maskedfix_qa_auto_devops_ci_masking_variableThong Kuah2019-04-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current value cannot be masked[1] but CI variables default to masked. Rather than implementing a toggle for the masking control, simply change the value to something that can be masked. [1] Currently, "simple" values can be masked: * it should be a single line * it should not have escape characters * it should not use variables * it should not have any whitespace * it should be longer than 8 characters https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/25476
* | | | | | | | Merge branch 'docs-anchors-predefined-variables' into 'master'Evan Read2019-04-091-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Update predefined_variables.md to fix anchor See merge request gitlab-org/gitlab-ce!27127
| * | | | | | | | Docs: Update predefined_variables.md to fix anchorMarcel Amirault2019-04-091-1/+1
|/ / / / / / / /
* | | | | | | | Merge branch 'patch-50' into 'master'Evan Read2019-04-091-1/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Okta configuration notes See merge request gitlab-org/gitlab-ce!27076
| * | | | | | | | Update Okta configuration notesBlair Lunceford2019-04-091-1/+6
|/ / / / / / / /
* | | | | | | | Merge branch 'mk/follow-up-fix-default-project-creation-migration' into 'master'Kamil Trzciński2019-04-081-2/+6
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | Fix default_project_creation already exists See merge request gitlab-org/gitlab-ce!27144
| * | | | | | | Fix the backported migrationMichael Kozono2019-04-081-2/+6
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | For those who upgraded to a version that included the previous backport implementation with migration 20190311132500.
* | | | | | | Merge branch 'backport-add-default-project-creation-setting' into 'master'Michael Kozono2019-04-082-22/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport `add_default_project_creation_setting` to CE See merge request gitlab-org/gitlab-ce!27141
| * | | | | | | Backport `add_default_project_creation_setting` to CEbackport-add-default-project-creation-settingKamil Trzciński2019-04-082-22/+15
| | | | | | | |
* | | | | | | | Merge branch 'sh-fix-issue-59985' into 'master'Michael Kozono2019-04-082-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix stage index migration failing in PostgreSQL 10 Closes #59985 See merge request gitlab-org/gitlab-ce!26972
| * | | | | | | | Fix stage index migration failing in PostgreSQL 10sh-fix-issue-59985Stan Hu2019-04-032-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As discussed in https://www.postgresql.org/message-id/9922.1353433645%40sss.pgh.pa.us, the PostgreSQL window function last_value may not consider the right rows: Note that first_value, last_value, and nth_value consider only the rows within the "window frame", which by default contains the rows from the start of the partition through the last peer of the current row. This is likely to give unhelpful results for last_value and sometimes also nth_value. You can redefine the frame by adding a suitable frame specification (RANGE or ROWS) to the OVER clause. See Section 4.2.8 for more information about frame specifications. This query could be fixed by adding `RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING`, but that's quite verbose. It's simpler just to use the first_value function. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59985
* | | | | | | | | Merge branch 'review-revamp-issues-docs' into 'master'Mike Lewis2019-04-082-133/+98
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor Issues doc Closes #56877 See merge request gitlab-org/gitlab-ce!24695
| * | | | | | | | | Refactor Issues docMike Lewis2019-04-082-133/+98
|/ / / / / / / / /
* | | | | | | | | Merge branch 'winh-IS_GITLAB_EE-docs' into 'master'Mike Greiling2019-04-081-0/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document IS_GITLAB_EE environment variable Closes #60131 See merge request gitlab-org/gitlab-ce!27120
| * | | | | | | | | Document IS_GITLAB_EE environment variablewinh-IS_GITLAB_EE-docsWinnie Hellmann2019-04-081-0/+5
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'winh-jest-no-focused-tests' into 'master'Mike Greiling2019-04-082-5/+11
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable ESLint rule jest/no-focused-tests See merge request gitlab-org/gitlab-ce!27132
| * | | | | | | | | Enable ESLint rule jest/no-focused-testsWinnie Hellmann2019-04-082-5/+11
|/ / / / / / / / /
* | | | | | | | | Merge branch '60231-pipeline-regression-fix' into 'master'Mike Greiling2019-04-081-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Override problematic display with utility class Closes #60231 See merge request gitlab-org/gitlab-ce!27138
| * | | | | | | | | Override problematic display with utility class60231-pipeline-regression-fixsarahghp2019-04-081-2/+2
| | | | | | | | | |
* | | | | | | | | | Merge branch '60123-graphql-complexity-limit-too-low-for-schema-load' into ↵Douglas Barbosa Alexandre2019-04-083-8/+109
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' GraphQL complexity limit too low for Schema load / IntrospectionQuery Closes #60123 See merge request gitlab-org/gitlab-ce!27063