summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* 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 '22466-task-list-fork' into 'master' Rémy Coutable2016-10-031-22/+0
|\ \
| * | Replace talk_list patch with a patched forkJared Deckard2016-09-301-22/+0
* | | Merge branch 'zj-grape-award-emoji' into 'master' Robert Speicher2016-10-031-33/+31
|\ \ \
| * | | GrapeDSL for Award Emoji endpointszj-grape-award-emojiZ.J. van de Weg2016-10-031-33/+31
* | | | Merge branch 'zj-grape-keys' into 'master' Rémy Coutable2016-10-031-4/+3
|\ \ \ \ | |/ / / |/| | |
| * | | GrapeDSL for Keys endpointzj-grape-keysZ.J. van de Weg2016-10-011-4/+3
| |/ /
* | | Merge branch '21983-member-add_user-doesn-t-detect-existing-members-that-have...Robert Speicher2016-10-022-15/+6
|\ \ \ | |/ / |/| |
| * | Allow Member.add_user to handle access requestersRémy Coutable2016-09-282-15/+6
* | | Merge branch '21744-fix-missing-values-in-linter' into 'master' Rémy Coutable2016-09-301-1/+1
|\ \ \
| * | | Expose jobs to viewKatarzyna Kobierska2016-09-301-3/+1
| * | | Add missing values to linterKatarzyna Kobierska2016-09-301-0/+2
* | | | Merge branch 'initialize-redis' into 'master' Yorick Peterse2016-09-301-18/+6
|\ \ \ \
| * | | | Initialize Redis pool in single-threaded contextJacob Vosmaer2016-09-301-18/+6
* | | | | Merge branch 'replace-alias_method_chain' into 'master' Rémy Coutable2016-09-301-5/+7
|\ \ \ \ \
| * | | | | Use `Module#prepend` instead of `alias_method_chain`Andre Guedes2016-09-301-5/+7
| | |/ / / | |/| | |
* | | | | Merge branch '15356-filters-should-change-issue-counts' into 'master' Robert Speicher2016-09-301-2/+1
|\ \ \ \ \
| * | | | | Small improvements thanks to Robert's feedbackRémy Coutable2016-09-301-2/+1
| |/ / / /
* | | | | 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
|\ \ \ \ | |/ / / |/| | |