summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Adjust permitted params filtering on merge scheduling46903-osw-fix-permitted-params-filtering-on-merge-schedulingOswaldo Ferreira2018-05-303-4/+9
* Merge branch '46879-import-project-alignment' into 'master'Clement Ho2018-05-304-65/+63
|\
| * Fix import project by url layoutAnnabel Dunstone Gray2018-05-294-65/+63
* | Merge branch 'dz-awesome-print-version-unlock' into 'master'Robert Speicher2018-05-302-2/+2
|\ \
| * | Remove version lock on awesome_print dependencyDmitriy Zaporozhets2018-05-302-2/+2
* | | Merge branch 'dm-api-projects-members-preload' into 'master'Robert Speicher2018-05-303-16/+26
|\ \ \
| * | | Only preload member records for the relevant projects/groups/user in projects...dm-api-projects-members-preloadDouwe Maan2018-05-303-16/+26
* | | | Merge branch 'sh-use-grape-path-helpers' into 'master'Sean McGivern2018-05-307-73/+25
|\ \ \ \
| * | | | Replace grape-route-helpers with our own grape-path-helpersStan Hu2018-05-307-73/+25
* | | | | Merge branch 'sh-simplify-issues-spec' into 'master'Douwe Maan2018-05-301-1/+1
|\ \ \ \ \
| * | | | | Simplify spec: `2.times.each` -> `2.times`Stan Hu2018-05-301-1/+1
* | | | | | Merge branch 'match-any-stable-branch' into 'master'Rémy Coutable2018-05-301-1/+1
|\ \ \ \ \ \
| * | | | | | Consider we might have prefix for stable branchesLin Jen-Shin2018-05-301-1/+1
* | | | | | | Merge branch '46917-gitlab-is-not-sending-objectstore-timeout-value-to-workho...Kamil Trzciński2018-05-303-1/+10
|\ \ \ \ \ \ \
| * | | | | | | Fix missing timeout value in object storage pre-authorization callAlessio Caiazza2018-05-293-1/+10
* | | | | | | | Merge branch 'bump-kubeclient-version-3-1-0' into 'master'Rémy Coutable2018-05-303-6/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | Bumps kubeclient gem version to 3.1.0bump-kubeclient-version-3-1-0Tiago Botelho2018-05-293-6/+11
* | | | | | | | | Merge branch 'bvl-group-shared-projects-private-api' into 'master'Sean McGivern2018-05-304-1/+92
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add archived param to the json responsebvl-group-shared-projects-private-apiToon Claes2018-05-301-1/+1
| * | | | | | | | | Fix small typosToon Claes2018-05-292-5/+5
| * | | | | | | | | Add `shared_projects` endpointBob Van Landuyt2018-05-293-0/+91
| |/ / / / / / / /
* | | | | | | | | Merge branch '46973-job-failed-71275338-docs' into 'master'Rémy Coutable2018-05-301-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix a wrong link reference in docsRémy Coutable2018-05-301-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge branch 'rails5-boolean-cast' into 'master'46973-job-failed-71275338Rémy Coutable2018-05-301-2/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix boolean casting for nil valueJan Provaznik2018-05-291-2/+3
| |/ / / / / / / /
* | | | | | | | | Merge branch 'patch-24' into 'master'Rémy Coutable2018-05-301-1/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | add details on root flag related to no_root_squashBen Bodenmiller2018-05-301-1/+3
|/ / / / / / / / /
* | | | | | | | | Merge branch 'docs/broken-link-code-review-guidelines' into 'master'Marin Jankovski2018-05-301-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Fixed broken link to build team in documentationEddie Stubbington2018-05-301-1/+1
|/ / / / / / / /
* | | | | | | | Merge branch 'brodock-refactor-hashed-storage-task' into 'master'Douwe Maan2018-05-304-97/+190
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Specs covering listing all gitlab:storage:* typesbrodock-refactor-hashed-storage-taskGabriel Mazetto2018-05-292-5/+101
| * | | | | | | refactor to remove duplicationGabriel Mazetto2018-05-281-14/+12
| * | | | | | | assign helper full name to variable to reduce code lengthGabriel Mazetto2018-05-281-10/+19
| * | | | | | | Refactor RakeHelper to reduce complexityGabriel Mazetto2018-05-281-26/+18
| * | | | | | | Remove useless extra lines from `storage.md` inside code blockGabriel Mazetto2018-05-281-7/+0
| * | | | | | | Extracted auxiliary methods from storage.rake into specific RakeHelperGabriel Mazetto2018-05-282-86/+91
* | | | | | | | Merge branch 'fix/bitbucket_import_anonymous' into 'master'Douwe Maan2018-05-304-1/+37
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Import bitbucket issues that are reported by an anonymous userBart Libert2018-05-244-1/+37
* | | | | | | | Merge branch 'sh-fix-submit-not-clearing-local-storage' into 'master'Filipa Lacerda2018-05-304-2/+22
|\ \ \ \ \ \ \ \
| * | | | | | | | Add a regression test for clearing local storage upon issue creationStan Hu2018-05-291-0/+14
| * | | | | | | | Fix local storage not being cleared after creating a new issueStan Hu2018-05-293-2/+8
* | | | | | | | | Merge branch 'patch-25' into 'master'Rémy Coutable2018-05-301-1/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | add CI as option in place of custom hooksBen Bodenmiller2018-05-301-1/+2
|/ / / / / / / / /
* | | | | | | | | Merge branch 'mattermost-api-v4' into 'master'Sean McGivern2018-05-3010-46/+53
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Updated help text for team list for Mattermost slash commandsHarrison Healey2018-05-293-5/+5
| * | | | | | | | | Updated Mattermost integration to use Mattermost API v4Harrison Healey2018-05-288-42/+49
* | | | | | | | | | Merge branch 'render_super' into 'master'Rémy Coutable2018-05-303-16/+43
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add document around `render_ce`render_superLin Jen-Shin2018-05-291-12/+38
| * | | | | | | | | | Unify app/views/shared/issuable/form/_title.html.hamlLin Jen-Shin2018-05-282-4/+5
* | | | | | | | | | | Merge branch 'blackst0ne-squash-and-merge-in-gitlab-core-ce' into 'master'Phil Hughes2018-05-3041-64/+840
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |