Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'fix/github-importer-client' into 'master' | Rémy Coutable | 2016-10-06 | 1 | -2/+12 |
|\ | |||||
| * | Fix broken handling of certain calls in GitHub importer clientfix/github-importer-client | Ahmad Sherif | 2016-10-06 | 1 | -2/+12 |
* | | Merge branch 'rc-use-grape-dsl-to-document-members-api' into 'master' | Robert Speicher | 2016-10-06 | 2 | -93/+67 |
|\ \ | |||||
| * | | Use Grape DSL to document methods and their paramsrc-use-grape-dsl-to-document-members-api | Rémy Coutable | 2016-10-05 | 2 | -93/+67 |
* | | | Merge branch 'mahcsig/gitlab-ce-17350-multi-file-commit' | Rémy Coutable | 2016-10-06 | 1 | -0/+36 |
|\ \ \ | |||||
| * | | | multi-file commit | Marc Siegfriedt | 2016-10-05 | 1 | -0/+36 |
* | | | | Merge branch 'issue-board-api-support' into 'master' | Dmitriy Zaporozhets | 2016-10-06 | 3 | -1/+133 |
|\ \ \ \ | |||||
| * | | | | Added Issue Board API support | Andre Guedes | 2016-10-05 | 3 | -1/+133 |
| | |_|/ | |/| | | |||||
* | | | | Use higher size on Gitlab::Redis connection pool on Sidekiq servers | Paco Guzman | 2016-10-06 | 1 | -1/+11 |
* | | | | Merge remote-tracking branch 'dev/master' | Rémy Coutable | 2016-10-06 | 3 | -5/+25 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'fix/id-claim-import-issue' into 'master' | Douwe Maan | 2016-09-30 | 3 | -5/+25 |
| |\ \ \ \ | |||||
| | * | | | | updated attribute cleaner to use allowed keyword and reject attributes | James Lopez | 2016-09-27 | 1 | -3/+3 |
| | * | | | | Prevent claiming associated model IDs via import and added relevant specs | James Lopez | 2016-09-27 | 3 | -5/+25 |
* | | | | | | Merge commit 'dev/security' into 'master' | Rémy Coutable | 2016-10-06 | 8 | -8/+22 |
|\ \ \ \ \ \ | |||||
| * | | | | | | fix export project file permissions issue | James Lopez | 2016-09-30 | 7 | -7/+18 |
| * | | | | | | Merge branch '22435-no-api-state-change-via-rails-session' into 'security' | Douwe Maan | 2016-09-28 | 1 | -1/+4 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| | * | | | | | API: disable rails session auth for non-GET/HEAD requests | Nick Thomas | 2016-09-23 | 1 | -1/+4 |
* | | | | | | | Merge branch 'fix_group_links_404' into 'master' | Fatih Acet | 2016-10-05 | 1 | -0/+3 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | fix group links 404 | barthc | 2016-10-05 | 1 | -0/+3 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'kradydal/gitlab-ce-20989-disable-all-for-non-project-members' | Rémy Coutable | 2016-10-05 | 1 | -5/+9 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Fix test, add author attribute to all tests | Katarzyna Kobierska | 2016-10-03 | 1 | -2/+2 |
| * | | | | | Prevent rendering the link when the author has no access | Katarzyna Kobierska | 2016-10-03 | 1 | -5/+9 |
* | | | | | | Merge branch 'test-improve-gitlab-identifier' into 'master' | Rémy Coutable | 2016-10-05 | 1 | -8/+50 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Refactor Gitlab::Identifier | Yorick Peterse | 2016-10-05 | 1 | -8/+50 |
* | | | | | | | Merge branch 'update-runner-information' into 'master' | Rémy Coutable | 2016-10-05 | 2 | -16/+19 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Extract method that checks if ci runner needs update | Grzegorz Bizon | 2016-10-03 | 1 | -4/+11 |
| * | | | | | | Update runner version only when updating contacted_at | Kamil Trzcinski | 2016-10-03 | 2 | -14/+10 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'fix/22225' into 'master' | Sean McGivern | 2016-10-04 | 2 | -13/+25 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Skip wiki creation when GitHub project has wiki enabled | Douglas Barbosa Alexandre | 2016-10-04 | 2 | -13/+25 |
* | | | | | | Removed puts code :see_no_evil:code-blocks-vue-pre | Phil Hughes | 2016-10-04 | 1 | -1/+0 |
* | | | | | | Adds v-pre to code blocks in comments | Phil Hughes | 2016-10-04 | 2 | -2/+3 |
|/ / / / / | |||||
* | | | | | Merge branch 'rc-improve-members-destroy-service' into 'master' | Robert Speicher | 2016-10-04 | 2 | -4/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Remove useless code now that Member#add_user handles itrc-improve-members-destroy-service | Rémy Coutable | 2016-10-03 | 1 | -8/+0 |
| * | | | | | Fix a few things after the initial improvment to Members::DestroyService | Rémy Coutable | 2016-10-03 | 1 | -1/+2 |
| * | | | | | Improve Members::DestroyService | Rémy Coutable | 2016-10-03 | 2 | -4/+10 |
* | | | | | | GrapeDSL for Namespace endpointzj-grape-sessions | Z.J. van de Weg | 2016-10-04 | 1 | -12/+10 |
|/ / / / / | |||||
* | | | | | Merge branch 'aiionx_sidekiq_log_patch' into 'master' | Rémy Coutable | 2016-10-03 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | aiionx_sidekiq_log_patch | David | 2016-04-15 | 1 | -1/+1 |
* | | | | | | Merge branch '22466-task-list-fork' into 'master' | Rémy Coutable | 2016-10-03 | 1 | -22/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Replace talk_list patch with a patched fork | Jared Deckard | 2016-09-30 | 1 | -22/+0 |
* | | | | | | | Merge branch 'zj-grape-award-emoji' into 'master' | Robert Speicher | 2016-10-03 | 1 | -33/+31 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | GrapeDSL for Award Emoji endpointszj-grape-award-emoji | Z.J. van de Weg | 2016-10-03 | 1 | -33/+31 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'zj-grape-keys' into 'master' | Rémy Coutable | 2016-10-03 | 1 | -4/+3 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | GrapeDSL for Keys endpointzj-grape-keys | Z.J. van de Weg | 2016-10-01 | 1 | -4/+3 |
| |/ / / / / | |||||
* | | | | | | Merge branch '21983-member-add_user-doesn-t-detect-existing-members-that-have... | Robert Speicher | 2016-10-02 | 2 | -15/+6 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Allow Member.add_user to handle access requesters | Rémy Coutable | 2016-09-28 | 2 | -15/+6 |
* | | | | | | Merge branch '21744-fix-missing-values-in-linter' into 'master' | Rémy Coutable | 2016-09-30 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Expose jobs to view | Katarzyna Kobierska | 2016-09-30 | 1 | -3/+1 |
| * | | | | | | Add missing values to linter | Katarzyna Kobierska | 2016-09-30 | 1 | -0/+2 |
* | | | | | | | Merge branch 'initialize-redis' into 'master' | Yorick Peterse | 2016-09-30 | 1 | -18/+6 |
|\ \ \ \ \ \ \ |