summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | Merge branch 'grapify-token-api' into 'master' Rémy Coutable2016-11-101-46/+30
|\ \ \
| * | | Grapify token APIRobert Schilling2016-11-101-46/+30
* | | | Merge branch '23945-improve-ee_compat_check-task-part-3' into 'master' Robert Speicher2016-11-102-82/+96
|\ \ \ \
| * | | | Improve EeCompatCheck, cache EE repo and keep artifacts for the ee_compat_che...23945-improve-ee_compat_check-task-part-3Rémy Coutable2016-11-102-82/+96
| |/ / /
* | | | Merge branch 'grapify-milestone-api' into 'master' Rémy Coutable2016-11-101-54/+57
|\ \ \ \
| * | | | Grapify milestones APIgrapify-milestone-apiRobert Schilling2016-11-101-54/+57
| | |_|/ | |/| |
* | | | Merge branch 'grapify-runners-api' into 'master' Rémy Coutable2016-11-101-53/+64
|\ \ \ \ | |_|_|/ |/| | |
| * | | Grapify runners APIRobert Schilling2016-11-101-53/+64
| |/ /
* | | Merge branch 'grapify-session-api' into 'master' Rémy Coutable2016-11-101-10/+9
|\ \ \
| * | | Grapify the session APIgrapify-session-apiRobert Schilling2016-11-091-10/+9
| |/ /
* | | Merge branch 'feature/api_owned_resource' into 'master' Sean McGivern2016-11-101-0/+10
|\ \ \ | |_|/ |/| |
| * | Added API endpoint groups/ownedBorja Aparicio2016-11-081-0/+10
* | | Merge branch '23731-add-param-to-user-api' into 'master' Sean McGivern2016-11-091-1/+6
|\ \ \
| * | | Add query param to filter users on 'external' & 'blocked' type on APIYatish Mehta2016-11-081-1/+6
* | | | Merge branch 'ldap_check_bind' into 'master' Sean McGivern2016-11-092-13/+34
|\ \ \ \
| * | | | Introduce better credential and error checking to `rake gitlab:ldap:check`Drew Blessing2016-11-082-13/+34
View Lorry Controller Status