summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | unused propSimon Knox2017-11-061-7/+1
| * | | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 2518-saved-conf...Simon Knox2017-11-06485-3127/+4349
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | fix bad master mergeSimon Knox2017-11-021-4/+4
| * | | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 2518-saved-conf...Simon Knox2017-11-01371-4846/+5607
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | resolve conflictsSimon Knox2017-10-311-42/+17
| * | | | | | | | | | | | | match UX guide for submit/cancel buttonsSimon Knox2017-10-311-2/+2
| * | | | | | | | | | | | | apply changes for JS and CSS from gitlab-ee!2912Simon Knox2017-10-3115-65/+183
| * | | | | | | | | | | | | Remove unnecessary helper methodOswaldo Ferreira2017-10-311-6/+0
| * | | | | | | | | | | | | Initial CE backport for saved issue boardOswaldo Ferreira2017-10-311-6/+1
* | | | | | | | | | | | | | Merge branch 'sort-order-priority-labels-docs' into 'master'Sean McGivern2017-11-074-6/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Label priority and Priority sort ordersVictor Wu2017-11-074-6/+23
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'bugfix_banzai_closed_milestones' into 'master'Sean McGivern2017-11-073-5/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix GFM reference links for closed milestonesbugfix_banzai_closed_milestonesVitaliy @blackst0ne Klachkov2017-11-073-5/+36
* | | | | | | | | | | | | | | Merge branch 'feature_change_sort_refs' into 'master'Douwe Maan2017-11-073-6/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Change tags order in refs dropdownfeature_change_sort_refsVitaliy @blackst0ne Klachkov2017-11-073-6/+12
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'remove-per-cpu-metrics' into 'master'Tim Zallmann2017-11-071-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Updates CE metrics with updated versions from EE for supported metrics (EE ve...remove-per-cpu-metricsJoshua Lambert2017-11-061-2/+2
* | | | | | | | | | | | | | | Merge branch 'multiple-query-prometheus-graphs' into 'master'Tim Zallmann2017-11-079-35/+79
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | make legend X-offset into a constantmultiple-query-prometheus-graphsMike Greiling2017-11-062-6/+8
| * | | | | | | | | | | | | | | fix eslint max-lineMike Greiling2017-11-061-1/+2
| * | | | | | | | | | | | | | | correctly set the domain of a result set when it is different on other tracksMike Greiling2017-11-062-11/+11
| * | | | | | | | | | | | | | | add CHANGELOG.md entry for !15201Mike Greiling2017-11-061-0/+6
| * | | | | | | | | | | | | | | simplify legend label for additonal tracksMike Greiling2017-11-061-1/+1
| * | | | | | | | | | | | | | | fix karma failuresMike Greiling2017-11-064-4/+4
| * | | | | | | | | | | | | | | add dashed and dotted line styles for multiple-query graphsMike Greiling2017-11-064-10/+31
| * | | | | | | | | | | | | | | add track information to data legendMike Greiling2017-11-061-3/+7
| * | | | | | | | | | | | | | | process all queries within a graphMike Greiling2017-11-061-16/+24
| * | | | | | | | | | | | | | | pass all graph queries into createTimeSeriesMike Greiling2017-11-062-2/+3
| * | | | | | | | | | | | | | | fix bug in which axes are scaled only to first data setMike Greiling2017-11-061-2/+3
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'master-lint' into 'master'Stan Hu2017-11-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | fix borderzero lintmaster-lintSimon Knox2017-11-071-1/+1
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'es-module-copy_as_gfm' into 'master'Filipa Lacerda2017-11-068-61/+69
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | fix broken reference to transformGFMSelectiones-module-copy_as_gfmMike Greiling2017-11-011-2/+3
| * | | | | | | | | | | | | | fix broken module importMike Greiling2017-11-011-1/+3
| * | | | | | | | | | | | | | remove global export except in test environmentsMike Greiling2017-11-015-56/+60
| * | | | | | | | | | | | | | move to copy_as_gfm to behaviors since it is invoked on every pageMike Greiling2017-11-013-3/+4
* | | | | | | | | | | | | | | Merge branch '34768-fix-issuable-header-wrapping' into 'master'Annabel Dunstone Gray2017-11-065-8/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | 34768 Fix problem with issuable header wrapping when content is too long34768-fix-issuable-header-wrappingtauriedavis2017-11-035-8/+32
* | | | | | | | | | | | | | | | Merge branch '20666-404-error-issue-assigned-with-issues-disabled' into 'master'Clement Ho2017-11-065-11/+44
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fixes 404 error to `Issues assigned to me` and `Issues I've created` when iss...Jacopo2017-11-065-11/+44
* | | | | | | | | | | | | | | | Merge branch 'refactor-clusters' into 'master'Grzegorz Bizon2017-11-0671-1240/+2676
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Remove 10.3 comments (Tracked by a tech debts issue). Refactor spec factory n...refactor-clustersShinya Maeda2017-11-0616-207/+37
| | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'master' into refactor-clustersShinya Maeda2017-11-0619-91/+303
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix statis analysysShinya Maeda2017-11-051-1/+1
| * | | | | | | | | | | | | | Merge branch 'master' into refactor-clustersShinya Maeda2017-11-05241-1260/+1888
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Move migration file to post-migration. Use EachBatch. batch_size 1Shinya Maeda2017-11-043-103/+102
| * | | | | | | | | | | | | | Fix MigrateGcpClustersToNewClustersArchitectures. Improve specShinya Maeda2017-11-032-77/+169
| * | | | | | | | | | | | | | Fix import_export failureShinya Maeda2017-11-031-3/+4
| * | | | | | | | | | | | | | Fix spec failure. MySQL does not bite trueShinya Maeda2017-11-033-2/+7
| * | | | | | | | | | | | | | Merge branch 'master' into refactor-clustersEric Eastwood2017-11-0313-34/+85
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \