Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'resolve-global-vue' into 'master' | Filipa Lacerda | 2017-03-21 | 54 | -68/+115 |
|\ | |||||
| * | remove additional instances of window.Vue | Mike Greiling | 2017-03-20 | 2 | -5/+5 |
| * | fix wait_for_vue_resource to not rely on global Vue object | Mike Greiling | 2017-03-20 | 1 | -4/+7 |
| * | make eslint happy | Mike Greiling | 2017-03-20 | 1 | -1/+1 |
| * | remove Vue from the global space | Mike Greiling | 2017-03-20 | 51 | -59/+103 |
* | | Merge branch 'dm-fix-vue-cant-compile-some-discussions' into 'master' | Robert Speicher | 2017-03-21 | 1 | -1/+1 |
|\ \ | |||||
| * | | Escape values passed from Rails to Vue to make sure the template can be compiled | Douwe Maan | 2017-03-21 | 1 | -1/+1 |
* | | | Merge branch 'revert-37328406' into 'master' | Rémy Coutable | 2017-03-21 | 4 | -21/+8 |
|\ \ \ | |||||
| * | | | Revert "Merge branch '29534-todos-performance' into 'master'" | Sean McGivern | 2017-03-21 | 4 | -21/+8 |
* | | | | Merge branch '29583-routes-like-fix' into 'master' | Sean McGivern | 2017-03-21 | 3 | -3/+5 |
|\ \ \ \ | |||||
| * | | | | Escape route path for LIKE queries | Jarka Kadlecova | 2017-03-21 | 3 | -3/+5 |
* | | | | | Merge branch 'replace_closing_mr_icon' into 'master' | Annabel Dunstone Gray | 2017-03-21 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Replace closing MR icon | blackst0ne | 2017-03-21 | 1 | -1/+1 |
* | | | | | | Merge branch 'jej-backport-authorless-fix' into 'master' | Douwe Maan | 2017-03-21 | 1 | -0/+1 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Prevented error on nil author from Issuable delegation | James Edwards-Jones | 2017-03-21 | 1 | -0/+1 |
| | |/ / / | |/| | | | |||||
* | | | | | Resolve "Fix the Prometheus queries for multiple container environments" | Jose Ivan Vargas Lopez | 2017-03-21 | 3 | -11/+15 |
* | | | | | Merge branch 'sh-fix-issue-29739' into 'master' | Sean McGivern | 2017-03-21 | 1 | -4/+4 |
|\ \ \ \ \ | |||||
| * | | | | | Fix Error 500 when Bitbucket importer does not have authorization | Stan Hu | 2017-03-20 | 1 | -4/+4 |
* | | | | | | Merge branch 'source-branch-toggle-text' into 'master' | Filipa Lacerda | 2017-03-21 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Fixed source branch name not being in new merge request dropdown toggle | Phil Hughes | 2017-03-20 | 1 | -1/+1 |
* | | | | | | Merge branch '29659-add-padding' into 'master' | Filipa Lacerda | 2017-03-21 | 1 | -0/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add space to bottom of screen | Annabel Dunstone Gray | 2017-03-20 | 1 | -0/+4 |
* | | | | | | | Merge branch '29428-new-directory-from-existing-branch' into 'master' | Sean McGivern | 2017-03-21 | 3 | -5/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | New directory from interface on existing branch | Jacopo | 2017-03-21 | 3 | -5/+6 |
* | | | | | | | | Merge branch 'dz-hide-share-group-ancestors' into 'master' | Douwe Maan | 2017-03-21 | 2 | -1/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Hide ancestor groups in the share group dropdown listdz-hide-share-group-ancestors | Dmitriy Zaporozhets | 2017-03-21 | 2 | -1/+2 |
* | | | | | | | | | Merge branch '29618-clarify-help-text-on-prometheus-integration-page' into 'm... | Douwe Maan | 2017-03-21 | 1 | -1/+8 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Move text to a MD heredoc. | Joshua Lambert | 2017-03-21 | 1 | -1/+8 |
| * | | | | | | | | | Add additional details on metric source being k8s nodes | Joshua Lambert | 2017-03-18 | 1 | -1/+1 |
| * | | | | | | | | | Clarify help text29618-clarify-help-text-on-prometheus-integration-page | Joshua Lambert | 2017-03-17 | 1 | -1/+1 |
* | | | | | | | | | | Fix CreateBranchService after Repository#commit_file was renamed to create_file | Adam Niedzielski | 2017-03-21 | 1 | -3/+3 |
| |_|_|_|_|_|/ / / |/| | | | | | | | | |||||
* | | | | | | | | | Merge branch 'fix/gb/pipeline-intermittent-running-status' into 'master' | Kamil Trzciński | 2017-03-21 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix pipeline status for transition between stages | Grzegorz Bizon | 2017-03-20 | 1 | -0/+1 |
* | | | | | | | | | | Merge branch '29685-wrong-number-of-arguments-calling-http_url_to_repo-on-clo... | Sean McGivern | 2017-03-21 | 2 | -8/+7 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Fix ProjectWiki#http_url_to_repo signature | Rémy Coutable | 2017-03-20 | 2 | -8/+7 |
* | | | | | | | | | | Merge branch 'sh-fix-admin-application-settings' into 'master' | Robert Speicher | 2017-03-21 | 1 | -0/+9 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Undo explicit conversion to Integer | Toon Claes | 2017-03-20 | 1 | -12/+0 |
| * | | | | | | | | | | Fix Error 500 when application settings are saved | Stan Hu | 2017-03-18 | 2 | -0/+21 |
* | | | | | | | | | | | Merge branch 'add-filter-focus-style' into 'master' | Alfredo Sumaran | 2017-03-21 | 2 | -4/+40 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Fix karma test | Clement Ho | 2017-03-20 | 1 | -3/+2 |
| * | | | | | | | | | | | Add additional check for when inputContainer does not exist | Clement Ho | 2017-03-20 | 1 | -1/+5 |
| * | | | | | | | | | | | Add filter focus for filtered search visual tokens | Clement Ho | 2017-03-17 | 2 | -4/+37 |
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'bugfix/systemhook' into 'master' | Douwe Maan | 2017-03-21 | 1 | -5/+4 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Fix bug when system hook for deploy key | billy.lb | 2017-03-16 | 1 | -5/+4 |
* | | | | | | | | | | | Merge branch 'rs-issue-29592' into 'master' | Stan Hu | 2017-03-21 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Handle Route#name being nil after an update | Robert Speicher | 2017-03-20 | 1 | -1/+1 |
* | | | | | | | | | | | | Merge remote-tracking branch 'dev/master' | DJ Mountney | 2017-03-20 | 37 | -41/+57 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'render-json-leak' into 'security' | DJ Mountney | 2017-03-20 | 2 | -2/+2 |
| * | | | | | | | | | | | Merge branch 'ssrf' into 'security' | Douwe Maan | 2017-03-20 | 3 | -1/+14 |
| * | | | | | | | | | | | Merge branch 'fix-links-target-blank' into 'security' | Jacob Schatz | 2017-03-20 | 28 | -34/+35 |