summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix/github-importer-client' into 'master' Rémy Coutable2016-10-061-2/+12
|\
| * Fix broken handling of certain calls in GitHub importer clientfix/github-importer-clientAhmad Sherif2016-10-061-2/+12
* | Merge branch 'rc-use-grape-dsl-to-document-members-api' into 'master' Robert Speicher2016-10-062-93/+67
|\ \
| * | Use Grape DSL to document methods and their paramsrc-use-grape-dsl-to-document-members-apiRémy Coutable2016-10-052-93/+67
* | | Merge branch 'mahcsig/gitlab-ce-17350-multi-file-commit'Rémy Coutable2016-10-061-0/+36
|\ \ \
| * | | multi-file commitMarc Siegfriedt2016-10-051-0/+36
* | | | Merge branch 'issue-board-api-support' into 'master' Dmitriy Zaporozhets2016-10-063-1/+133
|\ \ \ \
| * | | | Added Issue Board API supportAndre Guedes2016-10-053-1/+133
| | |_|/ | |/| |
* | | | Use higher size on Gitlab::Redis connection pool on Sidekiq serversPaco Guzman2016-10-061-1/+11
* | | | Merge remote-tracking branch 'dev/master'Rémy Coutable2016-10-063-5/+25
|\ \ \ \
| * \ \ \ Merge branch 'fix/id-claim-import-issue' into 'master' Douwe Maan2016-09-303-5/+25
| |\ \ \ \
| | * | | | updated attribute cleaner to use allowed keyword and reject attributesJames Lopez2016-09-271-3/+3
| | * | | | Prevent claiming associated model IDs via import and added relevant specsJames Lopez2016-09-273-5/+25
* | | | | | Merge commit 'dev/security' into 'master'Rémy Coutable2016-10-068-8/+22
|\ \ \ \ \ \
| * | | | | | fix export project file permissions issueJames Lopez2016-09-307-7/+18
| * | | | | | Merge branch '22435-no-api-state-change-via-rails-session' into 'security' Douwe Maan2016-09-281-1/+4
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | API: disable rails session auth for non-GET/HEAD requestsNick Thomas2016-09-231-1/+4
* | | | | | | Merge branch 'fix_group_links_404' into 'master' Fatih Acet2016-10-051-0/+3
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | fix group links 404barthc2016-10-051-0/+3
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'kradydal/gitlab-ce-20989-disable-all-for-non-project-members'Rémy Coutable2016-10-051-5/+9
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fix test, add author attribute to all testsKatarzyna Kobierska2016-10-031-2/+2
| * | | | | Prevent rendering the link when the author has no accessKatarzyna Kobierska2016-10-031-5/+9
* | | | | | Merge branch 'test-improve-gitlab-identifier' into 'master' Rémy Coutable2016-10-051-8/+50
|\ \ \ \ \ \
| * | | | | | Refactor Gitlab::IdentifierYorick Peterse2016-10-051-8/+50
* | | | | | | Merge branch 'update-runner-information' into 'master' Rémy Coutable2016-10-052-16/+19
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Extract method that checks if ci runner needs updateGrzegorz Bizon2016-10-031-4/+11
| * | | | | | Update runner version only when updating contacted_atKamil Trzcinski2016-10-032-14/+10
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'fix/22225' into 'master' Sean McGivern2016-10-042-13/+25
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Skip wiki creation when GitHub project has wiki enabledDouglas Barbosa Alexandre2016-10-042-13/+25
* | | | | | Removed puts code :see_no_evil:code-blocks-vue-prePhil Hughes2016-10-041-1/+0
* | | | | | Adds v-pre to code blocks in commentsPhil Hughes2016-10-042-2/+3
|/ / / / /
* | | | | Merge branch 'rc-improve-members-destroy-service' into 'master' Robert Speicher2016-10-042-4/+3
|\ \ \ \ \
| * | | | | Remove useless code now that Member#add_user handles itrc-improve-members-destroy-serviceRémy Coutable2016-10-031-8/+0
| * | | | | Fix a few things after the initial improvment to Members::DestroyServiceRémy Coutable2016-10-031-1/+2
| * | | | | Improve Members::DestroyServiceRémy Coutable2016-10-032-4/+10
* | | | | | GrapeDSL for Namespace endpointzj-grape-sessionsZ.J. van de Weg2016-10-041-12/+10
|/ / / / /
* | | | | 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
|\ \ \ \ \ \ \