summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fixed the IDE commit list item loosing its active stateide-tab-active-click-fixPhil Hughes2018-06-252-3/+25
| | | | Closes #48125
* 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
| | | |
| * | | Simplify the decode secret stepjl-helm-polish-docsJoshua Lambert2018-06-221-11/+1
| | | |
| * | | Add a missing periodJoshua Lambert2018-06-221-1/+1
| | | |
| * | | Push CPU requirement to 6Joshua Lambert2018-06-211-1/+1
| | | |
| * | | Add additional commands for Mac OS for retrieving the passwordJoshua Lambert2018-06-211-3/+14
| | | |
| * | | Fix helm update commandJoshua Lambert2018-06-211-1/+1
| | | |
| * | | Minor polishJoshua Lambert2018-06-211-2/+2
| | | |
* | | | Merge branch '48296-remove-top-padding-on-gpg-popovers' into 'master'46524-sourcemaps-in-vue-files-are-brokenMike Greiling2018-06-221-0/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Remove top padding on GPG popovers" Closes #48296 See merge request gitlab-org/gitlab-ce!20110
| * | | | Remove top margin for bootstrap popover headers48296-remove-top-padding-on-gpg-popoversClement Ho2018-06-221-0/+6
| | | | |
* | | | | Merge branch 'rs-update-sprockets' into 'master'Stan Hu2018-06-221-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Bump sprockets to 3.7.2 to address CVE-2018-3760 See merge request gitlab-org/gitlab-ce!20109
| * | | | | Bump sprockets to 3.7.2 to address CVE-2018-3760Robert Speicher2018-06-221-1/+1
| | | | | |
* | | | | | Merge branch 'unify-match_ids.rb' into 'master'Robert Speicher2018-06-221-0/+7
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | Unify spec/support/matchers/match_ids.rb See merge request gitlab-org/gitlab-ce!20108
| * | | | | Bring changes from EELin Jen-Shin2018-06-221-0/+7
| | | | | |
* | | | | | Merge branch 'zj-commit-raw-diffs' into 'master'Douwe Maan2018-06-221-7/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Raw diffs are served from Gitaly Closes gitaly#222 See merge request gitlab-org/gitlab-ce!20091
| * | | | | | Raw diffs are served from Gitalyzj-commit-raw-diffsZeger-Jan van de Weg2018-06-221-7/+3
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitaly/issues/222
* | | | | | Merge branch 'unify-admin_groups_spec.rb' into 'master'Douwe Maan2018-06-221-0/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | Unify spec/features/admin/admin_groups_spec.rb See merge request gitlab-org/gitlab-ce!20107
| * | | | | Bring changes from EELin Jen-Shin2018-06-221-0/+1
| | | | | |
* | | | | | Merge branch 'fix-boards-issue-highlight' into 'master'Clement Ho2018-06-222-4/+5
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix boards issue highlight Closes #48068 See merge request gitlab-org/gitlab-ce!20063
| * | | | | Fix boards issue highlightGeorge Tsiolis2018-06-212-4/+5
| | | | | |
* | | | | | Merge branch 'rs-lib-gitlab-git-gitlab_projects-parity' into 'master'Robert Speicher2018-06-221-12/+13
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | CE-EE parity for lib/gitlab/git/gitlab_projects.rb See merge request gitlab-org/gitlab-ce!20047
| * | | | | CE-EE parity for lib/gitlab/git/gitlab_projects.rbrs-lib-gitlab-git-gitlab_projects-parityRobert Speicher2018-06-201-12/+13
| | | | | |
* | | | | | Merge branch 'blackst0ne-rails5-fix-data-store-spec' into 'master'Kamil Trzciński2018-06-222-8/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Rails5] Fix "'-1' is not a valid data_store" See merge request gitlab-org/gitlab-ce!19917
| * | | | | | [Rails5] Fix "'-1' is not a valid data_store"blackst0ne-rails5-fix-data-store-specblackst0ne2018-06-162-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/19882
* | | | | | | Merge branch 'patch-29' into 'master'Kamil Trzciński2018-06-221-26/+26
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update lfs_administration.md with language edits See merge request gitlab-org/gitlab-ce!19950
| * | | | | | | Update lfs_administration.md with language editsMarcel Amirault2018-06-181-26/+26
| | | | | | | |
* | | | | | | | Merge branch ↵Kamil Trzciński2018-06-221-13/+82
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'docs/sm/trouble-shooting-guid-for-timeout-of-background-upload' into 'master' Add troubleshooting guide for lfs uploading timeouts See merge request gitlab-org/gitlab-ce!19949
| * | | | | | | Add troubleshooring guid for lfs uploading timeoutsdocs/sm/trouble-shooting-guid-for-timeout-of-background-uploadShinya Maeda2018-06-181-13/+82
| | | | | | | |
* | | | | | | | Merge branch 'zj-find-ref-name' into 'master'Douwe Maan2018-06-221-11/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FindRefName RPC now mandatory Closes gitaly#221 See merge request gitlab-org/gitlab-ce!20090
View Lorry Controller Status