summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Expand)AuthorAgeFilesLines
* Rename mattermost_command to mattermost_slash_commandszj-slash-commands-mattermostKamil Trzcinski2016-11-181-1/+1
* Fix typosZ.J. van de Weg2016-11-181-3/+4
* Improve style, add more testsZ.J. van de Weg2016-11-183-3/+9
* More coverage on service levelZ.J. van de Weg2016-11-181-1/+1
* Merge remote-tracking branch 'origin/master' into zj-slash-commands-mattermostZ.J. van de Weg2016-11-171-3/+1
|\
| * Merge branch 'chat-name-authorize' into 'master' Rémy Coutable2016-11-171-0/+37
| |\
| | * Improve code design after code reviewKamil Trzcinski2016-11-161-3/+1
| | * Merge remote-tracking branch 'origin/master' into chat-name-authorizeKamil Trzcinski2016-11-1630-116/+270
| | |\
| | * | Add most of specs for chat namesKamil Trzcinski2016-11-161-0/+39
* | | | More refactoring, push present to base commandZ.J. van de Weg2016-11-172-2/+11
* | | | Add tests for increased converageZ.J. van de Weg2016-11-173-20/+25
* | | | Remove some commands for nowZ.J. van de Weg2016-11-174-121/+15
* | | | Incorporate feedback, improve presenter classZ.J. van de Weg2016-11-173-20/+58
* | | | Rename from service, and move to lib/gitlabZ.J. van de Weg2016-11-176-0/+196
* | | | Add most of specs for chat namesKamil Trzcinski2016-11-171-0/+39
|/ / /
* | | Search for a filename in a project23117-search-for-a-filename-in-a-projectValery Sizov2016-11-161-4/+47
| |/ |/|
* | Merge branch 'stanhu/gitlab-ce-fix-error-500-with-mr-images' into 'master' Douwe Maan2016-11-151-0/+24
|\ \
| * | 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-0/+24
* | | Merge branch 'fix_saml_ldap_link' into 'master' Douwe Maan2016-11-151-1/+22
|\ \ \ | |/ / |/| |
| * | Omniauth auto link LDAP user falls back to find by DN when user cannot be fou...Drew Blessing2016-11-101-1/+22
| |/
* | Merge branch 'fix/improve-naming-convention-in-ci-config' into 'master' Kamil Trzciński2016-11-1426-115/+115
|\ \
| * | Change name of method for setting CI config entriesGrzegorz Bizon2016-11-141-2/+2
| * | Improve naming convention in ci configuration modulefix/improve-naming-convention-in-ci-configGrzegorz Bizon2016-11-1425-63/+63
* | | Centralize LDAP config/filter logicDrew Blessing2016-11-111-0/+81
|/ /
* | Refactored Sidekiq Throttler and updated documentationsidekiq-job-throttlingPatricio Cano2016-11-111-6/+0
* | Refactored initializer code to its own class and added testsPatricio Cano2016-11-101-0/+34
|/
* Merge branch 'ldap_check_bind' into 'master' Sean McGivern2016-11-091-4/+35
|\
| * Introduce better credential and error checking to `rake gitlab:ldap:check`Drew Blessing2016-11-081-4/+35
* | Merge branch '23403-fix-events-for-private-project-features' into 'security'Robert Speicher2016-11-091-0/+104
* | Merge branch 'fix-unathorized-cloning' into 'security'Douwe Maan2016-11-092-1/+26
* | Merge branch 'markdown-xss-fix-option-2.1' into 'security'Douwe Maan2016-11-091-0/+22
* | Merge branch 'issue_23548_dev' into 'master'Douwe Maan2016-11-0914-56/+102
* | Merge branch 'dz-refactor-contraints' into 'master' Dmitriy Zaporozhets2016-11-084-42/+42
|\ \
| * | Add small improvements to constrainers and specsDmitriy Zaporozhets2016-11-082-2/+2
| * | Refactor routing constraintsDmitriy Zaporozhets2016-11-074-42/+42
* | | Merge branch 'use-separate-token-for-incoming-email' into 'master' Douwe Maan2016-11-081-4/+4
|\ \ \ | |/ / |/| |
| * | implements reset incoming email token on issues modal and account page,use-separate-token-for-incoming-emailtiagonbotelho2016-11-071-1/+1
| * | Use separate email-friendly token for incoming email and let incomingDouwe Maan2016-11-071-3/+3
| |/
* | Refine Git garbage collectionJacob Vosmaer2016-11-042-7/+21
|/
* Merge branch 'fix/import-export-symlink-vulnerability' into 'security'Douwe Maan2016-11-033-1/+71
* Merge branch 'fix/import-projectmember-security' into 'security'Douwe Maan2016-11-031-2/+5
* Merge branch 'allow-owner-to-run-ci-builds' into 'master' Rémy Coutable2016-11-021-0/+8
|\
| * Allow owners to fetch source code in CI buildsallow-owner-to-run-ci-buildsKamil Trzcinski2016-11-011-0/+8
* | Fix project features default valuesFelipe Artur2016-11-011-0/+35
* | Fix Markdown styling inside reference linkspanjan2016-11-015-33/+116
|/
* Merge branch 'use-optimistic-locking' into 'master' Stan Hu2016-10-282-0/+41
|\
| * Make retry_lock to not be infiniteuse-optimistic-lockingKamil Trzcinski2016-10-271-0/+11
| * Fix optimistic lockingKamil Trzcinski2016-10-261-0/+2
| * Add tests for optimistic lockingKamil Trzcinski2016-10-261-0/+28
* | Modify GitHub importer to be retryableAhmad Sherif2016-10-281-2/+5