summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | | | Fix redis specDouwe Maan2017-03-152-33/+31
| | | | | | |
| * | | | | | Fix config/mail_room.yml to be interpretable RubyDouwe Maan2017-03-151-0/+1
| | | | | | |
| * | | | | | Verify config/mail_room.yml is interpretable RubyDouwe Maan2017-03-152-27/+40
| | | | | | |
* | | | | | | Merge branch 'group-gear-setting-dropdown-to-tab' into 'master' Douwe Maan2017-03-166-20/+25
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved the gear settings dropdown in the group view to a tab Closes #23304 See merge request !9882
| * | | | | | | Changed "Edit Group" subtab to "General" and moved itgroup-gear-setting-dropdown-to-tabJose Ivan Vargas2017-03-152-11/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to the first option inside said subtab. Also code cleanup
| * | | | | | | Fixed some missing permission conditionsJose Ivan Vargas2017-03-142-11/+12
| | | | | | | |
| * | | | | | | Fixed haml_lint warning for the settings_head partialJose Ivan Vargas2017-03-142-2/+1
| | | | | | | |
| * | | | | | | Moved the gear settings dropdown in the group view to a tabJose Ivan Vargas2017-03-146-19/+28
| | | | | | | |
* | | | | | | | Merge branch 'rs-revert-notified-of-own-activity-migration' into 'master' Robert Speicher2017-03-152-1/+25
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Revert the AddNotifiedOfOwnActivityToUsers migration See merge request !9973
| * | | | | | | Revert the AddNotifiedOfOwnActivityToUsers migrationrs-revert-notified-of-own-activity-migrationRobert Speicher2017-03-152-1/+25
|/ / / / / / /
* | | | | | | Merge branch '8836-mr-revert' into 'master' Robert Speicher2017-03-1510-168/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'option-to-be-notified-of-own-activity' into 'master' See merge request !9974
| * | | | | | | Revert "Merge branch 'option-to-be-notified-of-own-activity' into 'master'Stan Hu2017-03-1510-168/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5e9666880376b3f53edb95cba77b5642d3cc1810, reversing changes made to b35378a938e22f745b6c6ea32b53cb50f9b6c627.
* | | | | | | | Merge branch 'docs/add-missing-steps-in-pages-source-install' into 'master' Robert Speicher2017-03-151-20/+62
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing steps of Pages source installation Closes #29372 [ci skip] See merge request !9923
| * | | | | | | | Bump pages daemon to 0.4.0docs/add-missing-steps-in-pages-source-installAchilleas Pipinellis2017-03-141-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | Add missing steps of Pages source installationAchilleas Pipinellis2017-03-141-20/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | Merge branch 'add_quick_submit_for_snippet_forms' into 'master' Clement Ho2017-03-152-1/+5
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add quick submit for snippet forms Closes #27534 See merge request !9911
| * | | | | | | | Add quick submit for snippet formsblackst0ne2017-03-142-1/+5
| | | | | | | | |
* | | | | | | | | Merge branch 'better-priority-sorting' into 'master' Douwe Maan2017-03-1525-27/+213
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Better priority sorting Closes #28754 See merge request !9938
| * | | | | | | | | Allow filtering by all started milestonesbetter-priority-sortingSean McGivern2017-03-1515-12/+107
| | | | | | | | | |
| * | | | | | | | | Allow sorting by due date and label prioritySean McGivern2017-03-1510-15/+106
| | | | | | | | | |
* | | | | | | | | | Merge branch 'revert-e52529e2' into 'master' Sean McGivern2017-03-151-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'google-protobuf-3.2.0.1' into 'master'" See merge request !9971
| * | | | | | | | | | Revert "Merge branch 'google-protobuf-3.2.0.1' into 'master'"Rémy Coutable2017-03-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts merge request !9932
* | | | | | | | | | | Merge branch '27174-filter-filters' into 'master' Clement Ho2017-03-155-16/+53
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prevent filtering Issues by multiple milestones, authors, or assignees Closes #27174 See merge request !9406
| * | | | | | | | | | prevent filtering Issues by multiple milestones, authors, or assignees27174-filter-filtersSimon Knox2017-03-115-16/+53
| | | | | | | | | | |