| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
| | | |||||
| * | Add users endpoint to frontend API class | Winnie Hellmann | 2017-05-19 | 12 | -114/+138 |
| | | |||||
| * | Merge branch 'fix-json-endpoint-redirection' into 'master' | Douwe Maan | 2017-05-19 | 1 | -1/+4 |
| |\ | | | | | | | | | 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 | 1 | -1/+4 |
| | | | |||||
| * | | Merge branch '32536-mr-widget-performance-improvements' into 'master' | Fatih Acet | 2017-05-19 | 6 | -18/+13 |
| |\ \ | | | | | | | | | | | | | Load improvements related to MR widget See merge request !11518 | ||||
| | * | | Remove route | Oswaldo Ferreira | 2017-05-19 | 1 | -6/+0 |
| | | | | |||||
| | * | | Stop loading MergeRequestEntity data on sidebar request | Oswaldo Ferreira | 2017-05-18 | 3 | -2/+2 |
| | | | | |||||
| | * | | Remove unnecessary initial request | Oswaldo Ferreira | 2017-05-18 | 1 | -1/+0 |
| | | | | |||||
| | * | | Drop merge_check endpoint and use only MR show instead | Oswaldo Ferreira | 2017-05-18 | 2 | -9/+11 |
| | | | | |||||
| * | | | 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 | 6 | -5/+37 |
| |\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | Fix redirects modifying the host Closes #32506 See merge request !11498 | ||||
| | * | | | Refactor to more robust implementationfix-issue-32506 | Michael Kozono | 2017-05-19 | 6 | -13/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -5/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| | * | | | Fix #32506 | Michael Kozono | 2017-05-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | The host should not be modified, nor is it needed for the redirect. | ||||
| * | | | | Refine MR widget styling for buttons and info text | Kushal Pandya | 2017-05-19 | 3 | -2/+18 |
| | | | | | |||||
| * | | | | Merge branch '32551-fix-system-note-comparison-and-standardize-note-setup' ↵ | Filipa Lacerda | 2017-05-19 | 2 | -13/+11 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Fix system note comparison and standardize note setup Closes #32551 See merge request !11532 | ||||
| | * | | | | Fix system note comparison and standardize note setup | Eric Eastwood | 2017-05-19 | 2 | -13/+11 |
| | | |_|/ | |/| | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32551 | ||||
| * | | | | Merge branch '32556-side-by-side-mr-discussion-should-stretch-to-max-width' ↵ | Annabel Dunstone Gray | 2017-05-19 | 1 | -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-width | Clement Ho | 2017-05-19 | 1 | -1/+0 |
| | | | | | | |||||
| * | | | | | Merge branch 'patch-21' into 'master' | Clement Ho | 2017-05-19 | 1 | -1/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix wording in settings / CI/CD Pipelines Closes #32555 See merge request !11516 | ||||
| | * | | | | | Update edit.html.hamlpatch-21 | Fabio Busatto | 2017-05-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | Closes #32555 | ||||
| * | | | | | | Replaced duplicate z-index with index of 400 | Luke "Jared" Bennett | 2017-05-19 | 1 | -2/+1 |
| | |/ / / / |/| | | | | |||||
| * | | | | | Merge branch 'mr-widget-refresh-failed' into 'master' | Filipa Lacerda | 2017-05-19 | 1 | -1/+27 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add refresh button into MR widget failed state. Closes #32543 See merge request !11519 | ||||
| | * | | | | | MRWidget: Make error message bold and red.mr-widget-refresh-failed | Fatih Acet | 2017-05-19 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | MRWidget: Change refresh button place in failed state. | Fatih Acet | 2017-05-19 | 1 | -3/+3 |
| | | | | | | | |||||
| | * | | | | | MRWidget: Add refresh button into MR widget failed state. | Fatih Acet | 2017-05-19 | 1 | -0/+26 |
| | | | | | | | |||||
| * | | | | | | Fixes the 500 for custom apearance header logo and logo | Alexis Reigel | 2017-05-19 | 1 | -0/+2 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'dm-fix-readme-project-view' into 'master' | Dmitriy Zaporozhets | 2017-05-19 | 4 | -45/+9 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove readme project_view option See merge request !11425 | ||||
| | * | | | | | | Remove readme project_view option | Douwe Maan | 2017-05-19 | 4 | -45/+9 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'dm-render-plain-readme' into 'master' | Rémy Coutable | 2017-05-19 | 2 | -8/+10 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Render plain README using Markup viewer so it is displayed below tree See merge request !11510 | ||||
| | * | | | | | | | Render plain README using Markup viewer so it is displayed below treedm-render-plain-readme | Douwe Maan | 2017-05-18 | 2 | -8/+10 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'user-avatar-vue-ce' into 'master' | Phil Hughes | 2017-05-19 | 17 | -70/+307 |
| |\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consolidate user avatar Vue logic Closes #31017 See merge request !10718 | ||||
| | * | | | | | | | Add s selectors for supported avatars.user-avatar-vue-ce | Bryce Johnson | 2017-05-18 | 1 | -0/+2 |
| | | | | | | | | | |||||
| | * | | | | | | | Fixes per feedback on user avatar components. | Bryce Johnson | 2017-05-18 | 3 | -23/+14 |
| | | | | | | | | | |||||
| | * | | | | | | | Consolidate user avatar Vue logic | Bryce Johnson | 2017-05-18 | 17 | -70/+314 |
| | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | | Fix JavaScript translations that are using a namespacefix-js-translations | Ruben Davila | 2017-05-18 | 6 | -11/+11 |
| | |_|/ / / / |/| | | | | | |||||
| * | | | | | | Merge branch 'dm-no-conflicts-when-branches-are-missing' into 'master' | Robert Speicher | 2017-05-18 | 2 | -0/+3 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stop MR conflict code from blowing up when branches are missing Closes #32544 See merge request !11501 | ||||
| | * | | | | | | Stop MR conflict code from blowing up when branches are missingdm-no-conflicts-when-branches-are-missing | Douwe Maan | 2017-05-18 | 2 | -0/+3 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'delete-old-mr-widget' into 'master' | Fatih Acet | 2017-05-18 | 1 | -303/+0 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delete merge_request_widget.js See merge request !11452 | ||||
| | * | | | | | | | Delete merge_request_widget.jsdelete-old-mr-widget | Luke "Jared" Bennett | 2017-05-17 | 1 | -303/+0 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix clicking disabled clipboard button toolip | Luke "Jared" Bennett | 2017-05-18 | 1 | -2/+2 |
| | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | | Fix ProjectCacheWorker for plain READMEs | Toon Claes | 2017-05-18 | 1 | -0/+3 |
| | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ProjectCacheWorker refreshes cache periodically, but it runs outside Rails context. So include the ActionView helpers so the `content_tag` method is available. | ||||
| * | | | | | | Fix ability to edit diff notes multiple times | Kushal Pandya | 2017-05-18 | 1 | -3/+3 |
| | |_|/ / / |/| | | | | |||||
| * | | | | | Merge branch 'dm-gemfile-viewer' | Rémy Coutable | 2017-05-18 | 16 | -3/+268 |
| |\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | See merge request !11346. | ||||
| | * | | | | Add auxiliary blob viewers to dependency files | Douwe Maan | 2017-05-17 | 16 | -3/+268 |
| | |/ / / | |||||
| * | | | | Merge branch 'fix-trailing-space-mr-widget' into 'master' | Fatih Acet | 2017-05-18 | 1 | -4/+1 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactored the anchor tag to remove the trailing space in the target branch Closes #32445 See merge request !11463 | ||||
| | * | | | | Refactored the anchor tag to remove the trailing space in the target branchfix-trailing-space-mr-widget | Jose Ivan Vargas | 2017-05-17 | 1 | -4/+1 |
| | | | | | | |||||
| * | | | | | Merge branch 'change-url-in-specific-runners-registration-steps' into 'master' | Kamil Trzciński | 2017-05-18 | 1 | -1/+1 |
| |\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | Remove references to '/ci' path while describing Runner's registration See merge request !10518 | ||||
| | * | | | | Remove references to '/ci' path while describing Runner's registrationchange-url-in-specific-runners-registration-steps | Tomasz Maczukin | 2017-05-15 | 1 | -1/+1 |
| | | | | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |