summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'koding-setting-api' into 'master' Robert Speicher2016-09-301-0/+2
|\
| * Expose the Koding application settings in the APIkoding-setting-apiDJ Mountney2016-09-291-0/+2
* | Merge branch 'rc-new-access-requests-finder' into 'master' Douwe Maan2016-09-301-2/+2
|\ \
| * | New AccessRequestsFinderRémy Coutable2016-09-281-2/+2
* | | 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 'issue_22382' into 'master' Rémy Coutable2016-09-292-6/+7
|\ \
| * | Expose project share expiration_date field on APIissue_22382Felipe Artur2016-09-282-6/+7
* | | Merge branch 'rs-remove-duplicate-versioninfo' into 'master' Robert Speicher2016-09-291-52/+0
|\ \ \
| * | | Remove duplicate VersionInfo classRobert Speicher2016-09-291-52/+0
* | | | Merge branch '22367-add-pipeline-id-build' into 'master' Rémy Coutable2016-09-291-2/+7
|\ \ \ \ | |/ / / |/| | |
| * | | expose pipeline data in builds APIGuilherme Salazar2016-09-281-2/+7
* | | | Remove Flog as we use a Rubocop that does its job.cs-remove-flog-flayConnor Shea2016-09-281-25/+0
* | | | Merge branch 'lfs-ssh-authorization-fix' into 'master' Douwe Maan2016-09-283-12/+11
|\ \ \ \
| * | | | Handle LFS token creation and retrieval in the same method, and in the same R...lfs-ssh-authorization-fixPatricio Cano2016-09-283-14/+11
| * | | | Do not regenerate the `lfs_token` every time `git-lfs-authenticate` is called...Patricio Cano2016-09-271-0/+2
* | | | | AbstractReferenceFilter caches current project_ref on RequestStore when active22679-avoid-abstract-reference-filter-project-requestsPaco Guzman2016-09-282-5/+21
* | | | | Avoid database queries on Banzai::ReferenceParser::BaseParser for nodes witho...22681-avoid-empty-queries-on-reference-parsersPaco Guzman2016-09-281-1/+5
| |/ / / |/| | |
* | | | 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
* | Merge branch 'dz-profile-organization' into 'master' Dmitriy Zaporozhets2016-09-272-3/+5
|\ \
| * | Add User#organization to users apiDmitriy Zaporozhets2016-09-272-3/+5
* | | 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
| |\ \ \