Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | update to current master and fix conflictsissue-title-vue | Regis | 2017-03-21 | 642 | -4999/+8618 |
|\ | |||||
| * | Merge branch '29428-new-directory-from-existing-branch' into 'master' | Sean McGivern | 2017-03-21 | 7 | -20/+101 |
| |\ | |||||
| | * | New directory from interface on existing branch | Jacopo | 2017-03-21 | 7 | -20/+101 |
| * | | Merge branch 'dz-hide-share-group-ancestors' into 'master' | Douwe Maan | 2017-03-21 | 4 | -2/+29 |
| |\ \ | |||||
| | * | | Hide ancestor groups in the share group dropdown listdz-hide-share-group-ancestors | Dmitriy Zaporozhets | 2017-03-21 | 4 | -2/+29 |
| * | | | 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 |
| * | | | | Merge branch 'index-routes-path-for-like' into 'master' | Douwe Maan | 2017-03-21 | 3 | -4/+36 |
| |\ \ \ \ | |||||
| | * | | | | Add LIKE index for routes.path | Yorick Peterse | 2017-03-21 | 3 | -4/+36 |
| * | | | | | Merge branch 'fix-invalid-yaml-in-changelog-entry' into 'master' | Sean McGivern | 2017-03-21 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fix invalid YAML in changelogs/unreleased/27142-api-replace-destroy-with-stop... | Rémy Coutable | 2017-03-21 | 1 | -1/+1 |
| * | | | | | | Merge branch 'feature/tokens-rake-task' into 'master' | Sean McGivern | 2017-03-21 | 3 | -0/+63 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | Add a rake task to reset all email and private tokens | James Lopez | 2017-03-21 | 3 | -0/+63 |
| |/ / / / / | |||||
| * | | | | | Merge branch 'create-branch-service-create-file' into 'master' | Sean McGivern | 2017-03-21 | 2 | -3/+27 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fix CreateBranchService after Repository#commit_file was renamed to create_file | Adam Niedzielski | 2017-03-21 | 2 | -3/+27 |
| * | | | | | | Merge branch 'api-project-issues-404' into 'master' | Sean McGivern | 2017-03-21 | 5 | -2/+18 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | Return 404 in project issues API endpoint when project cannot be found | Adam Niedzielski | 2017-03-20 | 5 | -2/+18 |
| * | | | | | | Merge branch 'fix/gb/pipeline-intermittent-running-status' into 'master' | Kamil Trzciński | 2017-03-21 | 2 | -0/+19 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| | * | | | | | Extend compound status for manual actions specs | Grzegorz Bizon | 2017-03-20 | 1 | -1/+11 |
| | * | | | | | Fix pipeline status for transition between stages | Grzegorz Bizon | 2017-03-20 | 2 | -0/+9 |
| * | | | | | | Merge branch '29685-wrong-number-of-arguments-calling-http_url_to_repo-on-clo... | Sean McGivern | 2017-03-21 | 7 | -23/+87 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Fix ProjectWiki#http_url_to_repo signature | Rémy Coutable | 2017-03-20 | 7 | -23/+87 |
| * | | | | | | | Merge branch 'dz-improve-rename-projects-migration' into 'master' | Yorick Peterse | 2017-03-21 | 1 | -30/+1 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
| | * | | | | | | Improve rename projects migration | Dmitriy Zaporozhets | 2017-03-20 | 1 | -30/+1 |
| * | | | | | | | Merge branch 'sh-fix-admin-application-settings' into 'master' | Robert Speicher | 2017-03-21 | 5 | -2/+67 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Undo explicit conversion to Integer | Toon Claes | 2017-03-20 | 2 | -12/+28 |
| | * | | | | | | | Make level_value accept string integers | Toon Claes | 2017-03-20 | 2 | -2/+23 |
| | * | | | | | | | Make feature spec more robust | Toon Claes | 2017-03-20 | 1 | -2/+1 |
| | * | | | | | | | Fix Error 500 when application settings are saved | Stan Hu | 2017-03-18 | 3 | -0/+29 |
| * | | | | | | | | Merge branch 'add-filter-focus-style' into 'master' | Alfredo Sumaran | 2017-03-21 | 3 | -4/+52 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | 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 | 3 | -4/+49 |
| | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| * | | | | | | | | Merge branch 'perf/add-index-to-user-ghost' into 'master' | Douwe Maan | 2017-03-21 | 2 | -3/+28 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | add an index to the ghost column | http://jneen.net/ | 2017-03-20 | 2 | -3/+28 |
| * | | | | | | | | | Merge branch 'fix-typos-in-v3-to-v4-doc' into 'master' | Douwe Maan | 2017-03-21 | 1 | -30/+30 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Make the v3_to_v4.md more consistent | Rémy Coutable | 2017-03-20 | 1 | -30/+30 |
| | | |_|_|_|/ / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | Merge branch '29671-remove-useless-options' into 'master' | Douwe Maan | 2017-03-21 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Remove useless options from db/fixtures/development/17_cycle_analytics.rb | Rémy Coutable | 2017-03-20 | 1 | -1/+1 |
| * | | | | | | | | | | Merge branch 'bugfix/systemhook' into 'master' | Douwe Maan | 2017-03-21 | 3 | -5/+11 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Fix bug when system hook for deploy key | billy.lb | 2017-03-16 | 3 | -5/+11 |
| | | |_|_|_|_|/ / / / | | |/| | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'rs-issue-29592' into 'master' | Stan Hu | 2017-03-21 | 2 | -3/+11 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Handle Route#name being nil after an update | Robert Speicher | 2017-03-20 | 2 | -3/+11 |
| * | | | | | | | | | | | Merge remote-tracking branch 'dev/master' | DJ Mountney | 2017-03-20 | 50 | -54/+258 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Merge branch 'render-json-leak' into 'security' | DJ Mountney | 2017-03-20 | 4 | -2/+38 |
| | * | | | | | | | | | | | Merge branch 'ssrf' into 'security' | Rubén Dávila | 2017-03-20 | 1 | -0/+2 |
| | * | | | | | | | | | | | Merge branch 'ssrf' into 'security' | Douwe Maan | 2017-03-20 | 8 | -1/+140 |
| | * | | | | | | | | | | | Merge branch 'fix-links-target-blank' into 'security' | Jacob Schatz | 2017-03-20 | 30 | -36/+38 |