summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-...Lin Jen-Shin2016-11-1766-565/+631
|\
| * Merge branch 'mailroom_idle_timeout' into 'master' Rémy Coutable2016-11-171-0/+1
| |\
| | * Make mail_room idle_timeout option configurable.Marin Jankovski2016-11-161-0/+1
| * | Merge branch '24496-fix-internal-api-project-lookup' into 'master' Sean McGivern2016-11-162-36/+59
| |\ \
| | * | Fix POST /internal/allowed to cope with gitlab-shell v4.0.0 project pathsNick Thomas2016-11-162-36/+59
| * | | Merge branch 'adam-build-missing-services-when-necessary' into 'master' Douwe Maan2016-11-161-16/+1
| |\ \ \
| | * | | Defer saving project services to the database if there are no user changesadam-build-missing-services-when-necessaryAdam Niedzielski2016-11-161-16/+1
| * | | | Merge branch '23117-search-for-a-filename-in-a-project' into 'master' Sean McGivern2016-11-161-2/+49
| |\ \ \ \
| | * | | | Search for a filename in a project23117-search-for-a-filename-in-a-projectValery Sizov2016-11-161-2/+49
| * | | | | Merge branch 'fix_labels_api_adding_missing_parameter' into 'master' Sean McGivern2016-11-161-1/+12
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | fix indentationFrancesco Coda Zabetta2016-11-141-7/+7
| | * | | | fix labels API adding missing parameter (current_user)Francesco Coda Zabetta2016-11-141-1/+12
| * | | | | Merge branch '23584-triggering-builds-from-webhooks' into 'master' Rémy Coutable2016-11-151-1/+1
| |\ \ \ \ \
| | * | | | | Add ref parameter for triggerring builds with gitlab webhook from other project.Dmitry Poray2016-11-151-1/+1
| * | | | | | 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 'grapify-groups-api' into 'master' Rémy Coutable2016-11-151-82/+74
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Grapify the group APIRobert Schilling2016-11-151-82/+74
| | | |_|/ / | | |/| | |
| * | | | | Merge branch 'grapify-merge-request-api' into 'master' Rémy Coutable2016-11-151-162/+110
| |\ \ \ \ \
| | * | | | | Grapify the merge request APIgrapify-merge-request-apiRobert Schilling2016-11-151-162/+110
| | |/ / / /
| * | | | | Merge branch 'master-recursiveTree' into 'master' Douwe Maan2016-11-152-2/+4
| |\ \ \ \ \
| | * | | | | Issue #4270: Recursive option for files through APIRebeca Méndez2016-11-122-2/+4
| * | | | | | Merge branch '21076-deleted-merged-branches' into 'master' Douwe Maan2016-11-151-0/+12
| |\ \ \ \ \ \
| | * | | | | | Add button to delete all merged branchesToon Claes2016-11-091-0/+12
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge branch 'stanhu/gitlab-ce-fix-error-500-with-mr-images' into 'master' Douwe Maan2016-11-151-5/+8
| |\ \ \ \ \ \
| | * | | | | | 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-141-5/+8
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge branch 'fix_saml_ldap_link' into 'master' Douwe Maan2016-11-151-0/+2
| |\ \ \ \ \ \
| | * | | | | | Omniauth auto link LDAP user falls back to find by DN when user cannot be fou...Drew Blessing2016-11-101-0/+2
| | | |_|_|/ / | | |/| | | |
| * | | | | | Use declared_params helper in APIgrapify-declared-paramsRobert Schilling2016-11-1412-36/+20
| | |/ / / / | |/| | | |
| * | | | | Merge branch 'grapify-to-h' into 'master' Rémy Coutable2016-11-143-7/+9
| |\ \ \ \ \
| | * | | | | Use #to_h to convert params to a hashgrapify-to-hRobert Schilling2016-11-143-7/+9
| | |/ / / /
| * | | | | Merge branch 'fix/improve-naming-convention-in-ci-config' into 'master' Kamil Trzciński2016-11-1430-106/+104
| |\ \ \ \ \
| | * | | | | Fix indentation in CI variables entry classGrzegorz Bizon2016-11-141-1/+1
| | * | | | | Change name of method for setting CI config entriesGrzegorz Bizon2016-11-144-26/+26
| | * | | | | Improve naming convention in ci configuration modulefix/improve-naming-convention-in-ci-configGrzegorz Bizon2016-11-1430-105/+103
| | | |_|/ / | | |/| | |
| * | | | | Merge branch 'grapify-subscription-api' into 'master' Rémy Coutable2016-11-141-23/+14
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Grapify subscription APIRobert Schilling2016-11-141-23/+14
| | | |_|/ | | |/| |
| * | | | Merge branch 'sh-fix-sidekiq-throttling-init' into 'master' Robert Speicher2016-11-141-1/+1
| |\ \ \ \
| | * | | | Only turn on Sidekiq throttling if application settings existssh-fix-sidekiq-throttling-initStan Hu2016-11-121-1/+1
| | | |/ / | | |/| |
| * | | | Merge branch 'user_filter_auth' into 'master' Rémy Coutable2016-11-143-14/+61
| |\ \ \ \
| | * | | | Centralize LDAP config/filter logicDrew Blessing2016-11-113-14/+61
| | |/ / /
| * | | | Merge branch 'repository-name-emojis' into 'master' Rémy Coutable2016-11-141-3/+3
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Added ability to put emojis into repository nameVincent Composieux2016-11-121-3/+3
| | | |/ | | |/|
| * | | Merge branch 'sidekiq-job-throttling' into 'master' Douwe Maan2016-11-112-0/+28
| |\ \ \
| | * | | Refactored Sidekiq Throttler and updated documentationsidekiq-job-throttlingPatricio Cano2016-11-111-6/+8
| | * | | Refactored initializer code to its own class and added testsPatricio Cano2016-11-101-0/+21
| | * | | Allow the Sidekiq queues to throttle and the factor by which to throttle them...Patricio Cano2016-11-101-0/+4
| | * | | Allow certain Sidekiq jobs to be throttledPatricio Cano2016-11-101-0/+1
| | |/ /
| * | | Merge branch 'adam-fix-collapsed-diff-symlink-file-conversion' into 'master' Sean McGivern2016-11-112-2/+2
| |\ \ \ | | |/ / | |/| |
| | * | Fix expanding a collapsed diff when converting a symlink to a regular fileadam-fix-collapsed-diff-symlink-file-conversionAdam Niedzielski2016-11-102-2/+2
View Lorry Controller Status