summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* MR widget styling fixes32657-fix-mr-widget-styleskushalpandya2017-05-222-7/+15
|
* Merge branch '32604-add-docs-for-change-of-cache-artifact-restore-order' ↵Achilleas Pipinellis2017-05-211-1/+7
|\ | | | | | | | | | | | | | | | | into 'master' Add docs for change of Cache/Artifact restore order" Closes #32604 See merge request !11545
| * Add docs for change of Cache/Artifact restore order"Sean Packham (GitLab)2017-05-211-1/+7
|/
* Merge branch '32462-award-emoji-tooltip-should-be-add-reaction' into 'master'Annabel Dunstone Gray2017-05-213-4/+4
|\ | | | | | | | | | | | | Resolve ""Award Emoji" tooltip should be "Add reaction"" Closes #32462 See merge request !11569
| * rename "Add emoji" and "Award emoji" to "Add reaction" where appropriate32462-award-emoji-tooltip-should-be-add-reactionMike Greiling2017-05-193-4/+4
| |
* | Merge branch 'zj-pipeline-json-performance' into 'master'Kamil Trzciński2017-05-211-5/+33
|\ \ | | | | | | | | | | | | | | | | | | Improve pipeline size for query limit test Closes #31906 See merge request !11323
| * | Improve pipeline size for query limit testzj-pipeline-json-performanceZ.J. van de Weg2017-05-171-5/+33
| | | | | | | | | | | | | | | | | | | | | The pipeline was quite meagre in both stages and the number of groups. This has been improved. Performance is not yet optimal, but to limit this from sliding further this slippery slope, a hard limit has been set.
* | | Merge branch 'fix/gb/exclude-manual-actions-from-cancelable-jobs' into 'master'Kamil Trzciński2017-05-213-1/+15
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Exclude manual actions when checking if pipeline can be canceled Closes #31107 See merge request !11562
| * | | Exclude manual actions from cancelable jobs scopefix/gb/exclude-manual-actions-from-cancelable-jobsGrzegorz Bizon2017-05-193-1/+15
| | | |
* | | | Merge branch 'docs/issues-multiple-assignees' into 'master'Sean Packham (GitLab)2017-05-206-11/+25
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add to docs: issues multiple assignees Closes gitlab-ee#2440 and #32574 See merge request !11556
| * | | | Add to docs: issues multiple assigneesMarcia Ramos2017-05-206-11/+25
| | | | |
* | | | | Merge branch 'docs/add-comment-snippets' into 'master'Sean Packham (GitLab)2017-05-202-0/+10
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Adds "comments on snippets" to doc Closes #32575 See merge request !11563
| * | | | adds "comments on snippets" to docdocs/add-comment-snippetsMarcia Ramos2017-05-192-0/+10
| |/ / /
* | | | Merge branch 'bvl-fix-already-renamed-paths' into 'master'Douwe Maan2017-05-195-1/+250
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Fix incorrect renaming migrations Closes #32526 and #32530 See merge request !11515
| * | | Rename users on mysqlbvl-fix-already-renamed-pathsBob Van Landuyt2017-05-191-4/+15
| | | |
| * | | Don't try to rename `-`Bob Van Landuyt2017-05-191-1/+0
| | | |
| * | | Simpler way of renaming usersBob Van Landuyt2017-05-192-10/+10
| | | |
| * | | Fix incorrectly renamed routesBob Van Landuyt2017-05-193-1/+178
| | | |
| * | | Rename users that had their namespace renamedBob Van Landuyt2017-05-193-1/+63
| | | |
* | | | Merge branch 'winh-frontend-api-users' into 'master'Clement Ho2017-05-1913-114/+419
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add users endpoint to frontend API class See merge request !11374
| * | | | Add users endpoint to frontend API classWinnie Hellmann2017-05-1913-114/+419
|/ / / /
* | | | Merge branch 'fix-json-endpoint-redirection' into 'master'Douwe Maan2017-05-192-1/+30
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Bugfix: don't redirect to JSON endpoints after sign in See merge request !11561
| * | | | Bugfix: don't redirect to JSON endpoints after sign inRuben Davila2017-05-192-1/+30
| | |/ / | |/| |
* | | | Merge branch '32536-mr-widget-performance-improvements' into 'master'Fatih Acet2017-05-1912-28/+27
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Load improvements related to MR widget See merge request !11518
| * | | | Make sure fixture creation does not affect query count test32536-mr-widget-performance-improvementsOswaldo Ferreira2017-05-191-1/+4
| | | | |
| * | | | Remove routeOswaldo Ferreira2017-05-193-12/+0
| | | | |
| * | | | Fix Karma expectOswaldo Ferreira2017-05-181-1/+0
| | | | |
| * | | | Stop loading MergeRequestEntity data on sidebar requestOswaldo Ferreira2017-05-185-4/+4
| | | | |
| * | | | Remove unnecessary initial requestOswaldo Ferreira2017-05-182-2/+0
| | | | |
| * | | | Drop merge_check endpoint and use only MR show insteadOswaldo Ferreira2017-05-183-9/+20
| | |/ / | |/| |
* | | | Merge branch 'winh-dropdown-ajax-cache' into 'master'Clement Ho2017-05-191-28/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use AjaxCache in Droplab Ajax plugin Closes #31897 See merge request !11171
| * | | | Use AjaxCache in Droplab Ajax plugin (!11171)winh-dropdown-ajax-cachewinh2017-05-181-28/+6
| | | | |
* | | | | Merge branch 'fix-issue-32506' into 'master'Douwe Maan2017-05-1912-313/+645
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Fix redirects modifying the host Closes #32506 See merge request !11498
| * | | | Refactor to more robust implementationfix-issue-32506Michael Kozono2017-05-1910-22/+272
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to avoid string manipulation or modify route params (to make them unambiguous for `url_for`), we are accepting a behavior change: When being redirected to the canonical path for a group, if you requested a group show path starting with `/groups/…` then you’ll now be redirected to the group at root `/…`.
| * | | | Fix ensure_canonical_path for top level routesMichael Kozono2017-05-184-317/+386
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don’t replace a substring of the path if it is part of the top level route. E.g. When redirecting from `/groups/ups` to `/groups/foo`, be careful not to do `/grofoo/ups`. Projects are unaffected by this issue, but I am grouping the `#ensure_canonical_path` tests similar to the group and user tests.
| * | | | Add test that fails without the fixMichael Kozono2017-05-181-0/+13
| | | | |
| * | | | Fix #32506Michael Kozono2017-05-181-1/+1
| | | | | | | | | | | | | | | | | | | | The host should not be modified, nor is it needed for the redirect.
* | | | | Merge branch 'auto-update-docs' into 'master'Clement Ho2017-05-191-0/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Auto update docs See merge request !11552
| * | | | | Auto update docsauto-update-docsVictor Wu2017-05-191-0/+3
| | | | | |
* | | | | | Merge branch 'update-retried-migration' into 'master'Rémy Coutable2017-05-191-14/+28
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add temporary partial index to speed up the migration Closes #32469 See merge request !11534
| * | | | | | Add temporary partial index to speed up the migrationupdate-retried-migrationLin Jen-Shin2017-05-191-14/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #32469
* | | | | | | Merge branch '32595-fix-vertical-misalignment-mr-widget' into 'master'Filipa Lacerda2017-05-194-3/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refine MR widget styling for buttons and info text Closes #32595 See merge request !11548
| * | | | | | | Refine MR widget styling for buttons and info textKushal Pandya2017-05-194-3/+19
|/ / / / / / /
* | | | | | | Merge branch '32551-fix-system-note-comparison-and-standardize-note-setup' ↵Filipa Lacerda2017-05-194-17/+32
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Fix system note comparison and standardize note setup Closes #32551 See merge request !11532
| * | | | | | | Fix system note comparison and standardize note setupEric Eastwood2017-05-194-17/+32
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32551
* | | | | | | Merge branch '32602-add-docs-for-remove-filter-in-search-bar' into 'master'Achilleas Pipinellis2017-05-193-2/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add docs for "Remove Filter in Search Bar" Closes #32602 See merge request !11541
| * | | | | | | Add docs for "Remove Filter in Search Bar"Sean Packham (GitLab)2017-05-193-2/+6
|/ / / / / / /
* | | | | | | Merge branch '32556-side-by-side-mr-discussion-should-stretch-to-max-width' ↵Annabel Dunstone Gray2017-05-191-1/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Side by side MR discussion should stretch to max width" Closes #32556 See merge request !11508
| * | | | | | | Remove width limit from discussion notes32556-side-by-side-mr-discussion-should-stretch-to-max-widthClement Ho2017-05-191-1/+0
| | | | | | | |
* | | | | | | | Merge branch 'winh-testing-promises-docs' into 'master'Clement Ho2017-05-191-6/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor changes to Testing Promises section See merge request !11517
View Lorry Controller Status