summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Do not use Ruby Timeout module in GitLab QAfix/gb/gitlab-qa-start-page-cold-bootGrzegorz Bizon2017-03-171-9/+6
* Resolve GitLab QA cold boot problems on entry pageGrzegorz Bizon2017-03-161-2/+11
* Merge branch '27376-cache-default-branch-pipeline-on-project' into 'master' Yorick Peterse2017-03-1615-10/+408
|\
| * Build project cache key in a helper27376-cache-default-branch-pipeline-on-projectBob Van Landuyt2017-03-165-2/+59
| * Eager load route & namespace in `Explore::ProjectsController`Bob Van Landuyt2017-03-161-3/+11
| * Update the cache key to only include what is requiredBob Van Landuyt2017-03-161-2/+2
| * Don't try to load status when there is no commitBob Van Landuyt2017-03-162-0/+10
| * Eager load route for project & namespaceBob Van Landuyt2017-03-161-1/+1
| * Render cached pipeline status on project dashboardBob Van Landuyt2017-03-164-3/+32
| * Update the pipeline cache when updating a pipeline-statusBob Van Landuyt2017-03-162-0/+19
| * Add a wrapper for pipeline statusesBob Van Landuyt2017-03-162-0/+249
| * Test showing pipelines on the dashboardBob Van Landuyt2017-03-162-2/+28
* | Merge branch 'fix/gb/fix-timeouts-in-manual-actions-migration' into 'master' Yorick Peterse2017-03-161-0/+4
|\ \
| * | Fix statements timeout in manual actions migrationfix/gb/fix-timeouts-in-manual-actions-migrationGrzegorz Bizon2017-03-161-0/+4
* | | Merge branch 'fix_visibility_level' into 'master' Sean McGivern2017-03-163-1/+15
|\ \ \
| * | | Use digblackst0ne2017-03-141-1/+1
| * | | Fix rubocop offensesblackst0ne2017-03-121-4/+4
| * | | Fix specsblackst0ne2017-03-121-2/+2
| * | | Refactor specsblackst0ne2017-03-121-6/+9
| * | | Update specsblackst0ne2017-03-111-1/+6
| * | | Added specsblackst0ne2017-03-111-0/+1
| * | | Merge remote-tracking branch 'upstream/master' into fix_visibility_levelblackst0ne2017-03-1194-806/+1766
| |\ \ \
| * | | | Fix visibility level on new project pageblackst0ne2017-03-112-1/+6
* | | | | Merge branch 'chore/23493-remaining-time-tooltip' into 'master' Rémy Coutable2017-03-164-7/+83
|\ \ \ \ \
| * | | | | Issue milestone remaining time tooltipMichael2017-03-164-7/+83
|/ / / / /
* | | | | Merge branch '27114-add-undo-mark-all-as-done-to-todos' into 'master' Filipa Lacerda2017-03-1612-55/+166
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Add 'Undo mark all as done' to TodosJacopo2017-03-1612-55/+166
* | | | | Merge branch 'duplicate-pagination-group-explore' into 'master' Filipa Lacerda2017-03-161-2/+0
|\ \ \ \ \
| * | | | | Fixed duplicate pagination on explore#groupsduplicate-pagination-group-explorePhil Hughes2017-03-161-2/+0
* | | | | | Merge branch 'fix-legacy-emojis-using-unicode-file-name' into 'master' Sean McGivern2017-03-161-0/+2
|\ \ \ \ \ \
| * | | | | | Restore unicode-file-name images for legacy img emojisfix-legacy-emojis-using-unicode-file-nameEric Eastwood2017-03-161-0/+2
* | | | | | | Merge branch 'remove-es6-extension-configuration' into 'master' Filipa Lacerda2017-03-169-16/+14
|\ \ \ \ \ \ \
| * | | | | | | remove all references to the .es6 in our config files and documentationremove-es6-extension-configurationMike Greiling2017-03-159-16/+14
* | | | | | | | Merge branch 'issue-boards-modal-filter-bar' into 'master' Filipa Lacerda2017-03-1621-459/+210
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed eslintissue-boards-modal-filter-barPhil Hughes2017-03-162-18/+18
| * | | | | | | | Moved reduce function to a utilPhil Hughes2017-03-166-45/+39
| * | | | | | | | Updated specs to check that the token is correctly addedPhil Hughes2017-03-162-3/+9
| * | | | | | | | Fixed search specsPhil Hughes2017-03-163-2/+6
| * | | | | | | | Fixed eslint errorsPhil Hughes2017-03-1611-145/+115
| * | | | | | | | Created a container class for filtered searchPhil Hughes2017-03-169-28/+54
| * | | | | | | | Added filter bar into add issues modalPhil Hughes2017-03-1613-309/+60
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'zj-rename-ci-vars' into 'master' Achilleas Pipinellis2017-03-1617-99/+99
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Futher rename the CI variableszj-rename-ci-varsZ.J. van de Weg2017-03-1617-99/+99
| |/ / / / / /
* | | | | | | Merge branch 'fix-project-without-repo-and-wiki' into 'master' Rémy Coutable2017-03-162-2/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Expect @issuable_meta_data to be set, feedback:fix-project-without-repo-and-wikiLin Jen-Shin2017-03-161-0/+1
| * | | | | | Fix projects without repo and wikiLin Jen-Shin2017-03-152-2/+4
* | | | | | | Merge branch 'pipeline-tooltips-overflow' into 'master' Filipa Lacerda2017-03-162-0/+8
|\ \ \ \ \ \ \
| * | | | | | | Fixed pipeline action tooltips being cut offpipeline-tooltips-overflowPhil Hughes2017-03-152-0/+8
* | | | | | | | Merge branch '28494-mini-pipeline-graph-commit-view' into 'master' Jacob Schatz2017-03-169-10/+127
|\ \ \ \ \ \ \ \
| * | | | | | | | Adds pipeline mini-graph to system information box in Commit ViewFilipa Lacerda2017-03-169-10/+127
View Lorry Controller Status