summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'update-retried-migration' into 'master'9-2-stable-fix-conflicts-for-partial-indexRémy Coutable2017-05-221-0/+15
* Merge branch '32657-fix-mr-widget-styles' into 'master'Fatih Acet2017-05-222-7/+15
* Merge branch 'mr-11396-conflicts' into '9-2-stable'Yorick Peterse2017-05-220-0/+0
|\
* \ Merge branch 'mr-11396-conflicts' into '9-2-stable'Yorick Peterse2017-05-222-14/+25
|\ \ | |/
| * Resolve migration helper conflictsmr-11396-conflictsBob Van Landuyt2017-05-222-23/+6
| * [ci skip] Conflicts while picking !11396 into 9-2-stableYorick Peterse2017-05-222-0/+28
* | Update VERSION to 9.2.0v9.2.0Lin Jen-Shin2017-05-221-1/+1
* | Update CHANGELOG.md for 9.2.0Lin Jen-Shin2017-05-22198-797/+200
* | Merge branch '9-2-stable-fix-conflicts-for-mr-11593' into '9-2-stable'Lin Jen-Shin (godfat)2017-05-222-13/+67
|\ \ | |/ |/|
| * Resolve conflicts, using changes from masterLin Jen-Shin2017-05-221-22/+2
| * Merge branch 'fix-retried-for-mysql' into 'master'9-2-stable-fix-conflicts-for-mr-11593Timothy Andrew2017-05-222-0/+74
|/
* Update VERSION to 9.2.0-rc7v9.2.0-rc7Regis2017-05-191-1/+1
* Merge branch 'bvl-fix-already-renamed-paths' into 'master'Douwe Maan2017-05-195-2/+250
* Merge branch 'fix-issue-32506' into 'master'Douwe Maan2017-05-1912-313/+645
* Merge branch '32595-fix-vertical-misalignment-mr-widget' into 'master'Filipa Lacerda2017-05-193-2/+18
* Merge branch '28558-update-copy' into 'master' Filipa Lacerda2017-05-191-2/+2
* Merge branch '9-2-stable-fix-conflicts-for-mr-11189' into '9-2-stable'Regis Boudinot2017-05-195-29/+23
|\
| * Remove incorrectly picked styles9-2-stable-fix-conflicts-for-mr-11189kushalpandya2017-05-201-4/+0
| * Merge branch '9-2-stable' into 9-2-stable-fix-conflicts-for-mr-11189Clement Ho2017-05-193-1/+18
| |\ | |/ |/|
* | Merge branch 'dm-copy-mr-source-branch-as-gfm' into 'master' Sean McGivern2017-05-192-0/+13
* | Merge branch '9-2-stable-fix-conflicts-for-mr-11547' into '9-2-stable'Regis Boudinot2017-05-191-1/+5
|\ \
| * | Resolve header.scss conflictsLuke "Jared" Bennett2017-05-191-3/+0
| * | Merge branch 'fix-header-z-index' into 'master'9-2-stable-fix-conflicts-for-mr-11547Annabel Dunstone Gray2017-05-191-1/+8
| | * Merge branch '9-2-stable' into 9-2-stable-fix-conflicts-for-mr-11189Clement Ho2017-05-19170-1362/+2947
| | |\ | |_|/ |/| |
* | | Merge branch 'tab-title-blank' into '9-2-stable'Regis Boudinot2017-05-191-2/+2
|\ \ \
| * | | Correctly set title_text with API datatab-title-blankPhil Hughes2017-05-191-2/+2
* | | | Merge branch '9-2-stable-fix-conflicts-for-mr-11391' into '9-2-stable'Clement Ho2017-05-194-7/+34
|\ \ \ \
| * | | | Fix conflicts9-2-stable-fix-conflicts-for-mr-11391Clement Ho2017-05-191-147/+16
* | | | | Merge branch '9-2-stable-fix-conflicts-for-mr-11463' into '9-2-stable'Regis Boudinot2017-05-192-26/+29
|\ \ \ \ \
| * | | | | Resolve mr_widget_header conflict9-2-stable-fix-conflicts-for-mr-11463Jose Ivan Vargas2017-05-191-29/+0
| * | | | | Merge branch 'fix-trailing-space-mr-widget' into 'master'Fatih Acet2017-05-192-0/+32
* | | | | | Merge branch '32556-side-by-side-mr-discussion-should-stretch-to-max-width' i...Annabel Dunstone Gray2017-05-191-1/+0
* | | | | | Merge branch '32551-fix-system-note-comparison-and-standardize-note-setup' in...Filipa Lacerda2017-05-194-17/+32
* | | | | | Merge branch '32602-add-docs-for-remove-filter-in-search-bar' into 'master'Achilleas Pipinellis2017-05-193-2/+6
| |_|_|/ / |/| | | |
* | | | | Merge branch '9-2-stable-fix-conflicts-for-mr-11298' into '9-2-stable'Douwe Maan2017-05-1915-208/+276
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix 9.2 conflicts for 'Fix conflict resolution from corrupted upstream'9-2-stable-fix-conflicts-for-mr-11298Douwe Maan2017-05-194-107/+8
| * | | | Merge branch 'fix-conflict-resolution-with-corrupt-repos' into 'master'Douwe Maan2017-05-1915-107/+274
* | | | | Merge branch 'disable-usage-ping' into 'master'Robert Speicher2017-05-199-67/+118
| |/ / / |/| | |
* | | | Merge branch '32583-update-prometheus-merge-request-widget-documentation' int...Achilleas Pipinellis2017-05-192-3/+7
* | | | Merge branch '9-2-stable-fix-conflicts-for-mr-11427' into '9-2-stable'Douwe Maan2017-05-191-0/+1
|\ \ \ \
| * | | | Fixed merging conflict on the blob load viewer9-2-stable-fix-conflicts-for-mr-11427Tim Zallmann2017-05-191-39/+1
| * | | | Merge branch 'dm-scroll-to-blob-user-content' into 'master'Douwe Maan2017-05-181-0/+39
* | | | | Merge branch 'zj-increase-accuracy-ps' into 'master'Kamil Trzciński2017-05-191-1/+1
* | | | | Merge branch 'mr-widget-refresh-failed' into 'master'Filipa Lacerda2017-05-191-1/+27
* | | | | Fix deployment status icon and alignment on 9-2-stable branchkushalpandya2017-05-191-1/+1
* | | | | Fix incorrect import for `UsersSelect` on 9-2-stable branchkushalpandya2017-05-191-1/+0
* | | | | Merge branch '32074-failed-build' into 'master' Phil Hughes2017-05-192-102/+233
* | | | | Merge branch 'fix/allow-accessing-appearance-images' into 'master'Rémy Coutable2017-05-193-0/+46
* | | | | Remove line referencing an non-existing class in the 9-2-stable branchRémy Coutable2017-05-191-1/+0
* | | | | Merge branch 'fix-main-bundle-sans-vue' into 'master' Clement Ho2017-05-192-7/+14