summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Merge branch 'fix/improve-naming-convention-in-ci-config' into 'master' Kamil Trzciński2016-11-1429-105/+103
|\ \
| * | 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-1429-104/+102
* | | 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
* | Improve EeCompatCheck, cache EE repo and keep artifacts for the ee_compat_che...23945-improve-ee_compat_check-task-part-3Rémy Coutable2016-11-101-71/+81
|/
* Merge branch 'ldap_check_bind' into 'master' Sean McGivern2016-11-091-4/+4
|\
| * Introduce better credential and error checking to `rake gitlab:ldap:check`Drew Blessing2016-11-081-4/+4
* | Merge branch '23403-fix-events-for-private-project-features' into 'security'Robert Speicher2016-11-091-25/+49
* | Merge branch 'fix-unathorized-cloning' into 'security'Douwe Maan2016-11-091-31/+60
* | Merge branch 'faster_project_search' into 'master' Sean McGivern2016-11-081-18/+12
|\ \
| * | Faster searchfaster_project_searchValery Sizov2016-11-081-18/+12
* | | Merge branch 'dz-refactor-namespace-regex' into 'master' Sean McGivern2016-11-081-0/+4
|\ \ \ | |/ / |/| |
| * | Refactor namespace regexdz-refactor-namespace-regexDmitriy Zaporozhets2016-11-071-0/+4
* | | Merge branch 'use-separate-token-for-incoming-email' into 'master' Douwe Maan2016-11-083-7/+16
|\ \ \ | |/ / |/| |
| * | implements reset incoming email token on issues modal and account page,use-separate-token-for-incoming-emailtiagonbotelho2016-11-072-3/+12
| * | Use separate email-friendly token for incoming email and let incomingDouwe Maan2016-11-071-4/+4
| |/
* | Merge branch 'jacobvosmaer-gitlab/gitlab-ce-git-gc-improvements' into 'master' Douwe Maan2016-11-072-53/+26
|\ \ | |/ |/|
| * Refine Git garbage collectionJacob Vosmaer2016-11-042-53/+26
* | Cache imported GH labels no matter whatfix/gh-imported-labels-are-not-applied-correctlyAhmad Sherif2016-11-041-6/+3
* | Fix applying GitHub-imported labels when importing job is interruptedAhmad Sherif2016-11-041-0/+10
|/
* Show log corresponding to env in admin/logsLukas Erlacher2016-11-031-2/+2
* Merge branch 'fix/import-export-symlink-vulnerability' into 'security'Douwe Maan2016-11-033-3/+24
* Merge branch 'fix/import-projectmember-security' into 'security'Douwe Maan2016-11-033-12/+29
* Fix project features default valuesFelipe Artur2016-11-011-0/+8
* Fix lightweight tags not processed correctly by GitTagPushService22271-drone-tag-pipeline-buildAlejandro Rodríguez2016-10-281-1/+1
* Merge branch 'adam-fix-labels-find-or-create' into 'master' Douwe Maan2016-10-284-7/+7
|\
| * Pass user instance to Labels::FindOrCreateService or skip_authorization: trueadam-fix-labels-find-or-createAdam Niedzielski2016-10-284-7/+7
* | Merge branch 'use-optimistic-locking' into 'master' Stan Hu2016-10-281-0/+19
|\ \
| * | Make retry_lock to not be infiniteuse-optimistic-lockingKamil Trzcinski2016-10-271-3/+7
| * | Add tests for optimistic lockingKamil Trzcinski2016-10-261-5/+7
| * | Use optimistic lockingKamil Trzcinski2016-10-261-0/+13
* | | Fix typosfix/make-github-import-retryableAhmad Sherif2016-10-282-2/+2
* | | Abstract the use of imported[!?] and {current,increment}_page in GitHub importerAhmad Sherif2016-10-281-50/+34
View Lorry Controller Status