summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* upgrade Vue to v2.2.4Mike Greiling2017-03-212-4/+4
* Merge branch 'resolve-global-vue' into 'master' Filipa Lacerda2017-03-2162-79/+127
|\
| * remove additional instances of window.VueMike Greiling2017-03-202-5/+5
| * fix wait_for_vue_resource to not rely on global Vue objectMike Greiling2017-03-202-5/+8
| * make eslint happyMike Greiling2017-03-201-1/+1
| * remove Vue from the global spaceMike Greiling2017-03-2058-69/+114
* | Merge branch 'dm-fix-vue-cant-compile-some-discussions' into 'master' Robert Speicher2017-03-211-1/+1
|\ \
| * | Escape values passed from Rails to Vue to make sure the template can be compiledDouwe Maan2017-03-211-1/+1
* | | Merge branch 'fix-routes-index-migration' into 'master' Douwe Maan2017-03-211-2/+2
|\ \ \
| * | | Fix routes index migrationSean McGivern2017-03-211-2/+2
|/ / /
* | | Merge branch 'revert-37328406' into 'master' Rémy Coutable2017-03-216-56/+8
|\ \ \
| * | | Revert "Merge branch '29534-todos-performance' into 'master'"Sean McGivern2017-03-216-56/+8
* | | | Merge branch '29583-routes-like-fix' into 'master' Sean McGivern2017-03-215-7/+36
|\ \ \ \
| * | | | Escape route path for LIKE queriesJarka Kadlecova2017-03-215-7/+36
* | | | | Merge branch 'replace_closing_mr_icon' into 'master' Annabel Dunstone Gray2017-03-212-1/+5
|\ \ \ \ \
| * | | | | Replace closing MR iconblackst0ne2017-03-212-1/+5
* | | | | | Merge branch 'jej-backport-authorless-fix' into 'master' Douwe Maan2017-03-212-0/+29
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Prevented error on nil author from Issuable delegationJames Edwards-Jones2017-03-212-0/+29
* | | | | | Merge branch '29302-improve-the-prometheus-queries-for-multiple-container-env...Rémy Coutable2017-03-214-13/+17
|\ \ \ \ \ \
| * | | | | | Resolve "Fix the Prometheus queries for multiple container environments"Jose Ivan Vargas Lopez2017-03-214-13/+17
|/ / / / / /
* | | | | | Merge branch 'sh-fix-issue-29739' into 'master' Sean McGivern2017-03-212-4/+15
|\ \ \ \ \ \
| * | | | | | Fix Error 500 when Bitbucket importer does not have authorizationStan Hu2017-03-202-4/+15
* | | | | | | Merge branch 'gitaly-install-rake' into 'master' Robert Speicher2017-03-2113-16/+316
|\ \ \ \ \ \ \
| * | | | | | | Fix typo [ci skip]Jacob Vosmaer2017-03-211-1/+1
| * | | | | | | Add gitaly admin docsJacob Vosmaer2017-03-212-0/+89
| * | | | | | | Remove unnecessary before blockJacob Vosmaer2017-03-212-6/+0
| * | | | | | | Add gitaly source installation instructionsJacob Vosmaer2017-03-217-12/+118
| * | | | | | | Print command output when a task failedJacob Vosmaer2017-03-211-1/+1
| * | | | | | | Rake task that can install gitaly at a tag versionJacob Vosmaer2017-03-213-0/+111
* | | | | | | | Merge branch 'source-branch-toggle-text' into 'master' Filipa Lacerda2017-03-212-1/+7
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Fixed source branch name not being in new merge request dropdown togglePhil Hughes2017-03-202-1/+7
* | | | | | | | Merge branch '29659-add-padding' into 'master' Filipa Lacerda2017-03-211-0/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Add space to bottom of screenAnnabel Dunstone Gray2017-03-201-0/+4
* | | | | | | | | Merge branch 'add-test-backoff-util' into 'master' Filipa Lacerda2017-03-212-0/+71
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Changed code style as to not to disable any eslint rulesadd-test-backoff-utilJose Ivan Vargas2017-03-201-14/+13
| * | | | | | | | | Removed unused response in promiseJose Ivan Vargas2017-03-201-2/+2
| * | | | | | | | | Added unit tests for the w.gl.utils.backOff promiseJose Ivan Vargas2017-03-202-0/+72
* | | | | | | | | | Merge branch '28618-fix-circular-dependency' into 'master' Alfredo Sumaran2017-03-211-4/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Resolve "Circular dependency detected" (duplicate)Mike Greiling2017-03-211-4/+4
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '29428-new-directory-from-existing-branch' into 'master' Sean McGivern2017-03-217-20/+101
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | New directory from interface on existing branchJacopo2017-03-217-20/+101
* | | | | | | | | | Merge branch 'dz-hide-share-group-ancestors' into 'master' Douwe Maan2017-03-214-2/+29
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Hide ancestor groups in the share group dropdown listdz-hide-share-group-ancestorsDmitriy Zaporozhets2017-03-214-2/+29
* | | | | | | | | | | Merge branch '29618-clarify-help-text-on-prometheus-integration-page' into 'm...Douwe Maan2017-03-211-1/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Move text to a MD heredoc.Joshua Lambert2017-03-211-1/+8
| * | | | | | | | | | | Add additional details on metric source being k8s nodesJoshua Lambert2017-03-181-1/+1
| * | | | | | | | | | | Clarify help text29618-clarify-help-text-on-prometheus-integration-pageJoshua Lambert2017-03-171-1/+1
* | | | | | | | | | | | Merge branch 'index-routes-path-for-like' into 'master' Douwe Maan2017-03-213-4/+36
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add LIKE index for routes.pathYorick Peterse2017-03-213-4/+36
* | | | | | | | | | | | | Merge branch 'fix-invalid-yaml-in-changelog-entry' into 'master' Sean McGivern2017-03-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \