summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix broken specsfl-remove-ujs-pipelinesFilipa Lacerda2017-03-168-11/+12
* Merge branch 'master' into fl-remove-ujs-pipelinesFilipa Lacerda2017-03-1667-664/+554
|\
| * 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
| * | | | | Merge branch 'dm-fix-mailroom-config' into 'master' DJ Mountney2017-03-163-58/+70
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | 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
| |\ \ \ \ \
| | * | | | | Changed "Edit Group" subtab to "General" and moved itgroup-gear-setting-dropdown-to-tabJose Ivan Vargas2017-03-152-11/+7
| | * | | | | 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
* | | | | | | Fix broken testsFilipa Lacerda2017-03-163-60/+43
* | | | | | | Merge branch 'master' into fl-remove-ujs-pipelinesFilipa Lacerda2017-03-16161-1114/+2278
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'rs-revert-notified-of-own-activity-migration' into 'master' Robert Speicher2017-03-152-1/+25
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | 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'Stan Hu2017-03-1510-168/+6
| * | | | | | Merge branch 'docs/add-missing-steps-in-pages-source-install' into 'master' Robert Speicher2017-03-151-20/+62
| |\ \ \ \ \ \
| | * | | | | | Bump pages daemon to 0.4.0docs/add-missing-steps-in-pages-source-installAchilleas Pipinellis2017-03-141-5/+5
| | * | | | | | Add missing steps of Pages source installationAchilleas Pipinellis2017-03-141-20/+62
| * | | | | | | Merge branch 'add_quick_submit_for_snippet_forms' into 'master' Clement Ho2017-03-152-1/+5
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Add quick submit for snippet formsblackst0ne2017-03-142-1/+5
| * | | | | | | Merge branch 'better-priority-sorting' into 'master' Douwe Maan2017-03-1525-27/+213
| |\ \ \ \ \ \ \
| | * | | | | | | 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'"Rémy Coutable2017-03-151-1/+1
| * | | | | | | | | Merge branch '27174-filter-filters' into 'master' Clement Ho2017-03-155-16/+53
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | prevent filtering Issues by multiple milestones, authors, or assignees27174-filter-filtersSimon Knox2017-03-115-16/+53
| * | | | | | | | | | Merge branch 'dm-copy-code-as-gfm' into 'master' Sean McGivern2017-03-1512-368/+559
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Remove selectionToGFMdm-copy-code-as-gfmDouwe Maan2017-03-142-9/+7
View Lorry Controller Status