summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'markdown-xss-fix-option-2.1' into 'security'Douwe Maan2016-11-081-10/+28
* Fixed Import/Export foreign key issue to do with project membersJames Lopez2016-11-013-12/+29
* Removes any symlinks before importing a project export file. Also added relev...James Lopez2016-11-013-3/+24
* Fix issue due to incompatible code on newer versionsRémy Coutable2016-10-111-1/+1
* Merge branch 'api-fix-project-group-sharing' into 'security'Rémy Coutable2016-10-111-0/+6
* Merge branch 'new-gitlab-users-clear_all_authentication_tokens-task' into 'ma...Robert Speicher2016-10-111-0/+11
* Merge branch '22820-api-use-env-not-request-in-helpers' into 'master'Rémy Coutable2016-10-111-1/+1
* Merge branch 'fix/export-project-file-permissions' into 'security'Douwe Maan2016-10-057-7/+18
* Merge branch 'fix/id-claim-import-issue' into 'master'Douwe Maan2016-10-053-5/+25
* Merge branch 'fix/22225' into 'master'Sean McGivern2016-10-052-13/+25
* Merge branch 'lfs-token-race-condition-fix' into 'master'Patricio Cano2016-10-051-7/+2
* Merge branch 'lfs-ssh-authorization-fix' into 'master' Douwe Maan2016-09-283-12/+11
* Merge branch '22435-no-api-state-change-via-rails-session' into 'security'Douwe Maan2016-09-281-1/+4
* Merge branch 'fix/import-services' into 'master'Rémy Coutable2016-09-281-0/+2
* Merge branch 'fix/import-new-models-error' into 'master'Rémy Coutable2016-09-282-4/+10
* Merge branch 'fix/memory-leak-sanitization-filter' into 'master' Yorick Peterse2016-09-231-32/+32
* Merge branch '22417-api-fork-fix' into 'master' Rémy Coutable2016-09-221-1/+3
* fix import/export security specs after mergeJames Lopez2016-09-211-0/+3
* Merge branch 'post-merge-improve-of-ci-permissions' into 'master' Rémy Coutable2016-09-211-2/+3
* Merge branch 'and-you-get-awards' into 'master' Rémy Coutable2016-09-211-12/+17
* Merge branch '21170-cycle-analytics' into 'master' Stan Hu2016-09-212-0/+139
* Merge branch 'add_spec_for_committer_hash' into 'master' Rémy Coutable2016-09-211-0/+2
* Merge branch '18302-use-rails-cookie-in-api' into 'master' Rémy Coutable2016-09-203-47/+33
* Merge branch 'issue_20978' into 'master' Rémy Coutable2016-09-203-54/+63
* Merge branch '22065-group-members-api-returning-null-user-details' into 'mast...Robert Speicher2016-09-203-8/+8
* Merge branch 'strip-key-comments-for-gitlab-shell' into 'master' Robert Speicher2016-09-201-2/+11
* Merge branch 'feature/github-edit-path' into 'master' Rémy Coutable2016-09-201-3/+4
* Merge branch 'lfs-support-for-ssh-enabled' into 'master' Douwe Maan2016-09-204-2/+102
* Merge branch 'add_optional_author_for_commits' into 'master' Rémy Coutable2016-09-202-5/+15
* Merge branch 'per-build-token-without-lfs' into 'master' Rémy Coutable2016-09-196-42/+123
|\
| * Solve code review commentsKamil Trzcinski2016-09-191-1/+1
| * Properly support Gitlab::Auth::ResultKamil Trzcinski2016-09-192-8/+8
| * Revert all changes introduced by https://gitlab.com/gitlab-org/gitlab-ce/merg...Kamil Trzcinski2016-09-194-96/+0
| * Move Gitlab::Auth.Result to separate fileKamil Trzcinski2016-09-192-14/+17
| * Merge branch 'master' into per-build-tokenKamil Trzcinski2016-09-1911-43/+144
| |\
| * | Support pushing via SSHKamil Trzcinski2016-09-192-1/+12
| * | Don't leak build tokens in build logsKamil Trzcinski2016-09-191-0/+9
| * | Fix permissions for creating container imagesKamil Trzcinski2016-09-191-1/+1
| * | Simplify checking of allowed abilities in git_http_client_controllerKamil Trzcinski2016-09-161-0/+10
| * | Rename capabilities to authentication_abilitiesKamil Trzcinski2016-09-163-21/+21
| * | Merge remote-tracking branch 'origin/lfs-support-for-ssh' into per-build-tokenKamil Trzcinski2016-09-154-19/+93
| |\ \
| | * | Refactored authentication code to make it a bit clearer, added test for wrong...Patricio Cano2016-09-152-24/+21
| | * | Further refactoring of authentication code, and code style fixes.Patricio Cano2016-09-152-39/+36
| | * | Use special characters for `lfs+deploy-key` to prevent a someone from creatin...Patricio Cano2016-09-152-2/+2
| | * | Better authentication handling, syntax fixes and better actor handling for LF...Patricio Cano2016-09-153-29/+36
| | * | Improve string handling.Patricio Cano2016-09-151-2/+2
| | * | Refactored handling of the `LfsToken` and added functionality to it to simpli...Patricio Cano2016-09-153-18/+29
| | * | Refactored LFS auth logic when using SSH to use its own API endpoint `/lfs_au...Patricio Cano2016-09-153-17/+25
| | * | Refactor LFS token logic to use a Redis key instead of a DB field, making it ...Patricio Cano2016-09-154-10/+42
| | * | Added LFS support to SSHPatricio Cano2016-09-153-3/+25
View Lorry Controller Status