| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Setup dispatcher require failtestsContext-error-example-for-mike | Luke "Jared" Bennett | 2017-05-22 | 3 | -428/+424 |
| | | |||||
| * | Merge branch '31510-mask-password-field-edit' into 'master' | Phil Hughes | 2017-05-22 | 3 | -3/+7 |
| |\ | | | | | | | | | | | | | Show password field mask while editing service settings Closes #31510 See merge request !11431 | ||||
| | * | Show password field mask while editing service settings | Kushal Pandya | 2017-05-22 | 3 | -3/+7 |
| |/ | |||||
| * | Merge branch '32496-admin-tabs' into 'master' | Phil Hughes | 2017-05-22 | 1 | -35/+36 |
| |\ | | | | | | | | | | | | | Fix admin tabs Closes #32496 See merge request !11514 | ||||
| | * | Fix admin tabs32496-admin-tabs | Annabel Dunstone Gray | 2017-05-18 | 1 | -35/+36 |
| | | | |||||
| * | | Merge branch '32667-update-helm-chart-documentation' into 'master' | Achilleas Pipinellis | 2017-05-22 | 1 | -0/+2 |
| |\ \ | | | | | | | | | | | | | Update Helm Chart documentation See merge request !11588 | ||||
| | * | | Add notes for supported schedulers and cloud providers32667-update-helm-chart-documentation | Joshua Lambert | 2017-05-22 | 1 | -0/+2 |
| |/ / | |||||
| * | | Merge branch '32604-add-docs-for-change-of-cache-artifact-restore-order' ↵ | Achilleas Pipinellis | 2017-05-21 | 1 | -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-21 | 1 | -1/+7 |
| |/ / | |||||
| * | | Merge branch '32462-award-emoji-tooltip-should-be-add-reaction' into 'master' | Annabel Dunstone Gray | 2017-05-21 | 3 | -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-reaction | Mike Greiling | 2017-05-19 | 3 | -4/+4 |
| | | | | |||||
| * | | | Merge branch 'zj-pipeline-json-performance' into 'master' | Kamil Trzciński | 2017-05-21 | 1 | -5/+33 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Improve pipeline size for query limit test Closes #31906 See merge request !11323 | ||||
| | * | | | Improve pipeline size for query limit testzj-pipeline-json-performance | Z.J. van de Weg | 2017-05-17 | 1 | -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ński | 2017-05-21 | 3 | -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-jobs | Grzegorz Bizon | 2017-05-19 | 3 | -1/+15 |
| | | | | | | |||||
| * | | | | | Merge branch 'docs/issues-multiple-assignees' into 'master' | Sean Packham (GitLab) | 2017-05-20 | 6 | -11/+25 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add to docs: issues multiple assignees Closes gitlab-ee#2440 and #32574 See merge request !11556 | ||||
| | * | | | | | Add to docs: issues multiple assignees | Marcia Ramos | 2017-05-20 | 6 | -11/+25 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'docs/add-comment-snippets' into 'master' | Sean Packham (GitLab) | 2017-05-20 | 2 | -0/+10 |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds "comments on snippets" to doc Closes #32575 See merge request !11563 | ||||
| | * | | | | | adds "comments on snippets" to docdocs/add-comment-snippets | Marcia Ramos | 2017-05-19 | 2 | -0/+10 |
| | |/ / / / | |||||
| * | | | | | Merge branch 'bvl-fix-already-renamed-paths' into 'master' | Douwe Maan | 2017-05-19 | 5 | -1/+250 |
| |\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | Fix incorrect renaming migrations Closes #32526 and #32530 See merge request !11515 | ||||
| | * | | | | Rename users on mysqlbvl-fix-already-renamed-paths | Bob Van Landuyt | 2017-05-19 | 1 | -4/+15 |
| | | | | | | |||||
| | * | | | | Don't try to rename `-` | Bob Van Landuyt | 2017-05-19 | 1 | -1/+0 |
| | | | | | | |||||
| | * | | | | Simpler way of renaming users | Bob Van Landuyt | 2017-05-19 | 2 | -10/+10 |
| | | | | | | |||||
| | * | | | | Fix incorrectly renamed routes | Bob Van Landuyt | 2017-05-19 | 3 | -1/+178 |
| | | | | | | |||||
| | * | | | | Rename users that had their namespace renamed | Bob Van Landuyt | 2017-05-19 | 3 | -1/+63 |
| | | |_|/ | |/| | | |||||
| * | | | | Merge branch 'winh-frontend-api-users' into 'master' | Clement Ho | 2017-05-19 | 13 | -114/+419 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add users endpoint to frontend API class See merge request !11374 | ||||
| | * | | | | Add users endpoint to frontend API class | Winnie Hellmann | 2017-05-19 | 13 | -114/+419 |
| |/ / / / | |||||
| * | | | | Merge branch 'fix-json-endpoint-redirection' into 'master' | Douwe Maan | 2017-05-19 | 2 | -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 in | Ruben Davila | 2017-05-19 | 2 | -1/+30 |
| | | |/ / | |/| | | |||||
| * | | | | Merge branch '32536-mr-widget-performance-improvements' into 'master' | Fatih Acet | 2017-05-19 | 12 | -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-improvements | Oswaldo Ferreira | 2017-05-19 | 1 | -1/+4 |
| | | | | | | |||||
| | * | | | | Remove route | Oswaldo Ferreira | 2017-05-19 | 3 | -12/+0 |
| | | | | | | |||||
| | * | | | | Fix Karma expect | Oswaldo Ferreira | 2017-05-18 | 1 | -1/+0 |
| | | | | | | |||||
| | * | | | | Stop loading MergeRequestEntity data on sidebar request | Oswaldo Ferreira | 2017-05-18 | 5 | -4/+4 |
| | | | | | | |||||
| | * | | | | Remove unnecessary initial request | Oswaldo Ferreira | 2017-05-18 | 2 | -2/+0 |
| | | | | | | |||||
| | * | | | | Drop merge_check endpoint and use only MR show instead | Oswaldo Ferreira | 2017-05-18 | 3 | -9/+20 |
| | | |/ / | |/| | | |||||
| * | | | | Merge branch 'winh-dropdown-ajax-cache' into 'master' | Clement Ho | 2017-05-19 | 1 | -28/+6 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use AjaxCache in Droplab Ajax plugin Closes #31897 See merge request !11171 | ||||
| | * | | | | Use AjaxCache in Droplab Ajax plugin (!11171)winh-dropdown-ajax-cache | winh | 2017-05-18 | 1 | -28/+6 |
| | | | | | | |||||
| * | | | | | Merge branch 'fix-issue-32506' into 'master' | Douwe Maan | 2017-05-19 | 12 | -313/+645 |
| |\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | Fix redirects modifying the host Closes #32506 See merge request !11498 | ||||
| | * | | | | Refactor to more robust implementationfix-issue-32506 | Michael Kozono | 2017-05-19 | 10 | -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 routes | Michael Kozono | 2017-05-18 | 4 | -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 fix | Michael Kozono | 2017-05-18 | 1 | -0/+13 |
| | | | | | | |||||
| | * | | | | Fix #32506 | Michael Kozono | 2017-05-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | The host should not be modified, nor is it needed for the redirect. | ||||
| * | | | | | Merge branch 'auto-update-docs' into 'master' | Clement Ho | 2017-05-19 | 1 | -0/+3 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Auto update docs See merge request !11552 | ||||
| | * | | | | | Auto update docsauto-update-docs | Victor Wu | 2017-05-19 | 1 | -0/+3 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'update-retried-migration' into 'master' | Rémy Coutable | 2017-05-19 | 1 | -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-migration | Lin Jen-Shin | 2017-05-19 | 1 | -14/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #32469 | ||||
| * | | | | | | | Merge branch '32595-fix-vertical-misalignment-mr-widget' into 'master' | Filipa Lacerda | 2017-05-19 | 4 | -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 text | Kushal Pandya | 2017-05-19 | 4 | -3/+19 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge branch '32551-fix-system-note-comparison-and-standardize-note-setup' ↵ | Filipa Lacerda | 2017-05-19 | 4 | -17/+32 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Fix system note comparison and standardize note setup Closes #32551 See merge request !11532 | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |