summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | | | | Remove feature gatezj-missing-part-linguistZeger-Jan van de Weg2018-06-251-23/+2
| | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'zj-tree-entry-mandatory' into 'master'Douwe Maan2018-06-252-98/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitaly tree entry is mandatory Closes gitaly#310 See merge request gitlab-org/gitlab-ce!20099
| * | | | | | | | | | | | | | | | | | | | | | | Gitaly tree entry is mandatoryzj-tree-entry-mandatoryZeger-Jan van de Weg2018-06-252-98/+27
| | |_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitaly/issues/310
* | | | | | | | | | | | | | | | | | | | | | | Merge branch '6598-notify-only-open-unmergeable-mr' into 'master'Sean McGivern2018-06-255-27/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notify conflict only for opened/locked merge requests See merge request gitlab-org/gitlab-ce!20125
| * | | | | | | | | | | | | | | | | | | | | | | Notify conflict only for opened/locked merge requestsMark Chao2018-06-255-27/+52
|/ / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'kp-make-gfm-autocomplete-configurable' into 'master'Phil Hughes2018-06-2513-37/+63
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make GFM Autocomplete configurable See merge request gitlab-org/gitlab-ce!20066
| * | | | | | | | | | | | | | | | | | | | | | | Update GFM autocomplete configkp-make-gfm-autocomplete-configurableKushal Pandya2018-06-257-7/+22
| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Update map name for default autocomplete configKushal Pandya2018-06-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Add default autocomplete configKushal Pandya2018-06-255-28/+39
| | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'docs/document-new-preview' into 'master'Rémy Coutable2018-06-252-21/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document how the new automatic review apps for docs work See merge request gitlab-org/gitlab-ce!20149
| * | | | | | | | | | | | | | | | | | | | | | | Document how the new automatic review apps for docs workAchilleas Pipinellis2018-06-252-21/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was missed from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20130
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch '6165_project_security_dashboard-CE' into 'master'Filipa Lacerda2018-06-254-7/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update project sidebar to work with EE feature Security Dashboard See merge request gitlab-org/gitlab-ce!20101
| * | | | | | | | | | | | | | | | | | | | | | | | Update project sidebar to work with EE feature Security DashboardOlivier Gonzalez2018-06-254-7/+15
|/ / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch '46571-webhooks-nil-password' into 'master'Rémy Coutable2018-06-253-1/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "WebHookService doesn't handle user info with nil passwords" Closes #46571 See merge request gitlab-org/gitlab-ce!19945
| * | | | | | | | | | | | | | | | | | | | | | | Resolve "WebHookService doesn't handle user info with nil passwords"Jan Beckmann2018-06-253-1/+36
|/ / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ide-tab-active-click-fix' into 'master'Filipa Lacerda2018-06-252-3/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed the IDE commit list item loosing its active state Closes #48125 See merge request gitlab-org/gitlab-ce!20138
| * | | | | | | | | | | | | | | | | | | | | | Fixed the IDE commit list item loosing its active stateide-tab-active-click-fixPhil Hughes2018-06-252-3/+25
| | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #48125
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'docs/always-on-review-apps-for-docs' into 'master'Rémy Coutable2018-06-252-19/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always run review app for docs-only branches See merge request gitlab-org/gitlab-ce!20130
| * | | | | | | | | | | | | | | | | | | | | | Always run review app for docs-only branchesAchilleas Pipinellis2018-06-252-19/+32
| | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'enforce-variable-value-to-be-a-string' into 'master'Grzegorz Bizon2018-06-257-19/+81
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enforce setting string as value of the CI/CD variable Closes #48210 See merge request gitlab-org/gitlab-ce!20061
| * | | | | | | | | | | | | | | | | | | | | | Add CHANGELOG entryTomasz Maczukin2018-06-251-0/+5
| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Enforce setting string as value of the CI/CD variableTomasz Maczukin2018-06-256-19/+76
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jprovazn-rails5-mysql-datetime' into 'master'Yorick Peterse2018-06-254-8/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Rails5] Fix MysqlDateTimeWithTimeZone in rails 5 Closes #46275 See merge request gitlab-org/gitlab-ce!19613
| * | | | | | | | | | | | | | | | | | | | | Mysql fixes for Rails 5jprovazn-rails5-mysql-datetimeJan Provaznik2018-06-214-8/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * `MysqlDateTimeWithTimeZone` inherits from `ActiveRecord::Type::DateTime` (`MysqlDateTime` is not present in Rails 5) * explicitly set `NULL` default value for `merge_request_diff_files`'s `diff` column (otherwise empty string is used in a migration) and empty string is not allowed for text/blob fields in Mysql * disable NO_ZERO_DATE mode for all Mysql DB connections, otherwise SQL queries fail on inserting `0` value for `created_at` column
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'unify-test_bundle.js' into 'master'Phil Hughes2018-06-251-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unify spec/javascripts/test_bundle.js See merge request gitlab-org/gitlab-ce!20136
| * | | | | | | | | | | | | | | | | | | | | | Bring changes from EELin Jen-Shin2018-06-251-1/+0
| | |_|_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'osw-delete-non-latest-mr-diff-files-upon-merge' into 'master'Sean McGivern2018-06-2518-88/+346
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delete non-latest merge request diff files upon MRs merge Closes #37639 See merge request gitlab-org/gitlab-ce!19670
| * | | | | | | | | | | | | | | | | | | | | Delete non-latest merge request diff files upon diffs reloadosw-delete-non-latest-mr-diff-files-upon-mergeOswaldo Ferreira2018-06-2418-88/+346
| | |_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch ↵Phil Hughes2018-06-253-6/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '46396-recognise-when-a-user-is-trying-to-validate-a-private-ssh-key-part-1' into 'master' (Part 1) Resolve "Recognise when a user is trying to validate a private SSH key" See merge request gitlab-org/gitlab-ce!19994
| * | | | | | | | | | | | | | | | | | | | | (Part 1) Resolve "Recognise when a user is trying to validate a private SSH key"Luke Bennett2018-06-253-6/+14
|/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge branch 'rails5-enum-pipeline-check' into 'master'Sean McGivern2018-06-251-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix auto_cancel_pending_pipelines check Closes #47834 See merge request gitlab-org/gitlab-ce!19820
| * | | | | | | | | | | | | | | | | | | | | Fix auto_cancel_pending_pipelines checkJan Provaznik2018-06-251-0/+4
|/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge branch 'unify-filtered_search_token_keys_spec.js' into 'master'Phil Hughes2018-06-251-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unify filtered_search_token_keys_spec.js See merge request gitlab-org/gitlab-ce!20094
| * | | | | | | | | | | | | | | | | | | | Bring changes from EEunify-filtered_search_token_keys_spec.jsLin Jen-Shin2018-06-221-0/+11
| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch '40005-u2f-unspported-browsers' into 'master'Phil Hughes2018-06-254-40/+60
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "2FA should not attempt to use U2F in unsupported browsers" Closes #40005 and #27772 See merge request gitlab-org/gitlab-ce!19938
| * | | | | | | | | | | | | | | | | | | | | Resolve "2FA should not attempt to use U2F in unsupported browsers"Jan Beckmann2018-06-254-40/+60
|/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge branch '45575-test-invalid-characters-signup' into 'master'Rémy Coutable2018-06-251-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add test for "Bug: When creating an account with invalid characters the error is "Username already taken" not "Invalid characters used"" See merge request gitlab-org/gitlab-ce!20124
| * | | | | | | | | | | | | | | | | | | | | Adds test to cover the fix in #45575Sanad Liaquat2018-06-241-0/+9
| | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch ↵Achilleas Pipinellis2018-06-251-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '48260-change-the-bitbucket-import-page-to-indicate-that-its-for-bb-cloud-only-not-for-on-prem-bb' into 'master' Resolve "Change the BitBucket import page to indicate that its for BB Cloud only, not for on-prem BB" Closes #48260 See merge request gitlab-org/gitlab-ce!20080
| * | | | | | | | | | | | | | | | | | | | | Resolve "Change the BitBucket import page to indicate that its for BB Cloud ↵John Woods2018-06-251-0/+4
|/ / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | only, not for on-prem BB"
* | | | | | | | | | | | | | | | | | | | | Merge branch '47274-help-users-find-our-contributing-page' into 'master'Phil Hughes2018-06-253-1/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Help users find our contributing page" Closes #47274 See merge request gitlab-org/gitlab-ce!19708
| * | | | | | | | | | | | | | | | | | | | | Resolve "Help users find our contributing page"Luke Bennett2018-06-253-1/+11
|/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge branch 'docs-broken-links' into 'master'Rémy Coutable2018-06-253-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs broken links See merge request gitlab-org/gitlab-ce!20098
| * | | | | | | | | | | | | | | | | | | | | Docs broken linksMarcel Amirault2018-06-253-2/+5
|/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge branch 'docs/refactor-issue-boards' into 'master'Achilleas Pipinellis2018-06-2515-53/+159
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor issue boards and get the EE changes to CE See merge request gitlab-org/gitlab-ce!19839
| * | | | | | | | | | | | | | | | | | | | Refactor issue boards and get the EE changes to CEAchilleas Pipinellis2018-06-2515-53/+159
|/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge branch 'mk/log-invalid-byte-sequence-in-us-ascii-qa' into 'master'consolidate-capitalization-profileStan Hu2018-06-231-6/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Log push output on exception See merge request gitlab-org/gitlab-ce!20085
| * | | | | | | | | | | | | | | | | | | | Log push output on exceptionmk/log-invalid-byte-sequence-in-us-ascii-qaMichael Kozono2018-06-221-6/+18
| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jl-helm-polish-docs' into 'master'48315-add-jsconfig-json-file-to-map-our-custom-webpack-resolve-pathsMike Lewis2018-06-222-9/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor fixes for the Helm docs See merge request gitlab-org/gitlab-ce!20078
| * | | | | | | | | | | | | | | | | | | | | Update gitlab_chart.mdMike Lewis2018-06-221-1/+1
| | | | | | | | | | | | | | | | | | | | | |