summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* handle commas in Issue total count29559-issue-countSimon Knox2017-03-171-3/+6
|
* Merge branch '27376-cache-default-branch-pipeline-on-project' into 'master' Yorick Peterse2017-03-1615-10/+408
|\ | | | | | | | | Speed up several project lists See merge request !9903
| * 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
| | | | | | | | | | | | This could happen when the repository is missing. In which case cache needs to be cleared
| * 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
| | | | | | | | | | | | This reads status from redis & stores it in redis if it was missing. If the project has no HEAD, the cache is deleted
| * 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 migration Closes #29526 See merge request !9989
| * | 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
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix visibility level on new project page Closes #19253 See merge request !9885
| * | | 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 tooltip See merge request !9536
| * | | | | 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 Todos Closes #27114 See merge request !9890
| * | | | Add 'Undo mark all as done' to TodosJacopo2017-03-1612-55/+166
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added the ability to 'Undo mark all as done' todos marked as complete with 'Mark all as done' in the 'Todo' tab of the Todo dashboard. The operation undos only the todo previously marked as done with the 'Mark al as done' button.
* | | | | Merge branch 'duplicate-pagination-group-explore' into 'master' Filipa Lacerda2017-03-161-2/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed duplicate pagination on explore#groups Closes #29531 See merge request !9988
| * | | | | Fixed duplicate pagination on explore#groupsduplicate-pagination-group-explorePhil Hughes2017-03-161-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | Closes #29531
* | | | | | 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 emojis See merge request !9986
| * | | | | | 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 remaining references to .es6 file extension in our config files and documentation See merge request !9980
| * | | | | | | 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
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added filter bar into add issues modal See merge request !9856
| * | | | | | | | Fixed eslintissue-boards-modal-filter-barPhil Hughes2017-03-162-18/+18
| | | | | | | | |
| * | | | | | | | Moved reduce function to a utilPhil Hughes2017-03-166-45/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue with modal window including main search bars tokens
| * | | | | | | | Updated specs to check that the token is correctly addedPhil Hughes2017-03-162-3/+9
| | | | | | | | |
| * | | | | | | | Fixed search specsPhil Hughes2017-03-163-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up the events when the modal window is closed
| * | | | | | | | Fixed eslint errorsPhil Hughes2017-03-1611-145/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated modal filter spec
| * | | | | | | | Created a container class for filtered searchPhil Hughes2017-03-169-28/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This class returns the correct container the filtered search should be run in At the moment it doesn't allow for multiple to be used at once, need to look at a way to fix this [ci skip]
| * | | | | | | | Added filter bar into add issues modalPhil Hughes2017-03-1613-309/+60
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | Merge branch 'zj-rename-ci-vars' into 'master' Achilleas Pipinellis2017-03-1617-99/+99
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Futher rename the CI variables See merge request !9851
| * | | | | | | 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
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix projects without repo and wiki Closes #29542 See merge request !9956
| * | | | | | Expect @issuable_meta_data to be set, feedback:fix-project-without-repo-and-wikiLin Jen-Shin2017-03-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9956#note_25445832
| * | | | | | Fix projects without repo and wikiLin Jen-Shin2017-03-152-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When repo and wiki are disabled for a project, we're showing issues so we'll need to set @issuable_meta_data otherwise it would be giving nil errors. See: https://sentry.gitlap.com/gitlab/staginggitlabcom/issues/23106/
* | | | | | | Merge branch 'pipeline-tooltips-overflow' into 'master' Filipa Lacerda2017-03-162-0/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed pipeline action tooltips being cut off Closes #29314 See merge request !9960
| * | | | | | | Fixed pipeline action tooltips being cut offpipeline-tooltips-overflowPhil Hughes2017-03-152-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the container for the tooltip to be the body so that the tooltip does not get cut off with the overflow area. This change affects both merge request pipelines table & the pipelines page Closes #29314
* | | | | | | | 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 View Closes #28494 See merge request !9902
| * | | | | | | | Adds pipeline mini-graph to system information box in Commit ViewFilipa Lacerda2017-03-169-10/+127
| | | | | | | | |
* | | | | | | | | Merge branch 'dm-fix-mailroom-config' into 'master' DJ Mountney2017-03-163-58/+70
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Fix reply by email by fixing config/mail_room.yml to be interpretable without ActiveSupport See merge request !9979