summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | Merge branch 'issue_20978' into 'master' Rémy Coutable2016-09-193-54/+63
| |\ \ \ \ \
| | * | | | | Allow to set request_access_enabled for groups and projects using APIFelipe Artur2016-09-193-54/+63
| * | | | | | 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
View Lorry Controller Status