summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Fix dead lock by in_lock conflicts. Shared out in_lock logic. Changed key_r...Shinya Maeda2018-06-154-37/+51
* Merge branch 'master' into build-chunks-on-object-storageShinya Maeda2018-06-15368-2181/+3084
|\
| * Merge branch 'jivl-fix-missing-loading-dots-job-logs' into 'master'Clement Ho2018-06-141-1/+1
| |\
| | * Fix missing dots from the CI job log outputJose2018-06-141-1/+1
| * | Merge branch 'jivl-fix-create-project-template-buttons' into 'master'Annabel Gray2018-06-144-36/+33
| |\ \
| | * | Fix template iconsClement Ho2018-06-141-0/+6
| | * | Remove vertical-alignment from project template buttonsjivl-fix-create-project-template-buttonsJose2018-06-131-2/+4
| | * | Use d-blockClement Ho2018-06-133-10/+2
| | * | Fix change template formClement Ho2018-06-133-20/+12
| | * | Fix use template buttons for creating a new projectJose2018-06-132-11/+16
| * | | Resolve ""Click to expand" link in collapsed diffs should be blue"Annabel Gray2018-06-143-2/+3
| * | | Merge branch '47905-user-tabs-doesn-t-show-spinner' into 'master'Annabel Gray2018-06-141-1/+1
| |\ \ \
| | * | | Fix user tabs loading indicatorClement Ho2018-06-141-1/+1
| * | | | Resolve "Project homepage > Clone dropdown/input larger than other buttons"Annabel Gray2018-06-141-0/+2
| * | | | Resolve "Placeholder note renders the user name in a new line"Clement Ho2018-06-142-3/+3
| * | | | Merge branch '47675-strange-layout-for-pipelines-list-view' into 'master'Annabel Gray2018-06-141-0/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix overflow for pipelines table47675-strange-layout-for-pipelines-list-viewClement Ho2018-06-131-0/+1
| * | | | Merge branch '47646-ui-glitch' into 'master'Clement Ho2018-06-141-0/+1
| |\ \ \ \
| | * | | | line-height fixed for color chipsMurat Dogan2018-06-121-0/+1
| * | | | | Resolve "Performance bar Gitaly modal is hard to read"Annabel Gray2018-06-145-11/+11
| * | | | | Merge branch '46700-auto-devops' into 'master'Clement Ho2018-06-141-1/+1
| |\ \ \ \ \
| | * | | | | Fix alignment of anchor label46700-auto-devopsAnnabel Dunstone Gray2018-06-131-1/+1
| | | |/ / / | | |/| | |
| * | | | | Merge branch 'ide-pipeline-reset-state' into 'master'Filipa Lacerda2018-06-143-3/+15
| |\ \ \ \ \
| | * | | | | Resets state correctly when switching to merge request in IDEide-pipeline-reset-statePhil Hughes2018-06-133-3/+15
| * | | | | | Resolve "Tab active state is not changing correctly on new merge request page"Jan2018-06-141-1/+1
| * | | | | | Merge branch 'remove-link-label-vertical-alignment-property' into 'master'Filipa Lacerda2018-06-141-1/+1
| |\ \ \ \ \ \
| | * | | | | | Change label link vertical alignment propertyGeorge Tsiolis2018-05-071-1/+1
| * | | | | | | Merge branch 'rails5-database' into 'master'Sean McGivern2018-06-141-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Use data_source_exists? instead of table_exists?rails5-databaseJarka Kadlecová2018-06-141-1/+1
| * | | | | | | | Merge branch 'zj-mandatory-batch' into 'master'Sean McGivern2018-06-141-51/+7
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Move GC RPCs to mandatoryZeger-Jan van de Weg2018-06-131-51/+7
| | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Merge branch '47851-bump-cache-for-old-master-permission' into 'master'Dmitriy Zaporozhets2018-06-141-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Flush cache for project list47851-bump-cache-for-old-master-permissionMark Chao2018-06-141-1/+1
| * | | | | | | | | Merge branch 'blackst0ne-rails5-fix-snippets-finder' into 'master'Yorick Peterse2018-06-141-5/+10
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | [Rails5] Fix snippets_finder arel queriesblackst0ne-rails5-fix-snippets-finderblackst0ne2018-06-141-5/+10
| * | | | | | | | | | Deny repository disk access in development and testJacob Vosmaer (GitLab)2018-06-141-1/+6
| * | | | | | | | | | Merge branch 'rd-33733-showing-created-date-instead-of-updated-date-in-projec...Sean McGivern2018-06-141-0/+1
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Invalidate cache with project details when repository is updatedrd-33733-showing-created-date-instead-of-updated-date-in-project-listsRubén Dávila2018-06-131-0/+1
| * | | | | | | | | | | Merge branch 'ide-pipeline-error-wrap' into 'master'Filipa Lacerda2018-06-141-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Wrap YAML error in Web IDE pipelines panelide-pipeline-error-wrapPhil Hughes2018-06-131-1/+1
| * | | | | | | | | | | | enable CommonMark as the defaultBrett Walker2018-06-142-15/+23
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Fix branch name encoding for dropdown on issue pageWinnie Hellmann2018-06-131-16/+35
| | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'jivl-remove-remaining-btn-xs-class-usage' into 'master'Annabel Gray2018-06-138-23/+5
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| | * | | | | | | | | Remove the btn-xs class from the stylesheetsJose2018-06-138-23/+5
| * | | | | | | | | | Merge branch '47830-merge-request-diff-loading-icon-not-visible' into 'master'Annabel Gray2018-06-131-1/+1
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix loading icon for mr tabsClement Ho2018-06-131-1/+1
| | | |_|_|/ / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'jivl-fix-repository-instruction-wrapping-text' into 'master'Clement Ho2018-06-131-4/+4
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Remove card class from the git-empty containersJose2018-06-131-4/+4
| | |/ / / / / / / / /
| * | | | | | | | | | Flex board columnsPaul Slaughter2018-06-131-5/+6
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Merge branch 'bvl-missing-message-on-access-denied' into 'master'Robert Speicher2018-06-132-3/+5
| |\ \ \ \ \ \ \ \ \