summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Handle transient MR query count spechandle-transient-mr-query-count-specOswaldo Ferreira2017-05-191-1/+1
* Merge branch 'bvl-fix-already-renamed-paths' into 'master'Douwe Maan2017-05-195-1/+250
|\
| * 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 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 inRuben Davila2017-05-192-1/+30
* | | Merge branch '32536-mr-widget-performance-improvements' into 'master'Fatih Acet2017-05-1912-28/+27
|\ \ \
| * | | 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 (!11171)winh-dropdown-ajax-cachewinh2017-05-181-28/+6
* | | | Merge branch 'fix-issue-32506' into 'master'Douwe Maan2017-05-1912-313/+645
|\ \ \ \ | |_|_|/ |/| | |
| * | | Refactor to more robust implementationfix-issue-32506Michael Kozono2017-05-1910-22/+272
| * | | Fix ensure_canonical_path for top level routesMichael Kozono2017-05-184-317/+386
| * | | Add test that fails without the fixMichael Kozono2017-05-181-0/+13
| * | | Fix #32506Michael Kozono2017-05-181-1/+1
* | | | Merge branch 'auto-update-docs' into 'master'Clement Ho2017-05-191-0/+3
|\ \ \ \
| * | | | 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 migrationupdate-retried-migrationLin Jen-Shin2017-05-191-14/+28
* | | | | | Merge branch '32595-fix-vertical-misalignment-mr-widget' into 'master'Filipa Lacerda2017-05-194-3/+19
|\ \ \ \ \ \
| * | | | | | 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' in...Filipa Lacerda2017-05-194-17/+32
|\ \ \ \ \ \
| * | | | | | Fix system note comparison and standardize note setupEric Eastwood2017-05-194-17/+32
| | |_|_|_|/ | |/| | | |
* | | | | | 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"Sean Packham (GitLab)2017-05-193-2/+6
|/ / / / / /
* | | | | | Merge branch '32556-side-by-side-mr-discussion-should-stretch-to-max-width' i...Annabel Dunstone Gray2017-05-191-1/+0
|\ \ \ \ \ \
| * | | | | | 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 sectionwinh-testing-promises-docspatch-20Winnie Hellmann2017-05-181-6/+7
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'patch-21' into 'master'Clement Ho2017-05-191-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Update edit.html.hamlpatch-21Fabio Busatto2017-05-181-1/+1
* | | | | | | | Merge branch 'fix-header-z-index' into 'master'Annabel Dunstone Gray2017-05-191-2/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Replaced duplicate z-index with index of 400Luke "Jared" Bennett2017-05-191-2/+1
|/ / / / / / /
* | | | | | | Merge branch '31933-improve-rspec-profiling-enabling' into 'master'Stan Hu2017-05-192-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Enable RSpec profiling only if RSPEC_PROFILING_POSTGRES_URL is not empty31933-improve-rspec-profiling-enablingRémy Coutable2017-05-192-2/+2
* | | | | | | | Merge branch 'add-cop-descriptions' into 'master'Robert Speicher2017-05-191-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Add descriptions for the RSpec/EmptyExampleGroup and RSpec/ExpectOutput copsadd-cop-descriptionsRémy Coutable2017-05-191-1/+2
| |/ / / / / / /
* | | | | | | | Merge branch 'docs/artifacts-preview' into 'master'32612-decide-on-and-document-a-convention-for-passing-context-to-event-handlersSean Packham (GitLab)2017-05-191-0/+4
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Add note about artifacts previewing in docsdocs/artifacts-previewAchilleas Pipinellis2017-05-191-0/+4
* | | | | | | | Merge branch '32583-update-prometheus-merge-request-widget-documentation' int...Achilleas Pipinellis2017-05-192-3/+7
|\ \ \ \ \ \ \ \