summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Correct the idle_timeout in the docs for installation from source.mailroom_idle_timeoutMarin Jankovski2016-11-161-3/+3
* Add mail_room idle_timeout to the Changelog.Marin Jankovski2016-11-161-0/+4
* Add idle_timeout to reply by email doc.Marin Jankovski2016-11-162-1/+11
* Make mail_room idle_timeout option configurable.Marin Jankovski2016-11-164-1/+5
* Merge branch 'rs-disable-changelog-merge' into 'master' Dmitriy Zaporozhets2016-11-161-1/+0
|\
| * Remove gitattribute entry for CHANGELOG.mdrs-disable-changelog-mergeRobert Speicher2016-11-151-1/+0
* | Merge branch '22680-unlabel-limit-autocomplete-to-selected-items' into 'master' Rémy Coutable2016-11-164-2/+21
|\ \
| * | Limit autocomplete to currently selected itemsAkram FARES2016-11-154-2/+21
* | | Merge branch 'refactor-issuable-title-form' into 'master' Rémy Coutable2016-11-163-52/+53
|\ \ \
| * | | Move issuable title form to a new partialRémy Coutable2016-11-163-52/+53
|/ / /
* | | Merge branch '22790-mention-autocomplete-avatar' into 'master' Alfredo Sumaran2016-11-155-10/+40
|\ \ \
| * | | shows user avatar in mention autocomplete in editor22790-mention-autocomplete-avatarNur Rony2016-11-165-10/+40
* | | | Merge branch 'copy-messaging-guidelines' into 'master' Allison Whilden2016-11-156-0/+83
|\ \ \ \ | |_|/ / |/| | |
| * | | [ci skip] Link to the copy (messaging) page.Victor Wu2016-11-156-0/+83
|/ / /
* | | Merge branch 'fix_ldap_docs' into 'master' Drew Blessing2016-11-151-0/+18
|\ \ \
| * | | Clarify LDAP troubleshooting ldap_search example [ci skip]Drew Blessing2016-11-151-0/+18
|/ / /
* | | Merge branch 'patch-9' into 'master' Sean McGivern2016-11-151-5/+5
|\ \ \
| * | | Fix invalid JSON in Builds API doc Bernhard Häussner2016-11-151-5/+5
* | | | Merge branch '23584-triggering-builds-from-webhooks' into 'master' Rémy Coutable2016-11-156-4/+61
|\ \ \ \
| * | | | Add ref parameter for triggerring builds with gitlab webhook from other project.Dmitry Poray2016-11-156-4/+61
* | | | | Merge branch '24492-promise-polyfill' into 'master' Jacob Schatz2016-11-153-0/+1164
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Adds es6-promise polyfill24492-promise-polyfillFilipa Lacerda2016-11-153-0/+1164
| | |_|/ | |/| |
* | | | Merge branch 'rs-revert-rc-changelogs' into 'master' Rémy Coutable2016-11-1553-52/+210
|\ \ \ \
| * | | | Revert "Update CHANGELOG.md for 8.14.0-rc1"rs-revert-rc-changelogsRobert Speicher2016-11-1532-31/+126
| * | | | Revert "Update CHANGELOG.md for 8.14.0-rc2"Robert Speicher2016-11-1522-21/+84
| |/ / /
* | | | Merge branch 'grapify-notes-api' into 'master' Rémy Coutable2016-11-151-67/+57
|\ \ \ \
| * | | | Grapify the notes APIgrapify-notes-apiRobert Schilling2016-11-151-67/+57
* | | | | Merge branch 'darken-badge-hover' into 'master' Annabel Dunstone Gray2016-11-152-4/+6
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Darken todo badge on hoverdarken-badge-hovertauriedavis2016-11-142-4/+6
* | | | | Merge branch 'grapify-groups-api' into 'master' Rémy Coutable2016-11-152-83/+75
|\ \ \ \ \
| * | | | | Grapify the group APIRobert Schilling2016-11-152-83/+75
* | | | | | Merge branch 'grapify-merge-request-api' into 'master' Rémy Coutable2016-11-152-168/+110
|\ \ \ \ \ \
| * | | | | | Grapify the merge request APIgrapify-merge-request-apiRobert Schilling2016-11-152-168/+110
| |/ / / / /
* | | | | | Merge branch 'master-recursiveTree' into 'master' Douwe Maan2016-11-157-26/+99
|\ \ \ \ \ \
| * | | | | | Issue #4270: Recursive option for files through APIRebeca Méndez2016-11-127-26/+99
* | | | | | | Merge branch '21076-deleted-merged-branches' into 'master' Douwe Maan2016-11-1514-5/+231
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Add button to delete all merged branchesToon Claes2016-11-0914-5/+231
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'stanhu/gitlab-ce-fix-error-500-with-mr-images' into 'master' Douwe Maan2016-11-156-6/+48
|\ \ \ \ \ \
| * | | | | | Fix Error 500 when creating a merge request that contains an image that was d...stanhu/gitlab-ce-fix-error-500-with-mr-imagesStan Hu2016-11-146-6/+48
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'fix_saml_ldap_link' into 'master' Douwe Maan2016-11-153-1/+29
|\ \ \ \ \ \
| * | | | | | Omniauth auto link LDAP user falls back to find by DN when user cannot be fou...Drew Blessing2016-11-103-1/+29
* | | | | | | Merge branch '24392-lfs-helper-refactor' into 'master' Douwe Maan2016-11-152-4/+4
|\ \ \ \ \ \ \
| * | | | | | | Move the `objects` method to `LfsHelper` so that it is also available to `Lfs...24392-lfs-helper-refactorPatricio Cano2016-11-102-4/+4
* | | | | | | | Fix duplicate changelog headersRobert Speicher2016-11-151-3/+0
* | | | | | | | Merge branch 'patch-9' into 'master' Sean McGivern2016-11-151-1/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | clarify best way to install custom CABen Bodenmiller2016-11-141-1/+5
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'fix-migration-changes' into 'master' Stan Hu2016-11-151-4/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Use `default_value_for` to handle null values in only_allow_merge_if_all_disc...fix-migration-changesAlejandro Rodríguez2016-11-141-4/+1
* | | | | | | | | Revert bad merge after releaseAlejandro Rodríguez2016-11-145-20/+0
* | | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqAlejandro Rodríguez2016-11-145-0/+20
|\ \ \ \ \ \ \ \ \