summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into rs-redactor-filterrs-redactor-filterDouwe Maan2015-10-1610-52/+93
|\
| * Shut up, RubocopRobert Speicher2015-10-151-1/+1
| * Fix specsKamil Trzcinski2015-10-151-1/+1
| * Implement when syntax in .gitlab-ci.ymlKamil Trzcinski2015-10-152-1/+27
| * Merge branch 'stanhu/gitlab-ce-fix-api-mr-comment-notifications'Dmitriy Zaporozhets2015-10-151-2/+10
| |\
| | * Fix bug where merge request comments created by API would not trigger notific...Stan Hu2015-10-101-2/+10
| * | Merge branch 'user-by-login-performance' into 'master' Yorick Peterse2015-10-151-0/+2
| |\ \
| | * | Improve performance of User.by_loginuser-by-login-performanceYorick Peterse2015-10-151-0/+2
| * | | Merge branch 'git-archive-golang' into 'master' Douwe Maan2015-10-154-15/+47
| |\ \ \ | | |/ / | |/| |
| | * | Merge branch 'master' into git-archive-golanggit-archive-golangDouwe Maan2015-10-1517-7/+235
| | |\ \
| | * | | Fix NGINX API download regexJacob Vosmaer2015-10-142-2/+2
| | * | | Let gitlab-git-http-server handle archive downloadsJacob Vosmaer2015-10-084-15/+47
| * | | | Merge branch 'incoming-email-config' into 'master' Robert Speicher2015-10-142-34/+7
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Make Reply by email easier to configureDouwe Maan2015-10-132-34/+7
| | | |/ | | |/|
* | | | Merge branch 'master' into rs-redactor-filterDouwe Maan2015-10-1517-7/+235
|\ \ \ \ | |/ / /
| * | | Merge branch 'simplify-cross-references' into 'master' Robert Speicher2015-10-141-0/+2
| |\ \ \
| | * | | Simplify code around (cross)-referencesDouwe Maan2015-10-121-0/+2
| | |/ /
| * | | Fix: Images cannot show when projects' path was changeduploads_path_fixValery Sizov2015-10-143-0/+84
| * | | Merge remote-tracking branch 'origin/cernvcs_hide_passwrd'Valery Sizov2015-10-142-1/+13
| |\ \ \
| | * \ \ Merge branch 'feature/api_hide_service_password' of gitlab.com:cernvcs/gitlab-cecernvcs_hide_passwrdValery Sizov2015-10-142-1/+13
| | |\ \ \
| | | * | | Hide passwords to non-admin users in the services APIAlex Lossent2015-10-122-1/+13
| * | | | | Merge remote-tracking branch 'origin/inified_404_error'Valery Sizov2015-10-141-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Only render 404 page from /publicinified_404_errorValery Sizov2015-10-131-1/+1
| | |/ / /
| * | | | [ci skip] Fix wrong commentsue4452015-10-141-1/+1
| * | | | Fix broken testsKamil Trzcinski2015-10-121-1/+1
| * | | | Fix some changesKamil Trzcinski2015-10-121-1/+1
| * | | | Update renderingKamil Trzcinski2015-10-121-1/+1
| * | | | Small bug fixesKamil Trzcinski2015-10-121-2/+3
| * | | | Add Commit Status documentationKamil Trzcinski2015-10-121-10/+10
| * | | | Add author to statusesKamil Trzcinski2015-10-122-1/+2
| * | | | Fix commit status POST URLKamil Trzcinski2015-10-121-1/+1
| * | | | Implement Commit Status APIKamil Trzcinski2015-10-124-3/+89
| |/ / /
| * | | Merge branch 'fix_email_downcasing' into 'master' Robert Speicher2015-10-111-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Fix ldap email downcasing bugDrew Blessing2015-10-081-1/+1
| * | | Merge branch 'rs-issue-2970' into 'master' Douwe Maan2015-10-091-1/+2
| |\ \ \
| | * | | Normalize space-like characters in keys before output to gitlab-shellrs-issue-2970Robert Speicher2015-10-081-1/+2
| | |/ /
| * | | Merge branch 'rs-2fa-task' into 'master' Jacob Vosmaer2015-10-091-0/+23
| |\ \ \ | | |/ / | |/| |
| | * | Add output and confirmation to gitlab:two_factor:disable_for_all_usersrs-2fa-taskRobert Speicher2015-10-081-2/+15
| | * | Add gitlab:two_factor:disable_for_all_users taskRobert Speicher2015-10-071-0/+10
| | |/
| * | Added dedicated Rake task for setting up PostgresYorick Peterse2015-10-082-0/+7
| * | Added methods for detecting MySQL/PostgreSQLYorick Peterse2015-10-071-0/+11
| |/
* | Explicitly only parse references by specified filterDouwe Maan2015-10-142-2/+8
* | Have Issue#participants load all users mentioned in notes using a single queryDouwe Maan2015-10-141-10/+11
* | Code cleanupDouwe Maan2015-10-133-23/+17
* | Allow ReferenceExtractor to efficiently load references from multiple texts a...Douwe Maan2015-10-133-12/+29
* | Efficiently load multiple references of one type.Douwe Maan2015-10-137-23/+33
* | Pass project to RedactorFilterDouwe Maan2015-10-132-4/+9
* | Raise error when a ReferenceFilter doesn't implement referenced_byDouwe Maan2015-10-081-1/+1
* | Update inline docDouwe Maan2015-10-081-2/+2
* | Update ReferenceFilter docsRobert Speicher2015-10-071-10/+9