summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into menu-resize-hidemenu-resize-hidePhil Hughes2016-11-243021-40358/+94158
|\
| * Merge branch 'improve-testing-styleguide' into 'master' Robert Speicher2016-11-241-0/+2
| |\
| | * Document that we always use `do...end` for `before` in RSpecimprove-testing-styleguideRémy Coutable2016-11-241-0/+2
| * | Merge branch 'docs/jira-add-missing-file' into 'master' Achilleas Pipinellis2016-11-241-0/+3
| |\ \
| | * | Add missing JIRA file that redirects to the new locationAchilleas Pipinellis2016-11-241-0/+3
| * | | Merge branch 'backport-commands-params' into 'master' Douwe Maan2016-11-243-0/+6
| |\ \ \
| | * | | Backport Note#commands_changes from EEbackport-commands-paramsDouwe Maan2016-11-243-0/+6
| * | | | Merge branch 'mrchrisw/add-namespace-logging' into 'master' Robert Speicher2016-11-241-0/+2
| |\ \ \ \
| | * | | | Log mv_namespace parametersmrchrisw/add-namespace-loggingChris Wilson2016-11-241-0/+2
| * | | | | Merge branch 'dz-allow-nested-group-routing' into 'master' Douwe Maan2016-11-2430-755/+904
| |\ \ \ \ \
| | * | | | | Add nested groups support to the routingdz-allow-nested-group-routingDmitriy Zaporozhets2016-11-2330-755/+904
| * | | | | | Merge branch 'move-admin-abuse-report-spinach-test-to-rspec' into 'master' Rémy Coutable2016-11-244-29/+14
| |\ \ \ \ \ \
| | * | | | | | Move admin abuse report spinach test to rspecSemyon Pupkov2016-11-234-29/+14
| * | | | | | | Merge branch 'simplify-create-new-list-issue-boards' into 'master' Annabel Dunstone Gray2016-11-249-17/+19
| |\ \ \ \ \ \ \
| | * | | | | | | Simplify copy on "Create a new list" dropdown in Issue Boardsvrod2016-11-239-17/+19
| * | | | | | | | Merge branch 'move-abuse-report-spinach-test-to-rspec' into 'master' Rémy Coutable2016-11-244-49/+28
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Move abuse report spinach test to rspecSemyon Pupkov2016-11-234-49/+28
| * | | | | | | | | Merge branch 'docs/rm-header-ids-from-university' into 'master' Achilleas Pipinellis2016-11-231-6/+6
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Remove header ids from University docsAchilleas Pipinellis2016-11-231-6/+6
| | | |_|_|_|_|_|/ / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'fix-lfs-enabled-select-box' into 'master' Stan Hu2016-11-232-6/+31
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Added test that checks the correct select box is there for the LFS enabled se...Patricio Cano2016-11-231-0/+24
| | * | | | | | | | | Fix `LFS enabled` select box.Patricio Cano2016-11-231-6/+7
| | | |_|/ / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'use-commit-author-if-possible' into 'master' Sean McGivern2016-11-232-7/+4
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Use Commit#author so we share logic and cacheLin Jen-Shin2016-11-242-7/+4
| |/ / / / / / / /
| * | | | | | | | Merge branch 'move-timeago-to-vendor-dir' into 'master' Alfredo Sumaran2016-11-235-12/+15
| |\ \ \ \ \ \ \ \
| | * | | | | | | | timeago should be a dependency of datetime_utilitymove-timeago-to-vendor-dirMike Greiling2016-11-225-8/+12
| | * | | | | | | | move timeago.js to vendor directoryMike Greiling2016-11-222-5/+4
| | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Merge branch '24851-collapsed-system-note-list-shadow-looks-weird' into 'mast...Fatih Acet2016-11-231-3/+5
| |\ \ \ \ \ \ \ \
| | * | | | | | | | fixes non-retina shadow and browser zoom issueNur Rony2016-11-231-3/+5
| * | | | | | | | | Merge branch 'use-default-closest-if-available' into 'master' Fatih Acet2016-11-231-1/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Use default `closest` if available!use-default-closest-if-availableLuke "Jared" Bennett2016-11-231-1/+1
| | | |_|/ / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'issue-boards-dragging-fix' into 'master' Fatih Acet2016-11-235-5/+11
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fixed dragging issues on issue boardsissue-boards-dragging-fixPhil Hughes2016-11-235-5/+11
| | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'custom-event-polyfill' into 'master' Jacob Schatz2016-11-231-0/+12
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Adds polyfill for CustomEventcustom-event-polyfillFilipa Lacerda2016-11-231-0/+12
| | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'zj-fix-flags-usage-gitlab-ci-yml' into 'master' Rémy Coutable2016-11-231-2/+2
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix BASH usage in the .gitlab-ci.ymlzj-fix-flags-usage-gitlab-ci-ymlZ.J. van de Weg2016-11-231-2/+2
| * | | | | | | | | | Merge branch 'api-delete-group-share' into 'master' Rémy Coutable2016-11-234-0/+66
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | API: Add endpoint to delete a group shareapi-delete-group-shareRobert Schilling2016-11-234-0/+66
| * | | | | | | | | | | Merge branch 'patch-13' into 'master' Achilleas Pipinellis2016-11-231-3/+7
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | add details that Git LFS must be enabled in projectBen Bodenmiller2016-11-221-3/+7
| * | | | | | | | | | | | Merge branch 'grapify-sidekiq-metric-api' into 'master' Rémy Coutable2016-11-231-32/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Grapify the sidekiq metrics APIRobert Schilling2016-11-231-32/+4
| | | |/ / / / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'docs/chrome-support-requirements' into 'master' Achilleas Pipinellis2016-11-231-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Add support of Chrome/Chromium in requirements.mdAchilleas Pipinellis2016-11-231-1/+1
| * | | | | | | | | | | | Merge branch '24863-mrs-without-discussions-are-mergeable' into 'master' Sean McGivern2016-11-233-1/+63
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Correctly determine mergeability of MR with no discussions24863-mrs-without-discussions-are-mergeableDouwe Maan2016-11-233-1/+63
| | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'milestone_start_date' into 'master' Sean McGivern2016-11-2327-101/+205
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Add a starting date to milestonesmilestone_start_dateValery Sizov2016-11-2327-101/+205
| | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'post_receive-any-email' into 'master' Sean McGivern2016-11-233-2/+6
| |\ \ \ \ \ \ \ \ \ \ \ \