summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Script for load testing with k6qa-load-test-script-for-k6Sanad Liaquat2019-03-261-0/+16
|
* Merge branch 'winh-jest-time' into 'master'Kushal Pandya2019-03-222-0/+6
|\ | | | | | | | | | | | | Mock and wait for timers in Jest Closes #56056 See merge request gitlab-org/gitlab-ce!26433
| * Delete dummy testWinnie Hellmann2019-03-211-7/+0
| |
| * Wait for pending timers in JestWinnie Hellmann2019-03-211-0/+5
| |
| * Mock timers in JestWinnie Hellmann2019-03-211-0/+1
| |
| * Add dummy test with setTimeout()Winnie Hellmann2019-03-211-0/+7
| |
* | Merge branch '57357-automate-base-domain-help-text' into 'master'Kushal Pandya2019-03-226-5/+111
|\ \ | | | | | | | | | | | | | | | | | | Automate base domain help text on Clusters page Closes #57357 See merge request gitlab-org/gitlab-ce!26124
| * | Add changelog entryEnrique Alcantara2019-03-211-0/+5
| | |
| * | Update domain help text when ingress is installedEnrique Alcantara2019-03-214-2/+101
| | | | | | | | | | | | | | | | | | When ingress application is installed, the cluster domain help text is updated to indicate that ingress external ip can be used as the cluster domain
| * | Hide/show ingress external ip help textEnrique Alcantara2019-03-212-4/+6
| | | | | | | | | | | | Use not_to instead of to__not
* | | Merge branch 'winh-toggle-comment-draft' into 'master'Kushal Pandya2019-03-227-32/+234
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Display draft when toggling replies Closes #48211 and #56364 See merge request gitlab-org/gitlab-ce!25563
| * | | Remove autosave logic from NoteableDiscussion componentWinnie Hellmann2019-03-211-17/+4
| | | |
| * | | Pass autosaveKey from NoteableDiscussion to NoteFormWinnie Hellmann2019-03-214-0/+16
| | | |
| * | | Validate NoteForm props in noteable_discussion_spec.jsWinnie Hellmann2019-03-211-1/+12
| | | |
| * | | Use autosave utilities in NoteForm componentWinnie Hellmann2019-03-212-9/+106
| | | |
| * | | Add autosave utilitiesWinnie Hellmann2019-03-122-0/+91
| | | |
| * | | Rename initialDiscussion to firstNote in NoteableDiscussionWinnie Hellmann2019-03-121-7/+7
| | | |
* | | | Merge branch 'da-capitalize-db-apapter-name-on-rails-console' into 'master'Stan Hu2019-03-225-6/+22
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Display the database adapter name in a human-friendly way See merge request gitlab-org/gitlab-ce!26437
| * | | | Add helper method to return a human-friendly name for database adapterDouglas Barbosa Alexandre2019-03-215-6/+22
| | | | |
* | | | | Merge branch 'docs/edit-youtrack-docs' into 'master'Mike Lewis2019-03-224-20/+25
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Improve Youtrack documentation for style See merge request gitlab-org/gitlab-ce!26457
| * | | | | Improve Youtrack documentation for styleEvan Read2019-03-224-20/+25
|/ / / / /
* | | | | Merge branch 'review-youtrack-docs' into 'master'Evan Read2019-03-222-21/+24
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | YouTrack docs review Closes #58225 See merge request gitlab-org/gitlab-ce!26454
| * | | | | YouTrack docs reviewMike Lewis2019-03-222-21/+24
|/ / / / /
* | | | | Merge branch 'docs/wiki-permissions' into 'master'Evan Read2019-03-222-5/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify wiki permissions Closes #53964 See merge request gitlab-org/gitlab-ce!23044
| * | | | | Clarify wiki permissionsdocs/wiki-permissionsAchilleas Pipinellis2018-11-142-5/+11
| | | | | |
* | | | | | Merge branch '57655-fix-markdown-tables-border' into 'master'awinata-operation-env-testClement Ho2019-03-215-12/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix markdown table header and table content borders Closes #57655 See merge request gitlab-org/gitlab-ce!25666
| * | | | | | Remove :not pseudo-class from md-table stylesEnrique Alcántara2019-03-215-12/+17
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rollback change that adds :not(js-syntax-highlight) pseudo-class to markdown selectors to fix syntax highlight tables in MR code suggestions. Removes redundant inclusion of md-typography mixin as an alternative fix.
* | | | | | Merge branch ↵Clement Ho2019-03-212-3/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '56944-kubernetes-create-cluster-add-help-text-to-environment-field' into 'master' Resolve "Kubernetes > Create cluster > Add help text to environment field" Closes #56944 See merge request gitlab-org/gitlab-ce!25891
| * | | | | | Add help text to "environment scope" field in new cluster formMike Greiling2019-03-202-3/+6
| | | | | | |
* | | | | | | Merge branch '57894-buttons-on-group-page-are-misaligned' into 'master'Annabel Dunstone Gray2019-03-212-1/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Buttons on group page are misaligned" Closes #57894 See merge request gitlab-org/gitlab-ce!26292
| * | | | | | | Fix misalignment of group overview page buttonsDennis Tang2019-03-202-1/+6
| |/ / / / / /
* | | | | | | Merge branch 'winh-remove-sushi' into 'master'Mike Greiling2019-03-21104-148/+146
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove .raw from JavaScript fixture file names Closes #59201 See merge request gitlab-org/gitlab-ce!26430
| * | | | | | | Remove .raw from JavaScript fixture file namesWinnie Hellmann2019-03-21104-148/+146
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is nothing more to say but "Commits that change 30 or more lines across at least three files must describe these changes in the commit body"
* | | | | | | Update VERSION to 11.10.0-prev11.10.0.preGitLab Release Tools Bot2019-03-211-1/+1
| | | | | | |
* | | | | | | Update CHANGELOG.md for 11.9.0GitLab Release Tools Bot2019-03-21231-1153/+260
| | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Merge branch 'docs-wip-refactor' into 'master'Achilleas Pipinellis2019-03-215-18/+39
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Rewrite Work In Progress MR page Closes #34559 See merge request gitlab-org/gitlab-ce!25732
| * | | | | | | Docs: Rewrite Work In Progress MR pageMarcel Amirault2019-03-215-18/+39
|/ / / / / / /
* | | | | | | Merge branch '59147-duplicate-match-line' into 'master'Douwe Maan2019-03-214-11/+28
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix duplicated bottom match line Closes #59147 See merge request gitlab-org/gitlab-ce!26402
| * | | | | | | Fix diff bottom expand button appears twiceMark Chao2019-03-214-11/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a quick fix by only append match line once when calling diff_lines_for_serializer multiple time. Also enable feature by default
* | | | | | | | Merge branch '10514-fix-non-existing-authorized-keys-file' into 'master'Nick Thomas2019-03-212-45/+145
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle cases when authorized_keys doesn't exist See merge request gitlab-org/gitlab-ce!26347
| * | | | | | | | Update Gitlab::AuthorizedKeys specs to be clearerPatrick Bajao2019-03-211-4/+40
| | | | | | | | |
| * | | | | | | | Handle cases when authorized_keys doesn't existPatrick Bajao2019-03-202-46/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modify Gitlab::AuthorizedKeys#rm_key and #list_key_ids to handle cases when an `Errno::ENOENT` is raised. Also added test cases in spec to ensure each method will still work when authorized_keys doesn't exist.
* | | | | | | | | Merge branch 'doc-feature-flag-command' into 'master'Achilleas Pipinellis2019-03-211-0/+14
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add documentation reference for chatops feature flag commands See merge request gitlab-org/gitlab-ce!26425
| * | | | | | | | | Add documentation reference for chatops feature flag commandsJacob Vosmaer2019-03-211-0/+14
| | | | | | | | | |
* | | | | | | | | | Merge branch 'ab-db-review-issue-template' into 'master'Douwe Maan2019-03-211-0/+32
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add issue template for database reviewer See merge request gitlab-org/gitlab-ce!25867
| * | | | | | | | | | Add issue template for database reviewerAndreas Brandl2019-03-201-0/+32
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch 'nfriend-update-merge-request-widget-pipeline-block' into 'master'Filipa Lacerda2019-03-2111-18/+328
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update merge request widget pipeline block to accommodate post-merge pipelines See merge request gitlab-org/gitlab-ce!25745
| * | | | | | | | | | Update merge request widget pipeline blockNathan Friend2019-03-2111-18/+328
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit updates the pipeline block that appears on the merge request page to include information that will be exposed by the API as part of the post-merge pipeline feature.
* | | | | | | | | | Merge branch 'mw-i18n-admin-controllers' into 'master'Lin Jen-Shin2019-03-2116-61/+235
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Externalize strings in admin controllers See merge request gitlab-org/gitlab-ce!26357
| * | | | | | | | | | Externalize strings in admin controllersMartin Wortschack2019-03-2116-61/+235
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Update PO file