summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* update to current master and fix conflictsissue-title-vueRegis2017-03-21642-4999/+8618
|\
| * 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
| |\ \ \ \ \
| | * | | | | Fix invalid YAML in changelogs/unreleased/27142-api-replace-destroy-with-stop...Rémy Coutable2017-03-211-1/+1
| * | | | | | Merge branch 'feature/tokens-rake-task' into 'master' Sean McGivern2017-03-213-0/+63
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Add a rake task to reset all email and private tokensJames Lopez2017-03-213-0/+63
| |/ / / / /
| * | | | | Merge branch 'create-branch-service-create-file' into 'master' Sean McGivern2017-03-212-3/+27
| |\ \ \ \ \
| | * | | | | Fix CreateBranchService after Repository#commit_file was renamed to create_fileAdam Niedzielski2017-03-212-3/+27
| * | | | | | Merge branch 'api-project-issues-404' into 'master' Sean McGivern2017-03-215-2/+18
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Return 404 in project issues API endpoint when project cannot be foundAdam Niedzielski2017-03-205-2/+18
| * | | | | | Merge branch 'fix/gb/pipeline-intermittent-running-status' into 'master' Kamil Trzciński2017-03-212-0/+19
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Extend compound status for manual actions specsGrzegorz Bizon2017-03-201-1/+11
| | * | | | | Fix pipeline status for transition between stagesGrzegorz Bizon2017-03-202-0/+9
| * | | | | | Merge branch '29685-wrong-number-of-arguments-calling-http_url_to_repo-on-clo...Sean McGivern2017-03-217-23/+87
| |\ \ \ \ \ \
| | * | | | | | Fix ProjectWiki#http_url_to_repo signatureRémy Coutable2017-03-207-23/+87
| * | | | | | | Merge branch 'dz-improve-rename-projects-migration' into 'master' Yorick Peterse2017-03-211-30/+1
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | Improve rename projects migrationDmitriy Zaporozhets2017-03-201-30/+1
| * | | | | | | Merge branch 'sh-fix-admin-application-settings' into 'master' Robert Speicher2017-03-215-2/+67
| |\ \ \ \ \ \ \
| | * | | | | | | Undo explicit conversion to IntegerToon Claes2017-03-202-12/+28
| | * | | | | | | Make level_value accept string integersToon Claes2017-03-202-2/+23
| | * | | | | | | Make feature spec more robustToon Claes2017-03-201-2/+1
| | * | | | | | | Fix Error 500 when application settings are savedStan Hu2017-03-183-0/+29
| * | | | | | | | Merge branch 'add-filter-focus-style' into 'master' Alfredo Sumaran2017-03-213-4/+52
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix karma testClement Ho2017-03-201-3/+2
| | * | | | | | | | Add additional check for when inputContainer does not existClement Ho2017-03-201-1/+5
| | * | | | | | | | Add filter focus for filtered search visual tokensClement Ho2017-03-173-4/+49
| | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Merge branch 'perf/add-index-to-user-ghost' into 'master' Douwe Maan2017-03-212-3/+28
| |\ \ \ \ \ \ \ \
| | * | | | | | | | add an index to the ghost columnhttp://jneen.net/2017-03-202-3/+28
| * | | | | | | | | Merge branch 'fix-typos-in-v3-to-v4-doc' into 'master' Douwe Maan2017-03-211-30/+30
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Make the v3_to_v4.md more consistentRémy Coutable2017-03-201-30/+30
| | | |_|_|_|/ / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch '29671-remove-useless-options' into 'master' Douwe Maan2017-03-211-1/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Remove useless options from db/fixtures/development/17_cycle_analytics.rbRémy Coutable2017-03-201-1/+1
| * | | | | | | | | | Merge branch 'bugfix/systemhook' into 'master' Douwe Maan2017-03-213-5/+11
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix bug when system hook for deploy keybilly.lb2017-03-163-5/+11
| | | |_|_|_|_|/ / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'rs-issue-29592' into 'master' Stan Hu2017-03-212-3/+11
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Handle Route#name being nil after an updateRobert Speicher2017-03-202-3/+11
| * | | | | | | | | | | Merge remote-tracking branch 'dev/master'DJ Mountney2017-03-2050-54/+258
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Merge branch 'render-json-leak' into 'security' DJ Mountney2017-03-204-2/+38
| | * | | | | | | | | | | Merge branch 'ssrf' into 'security' Rubén Dávila2017-03-201-0/+2
| | * | | | | | | | | | | Merge branch 'ssrf' into 'security' Douwe Maan2017-03-208-1/+140
| | * | | | | | | | | | | Merge branch 'fix-links-target-blank' into 'security'Jacob Schatz2017-03-2030-36/+38