summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rc-new-members-approve-request-access-service' into 'master' Douwe Maan2016-09-271-6/+1
|\
| * New Members::ApproveAccessRequestServiceRémy Coutable2016-09-221-6/+1
* | Merge branch 'api-alphabetical' into 'master' Rémy Coutable2016-09-261-1/+2
|\ \
| * | Keep API mounts in alphabetical orderAchilleas Pipinellis2016-09-251-1/+2
* | | Fixes issue with rails reserved keyword type exporting/importing services. Al...James Lopez2016-09-261-0/+2
* | | Merge branch '22229-use-base-sha-when-downloading-merge-requests' into 'master' Robert Speicher2016-09-251-6/+6
|\ \ \ | |/ / |/| |
| * | Use base SHA for patches and diffsNick Thomas2016-09-221-6/+6
* | | Merge branch 'fix/memory-leak-sanitization-filter' into 'master' Yorick Peterse2016-09-231-32/+32
|\ \ \
| * | | Fix the leak mentioned in 504a3b5 by another wayAhmad Sherif2016-09-231-29/+31
| * | | Revert "Fix a memory leak caused by Banzai::Filter::SanitizationFilter"Ahmad Sherif2016-09-231-3/+1
* | | | Merge branch 'fix/database-seeds' into 'master' Rémy Coutable2016-09-231-3/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Remove use of `USE_DB` environment variable in codefix/database-seedsGrzegorz Bizon2016-09-231-3/+1
| * | | Update `CurrentSettings` class that uses ENVGrzegorz Bizon2016-09-221-1/+1
* | | | Merge branch 'redis-config-mutation' into 'master' Robert Speicher2016-09-231-12/+19
|\ \ \ \ | |_|_|/ |/| | |
| * | | Make Gitlab::Redis.params safe for mutationJacob Vosmaer2016-09-221-12/+19
| |/ /
* | | API: Return 404 when trying to fork to unaccessible namespaceRémy Coutable2016-09-221-1/+3
|/ /
* | fix import/export security specs after mergeJames Lopez2016-09-211-0/+3
* | Merge branch 'and-you-get-awards' into 'master' Rémy Coutable2016-09-211-12/+17
|\ \
| * | Fix tests for Snippets toggling awardsZ.J. van de Weg2016-09-191-14/+9
| * | API support for Award Emoji on SnippetsZ.J. van de Weg2016-09-191-10/+20
| * | Snippets get award emoji! :thumbsup:Z.J. van de Weg2016-09-191-1/+1
* | | Merge branch 'add_spec_for_committer_hash' into 'master' Rémy Coutable2016-09-211-0/+2
|\ \ \
| * | | Add spec covering 'committer_hash'Dan Dunckel2016-09-201-0/+2
| | |/ | |/|
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-09-2131-164/+632
|\ \ \
| * \ \ Merge branch 'post-merge-improve-of-ci-permissions' into 'master' Rémy Coutable2016-09-211-2/+3
| |\ \ \
| | * | | Improve JwtController implementationpost-merge-improve-of-ci-permissionsKamil Trzcinski2016-09-201-1/+2
| | * | | Post-merge improve of CI permissionsKamil Trzcinski2016-09-201-3/+3
| * | | | Merge branch '21170-cycle-analytics' into 'master' Stan Hu2016-09-212-0/+139
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Implement fourth round of comments from @DouweM.Timothy Andrew2016-09-212-15/+6
| | * | | Improve indentation in `Gitlab::Database::Median`Timothy Andrew2016-09-211-11/+18
| | * | | Implement a second round of review comments from @DouweM.Timothy Andrew2016-09-212-14/+33
| | * | | Fix rubocop spec.Timothy Andrew2016-09-201-6/+5
| | * | | Implement (some) comments from @DouweM's review.Timothy Andrew2016-09-202-21/+64
| | * | | Implement review comments from @yorickpeterseTimothy Andrew2016-09-201-0/+80
| * | | | Merge branch 'add_optional_author_for_commits' into 'master' Rémy Coutable2016-09-202-5/+15
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Add optional 'author' param when making commitsDan Dunckel2016-09-192-5/+15
| | | |/ | | |/|
| * | | Merge branch 'feature/github-edit-path' into 'master' Rémy Coutable2016-09-201-3/+4
| |\ \ \
| | * | | modify github import JS and controller so we can now specify a namespace and/...James Lopez2016-09-201-3/+4
| | | |/ | | |/|
| * | | Merge branch 'lfs-support-for-ssh-enabled' into 'master' Douwe Maan2016-09-204-2/+102
| |\ \ \ | | |/ / | |/| |
| | * | Move logic to check ci? or lfs_deploy_token? to Gitlab::Auth::ResultKamil Trzcinski2016-09-201-4/+8
| | * | Use early return in lfs_token_checkKamil Trzcinski2016-09-201-10/+10
| | * | Revert "Revert all changes introduced by https://gitlab.com/gitlab-org/gitlab...lfs-supportKamil Trzcinski2016-09-194-0/+96
| * | | Merge branch 'rs-trailing-spaces-in-regex-messages' into 'master' Rémy Coutable2016-09-201-3/+3
| |\ \ \
| | * | | Remove trailing spaces from messages in Gitlab::Regexrs-trailing-spaces-in-regex-messagesRobert Speicher2016-09-201-3/+3
| | | |/ | | |/|
| * | | Merge branch 'ldap_user_attr_method' into 'master' Douwe Maan2016-09-201-1/+5
| |\ \ \
| | * | | Move LDAP user attributes to a methodDrew Blessing2016-09-151-1/+5
| * | | | Merge branch 'strip-key-comments-for-gitlab-shell' into 'master' Robert Speicher2016-09-201-2/+11
| |\ \ \ \
| | * | | | Strip comments before sending keys to gitlab-shellJacob Vosmaer2016-09-161-2/+11
| * | | | | Merge branch '22065-group-members-api-returning-null-user-details' into 'mast...Robert Speicher2016-09-203-8/+8
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Ensure invitees are not returned in Members APIRémy Coutable2016-09-163-8/+8
View Lorry Controller Status