| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Change translation for 'coding' by 'desarrollo' for Spanishupdate-coding-translation | Ruben Davila | 2017-05-20 | 2 | -3/+3 |
| | | |||||
| * | 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 | ||||
| | * | | | | | | Fix system note comparison and standardize note setup | Eric Eastwood | 2017-05-19 | 4 | -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 Pipinellis | 2017-05-19 | 3 | -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-19 | 3 | -2/+6 |
| |/ / / / / / | |||||
| * | | | | | | 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 'winh-testing-promises-docs' into 'master' | Clement Ho | 2017-05-19 | 1 | -6/+7 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor changes to Testing Promises section See merge request !11517 | ||||
| | * | | | | | | | Minor changes to Testing Promises sectionwinh-testing-promises-docspatch-20 | Winnie Hellmann | 2017-05-18 | 1 | -6/+7 |
| | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | | 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 | ||||
| * | | | | | | | | Merge branch 'fix-header-z-index' into 'master' | Annabel Dunstone Gray | 2017-05-19 | 1 | -2/+1 |
| |\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced duplicate z-index with index of 400 Closes #32609 See merge request !11547 | ||||
| | * | | | | | | | Replaced duplicate z-index with index of 400 | Luke "Jared" Bennett | 2017-05-19 | 1 | -2/+1 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge branch '31933-improve-rspec-profiling-enabling' into 'master' | Stan Hu | 2017-05-19 | 2 | -2/+2 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable RSpec profiling only if RSPEC_PROFILING_POSTGRES_URL is not empty Closes #31933 See merge request !11543 | ||||
| | * | | | | | | | Enable RSpec profiling only if RSPEC_PROFILING_POSTGRES_URL is not empty31933-improve-rspec-profiling-enabling | Rémy Coutable | 2017-05-19 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | | | | | Merge branch 'add-cop-descriptions' into 'master' | Robert Speicher | 2017-05-19 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add descriptions for the RSpec/EmptyExampleGroup and RSpec/ExpectOutput cops [ci skip] See merge request !11540 | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |