summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'docs/profile-preferences' into 'master' Achilleas Pipinellis2017-03-221-4/+6
|\
| * Update user's profile preferences docsAchilleas Pipinellis2017-03-221-4/+6
* | Merge branch 'profile-project-pagination-json-fix' into 'master' Jacob Schatz2017-03-222-5/+20
|\ \ | |/ |/|
| * Fixed pagination in projects & snippets on user pagePhil Hughes2017-03-182-5/+20
* | Merge branch '29483-spam-check-only-title-and-description' into 'master' Sean McGivern2017-03-225-5/+15
|\ \
| * | Spam check only when spammable attributes have changedOswaldo Ferreira2017-03-213-3/+6
| * | Present ajax call errors when failing to update an IssueOswaldo Ferreira2017-03-212-2/+9
* | | Merge branch 'add-todos-shortcut' into 'master' Sean McGivern2017-03-224-1/+13
|\ \ \
| * | | Add global `g t` shortcut to go to todosSean McGivern2017-03-174-1/+13
* | | | Fixed the job tootip being cut-offPhil Hughes2017-03-222-3/+3
* | | | Merge branch '29043-upgrade-vue-and-remove-warnings' into 'master' Fatih Acet2017-03-221-0/+6
|\ \ \ \
| * | | | move common vue script to vue_shared directoryMike Greiling2017-03-211-3/+1
| * | | | disable the Vue production warning in development and testingMike Greiling2017-03-211-0/+8
* | | | | Removed unnecessary 'add' text in additional award emoji buttonDimitrie Hoekstra2017-03-222-3/+12
|/ / / /
* | | | Merge branch 'resolve-global-vue' into 'master' Filipa Lacerda2017-03-2154-68/+115
|\ \ \ \
| * | | | 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-201-4/+7
| * | | | make eslint happyMike Greiling2017-03-201-1/+1
| * | | | remove Vue from the global spaceMike Greiling2017-03-2051-59/+103
* | | | | 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 'revert-37328406' into 'master' Rémy Coutable2017-03-214-21/+8
|\ \ \ \ \ \
| * | | | | | Revert "Merge branch '29534-todos-performance' into 'master'"Sean McGivern2017-03-214-21/+8
* | | | | | | Merge branch '29583-routes-like-fix' into 'master' Sean McGivern2017-03-213-3/+5
|\ \ \ \ \ \ \
| * | | | | | | Escape route path for LIKE queriesJarka Kadlecova2017-03-213-3/+5
* | | | | | | | Merge branch 'replace_closing_mr_icon' into 'master' Annabel Dunstone Gray2017-03-211-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Replace closing MR iconblackst0ne2017-03-211-1/+1
* | | | | | | | | Merge branch 'jej-backport-authorless-fix' into 'master' Douwe Maan2017-03-211-0/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Prevented error on nil author from Issuable delegationJames Edwards-Jones2017-03-211-0/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Resolve "Fix the Prometheus queries for multiple container environments"Jose Ivan Vargas Lopez2017-03-213-11/+15
* | | | | | | | Merge branch 'sh-fix-issue-29739' into 'master' Sean McGivern2017-03-211-4/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix Error 500 when Bitbucket importer does not have authorizationStan Hu2017-03-201-4/+4
* | | | | | | | | Merge branch 'source-branch-toggle-text' into 'master' Filipa Lacerda2017-03-211-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Fixed source branch name not being in new merge request dropdown togglePhil Hughes2017-03-201-1/+1
* | | | | | | | | 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 '29428-new-directory-from-existing-branch' into 'master' Sean McGivern2017-03-213-5/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | New directory from interface on existing branchJacopo2017-03-213-5/+6
* | | | | | | | | | | Merge branch 'dz-hide-share-group-ancestors' into 'master' Douwe Maan2017-03-212-1/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Hide ancestor groups in the share group dropdown listdz-hide-share-group-ancestorsDmitriy Zaporozhets2017-03-212-1/+2
* | | | | | | | | | | | 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
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Fix CreateBranchService after Repository#commit_file was renamed to create_fileAdam Niedzielski2017-03-211-3/+3
| |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge branch 'fix/gb/pipeline-intermittent-running-status' into 'master' Kamil Trzciński2017-03-211-0/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix pipeline status for transition between stagesGrzegorz Bizon2017-03-201-0/+1
* | | | | | | | | | | | Merge branch '29685-wrong-number-of-arguments-calling-http_url_to_repo-on-clo...Sean McGivern2017-03-212-8/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix ProjectWiki#http_url_to_repo signatureRémy Coutable2017-03-202-8/+7
* | | | | | | | | | | | Merge branch 'sh-fix-admin-application-settings' into 'master' Robert Speicher2017-03-211-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \