summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Fix broken handling of certain calls in GitHub importer clientfix/github-importer-clientAhmad Sherif2016-10-061-2/+12
* Merge branch 'test-improve-gitlab-identifier' into 'master' Rémy Coutable2016-10-051-8/+50
|\
| * Refactor Gitlab::IdentifierYorick Peterse2016-10-051-8/+50
* | Skip wiki creation when GitHub project has wiki enabledDouglas Barbosa Alexandre2016-10-042-13/+25
|/
* Merge branch 'aiionx_sidekiq_log_patch' into 'master' Rémy Coutable2016-10-031-1/+1
|\
| * aiionx_sidekiq_log_patchDavid2016-04-151-1/+1
* | Merge branch '21983-member-add_user-doesn-t-detect-existing-members-that-have...Robert Speicher2016-10-021-0/+4
|\ \
| * | Allow Member.add_user to handle access requestersRémy Coutable2016-09-281-0/+4
* | | Merge branch 'initialize-redis' into 'master' Yorick Peterse2016-09-301-18/+6
|\ \ \
| * | | Initialize Redis pool in single-threaded contextJacob Vosmaer2016-09-301-18/+6
* | | | Fix race condition that can be triggered if the token expires right after we ...lfs-token-race-condition-fixPatricio Cano2016-09-291-7/+2
* | | | Merge branch 'lfs-ssh-authorization-fix' into 'master' Douwe Maan2016-09-282-11/+10
|\ \ \ \ | |/ / / |/| | |
| * | | Handle LFS token creation and retrieval in the same method, and in the same R...lfs-ssh-authorization-fixPatricio Cano2016-09-282-13/+10
| * | | Do not regenerate the `lfs_token` every time `git-lfs-authenticate` is called...Patricio Cano2016-09-271-0/+2
* | | | Log LDAP lookup errors and don't swallow unrelated exceptionsMarkus Koller2016-09-282-2/+3
| |/ / |/| |
* | | Call after_remove_branch only once after importing all GitHub PRsfix/optimize-github-importer-for-speed-and-memoryAhmad Sherif2016-09-271-2/+2
* | | Import all GitHub comments after importing issues and PRsAhmad Sherif2016-09-271-12/+15
* | | Speed up label-applying process for GitHub importingAhmad Sherif2016-09-271-9/+9
* | | Process each page of GitHub resources instead of concating them then processingAhmad Sherif2016-09-272-55/+57
|/ /
* | fix model order in import/export config and 1to1 relation issue. Added releva...James Lopez2016-09-272-4/+10
* | 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/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
* | | | Make Gitlab::Redis.params safe for mutationJacob Vosmaer2016-09-221-12/+19
|/ / /
* | | fix import/export security specs after mergeJames Lopez2016-09-211-0/+3
* | | 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-2118-87/+478
|\ \ \
| * \ \ 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-201-0/+8
| |\ \ \
| | * | | Add optional 'author' param when making commitsDan Dunckel2016-09-191-0/+8
| * | | | 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-203-2/+89
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | 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-193-0/+83
| * | | | 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
View Lorry Controller Status