summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add translatable strings to wiki pagesjramsay-4012-externalize-wiki-stringsJames Ramsay2017-09-2812-64/+186
* Merge branch 'hashed-storage-migration-path' into 'master'Douwe Maan2017-09-2820-14/+736
|\
| * Add support to migrate existing projects to Hashed Storage asynchashed-storage-migration-pathGabriel Mazetto2017-09-2816-4/+686
| * [Backported from EE] Readonly flag for ProjectsGabriel Mazetto2017-09-285-11/+51
* | Merge branch 'bvl-fix-close-issuable-link' into 'master'Rémy Coutable2017-09-284-11/+25
|\ \
| * | Use relative paths for opening and closing issuablesbvl-fix-close-issuable-linkBob Van Landuyt2017-09-284-11/+25
* | | Merge branch 'feature/custom-attributes' into 'master'Rémy Coutable2017-09-2823-2/+433
|\ \ \
| * | | Support custom attributes on usersMarkus Koller2017-09-2823-2/+433
|/ / /
* | | Merge branch 'master' into 'master'Achilleas Pipinellis2017-09-281-7/+22
|\ \ \
| * | | Document the usage of the Docker OverlayFS driver for every buildDominik2017-09-281-7/+22
|/ / /
* | | Merge branch '13637-show-account-confirmation-link-in-e-mail-text' into 'master'Phil Hughes2017-09-282-2/+8
|\ \ \
| * | | Changed account confirmation line to e-mail text. This MR fixes issue #13637bitsapien2017-09-282-2/+8
* | | | Merge branch 'jramsay-spelling-occurred' into 'master'Jacob Schatz2017-09-2817-21/+21
|\ \ \ \
| * | | | Fix spelling of occurredjramsay-spelling-occurredJames Ramsay2017-09-2617-21/+21
* | | | | Merge branch 'dm-api-unauthorized' into 'master'Sean McGivern2017-09-284-54/+83
|\ \ \ \ \
| * | | | | Make sure API responds with 401 when invalid authentication info is provideddm-api-unauthorizedDouwe Maan2017-09-284-54/+83
* | | | | | Merge branch 'evn-add-neg-tests' into 'master'Robert Speicher2017-09-281-0/+10
|\ \ \ \ \ \
| * | | | | | Test for what should not be there as wellevn-add-neg-testsernstvn2017-09-251-0/+10
* | | | | | | Merge branch '38319-nomethoderror-undefined-method-sha-for-nil-nilclass' into...Douwe Maan2017-09-283-2/+90
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Handle error when fetching ref for MR with deleted source branch38319-nomethoderror-undefined-method-sha-for-nil-nilclassSean McGivern2017-09-283-2/+90
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'docs-28814-clarify-artifacts-ref' into 'master'Grzegorz Bizon2017-09-282-1/+6
|\ \ \ \ \ \
| * | | | | | Clarify artifact download via the API only accepts branch or tag name for refMark Fletcher2017-09-282-1/+6
* | | | | | | Merge branch 'fix-translation-namespaces' into 'master'Filipa Lacerda2017-09-283-9/+9
|\ \ \ \ \ \ \
| * | | | | | | Fixed missing namespaces on navigation translationsfix-translation-namespacesPhil Hughes2017-09-273-9/+9
* | | | | | | | Merge branch 'mobile-images-lazy-load-check' into 'master'Tim Zallmann2017-09-282-1/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | karma spec fixesmobile-images-lazy-load-checkPhil Hughes2017-09-271-1/+1
| * | | | | | | | Lazy load images in mobile sidebar & headerPhil Hughes2017-09-272-1/+6
* | | | | | | | | Merge branch 'commit-side-by-side-comment' into 'master'Filipa Lacerda2017-09-283-3/+44
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Fixes commit comments in side-by-side diff viewcommit-side-by-side-commentPhil Hughes2017-09-273-3/+44
* | | | | | | | | Merge branch 'zj-repo-gitaly' into 'master'Sean McGivern2017-09-283-19/+18
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'an-repo-gitaly' into 'zj-repo-gitaly'zj-repo-gitalyAlejandro Rodríguez2017-09-271-7/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Rolling back change to n+1 detectionan-repo-gitalyAndrew Newdigate2017-09-271-7/+1
| |/ / / / / / / / /
| * | | | | | | | | RepositoryExists is always called with #gitaly_migrationZeger-Jan van de Weg2017-09-263-19/+18
| * | | | | | | | | Don't enforce gitaly request limits for distinct callsAlejandro Rodríguez2017-09-261-1/+7
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'refactor-services' into 'master'Grzegorz Bizon2017-09-2825-57/+85
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | refactor emails servicerefactor-servicesJames Lopez2017-09-287-14/+14
| * | | | | | | | | fix update serviceJames Lopez2017-09-281-1/+1
| * | | | | | | | | refactor users update serviceJames Lopez2017-09-2817-32/+32
| * | | | | | | | | refactor keys controllerJames Lopez2017-09-281-1/+7
| * | | | | | | | | refactor some controllers to make them EE friendlyJames Lopez2017-09-283-5/+21
| * | | | | | | | | fix specsJames Lopez2017-09-283-6/+6
| * | | | | | | | | fix users update serviceJames Lopez2017-09-281-3/+5
| * | | | | | | | | update initializersJames Lopez2017-09-282-2/+4
| * | | | | | | | | refactor services to match EE signatureJames Lopez2017-09-2817-41/+43
* | | | | | | | | | Merge branch '38476-improve-merge-jid-cleanup-on-merge-process' into 'master'Sean McGivern2017-09-283-10/+37
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Clean merge_jid whenever necessary on the merge process38476-improve-merge-jid-cleanup-on-merge-processOswaldo Ferreira2017-09-273-10/+37
* | | | | | | | | | Merge branch 'rotated_profile_image' into 'master'Tim Zallmann2017-09-282-1/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Check orientation of profile imageGuilherme Vieira2017-09-272-1/+7
* | | | | | | | | | | Merge branch 'docs-38152-bump-recommended-mysql-version' into 'master'Achilleas Pipinellis2017-09-282-2/+9
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | Change recommended MySQL version to 5.6Mark Fletcher2017-09-282-2/+9
| | |_|_|_|_|/ / / / | |/| | | | | | | |