summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* since `@route_hash` is memoized, reset on each `call()`3274-geo-route-whitelistingBrett Walker2017-11-021-0/+1
* use `route_hash` when checking for whitelistingBrett Walker2017-10-311-2/+1
* temp test to see if orginal fails in CIBrett Walker2017-10-311-1/+2
* enhance specBrett Walker2017-10-311-1/+13
* added changelogBrett Walker2017-10-311-0/+5
* use `route_hash` when checking for whitelistingBrett Walker2017-10-312-2/+16
* Merge branch 'feature/migrate-wiki-delete-page-to-gitaly' into 'master'Sean McGivern2017-10-317-28/+69
|\
| * Migrate Gitlab::Git::Wiki#delete_page to GitalyAhmad Sherif2017-10-317-28/+69
* | Merge branch '39561-seed_fu-fails-to-load-gitlab-test' into 'master'Sean McGivern2017-10-314-3/+114
|\ \
| * | Handle large values on `MergeRequestDiffCommit` dates39561-seed_fu-fails-to-load-gitlab-testAlejandro Rodríguez2017-10-304-3/+114
* | | Merge branch 'patch-29' into 'master'Stan Hu2017-10-311-1/+1
|\ \ \
| * | | Fix example typo.Lawrence2017-10-311-1/+1
* | | | Merge branch '38869-issue' into 'master'Phil Hughes2017-10-317-53/+40
|\ \ \ \
| * | | | Enable eslintFilipa Lacerda2017-10-311-14/+11
| * | | | Fix broken test38869-issueFilipa Lacerda2017-10-301-1/+2
| * | | | Remove issue and issue status select from global namespaceFilipa Lacerda2017-10-306-51/+40
| | |/ / | |/| |
* | | | Merge branch '3674-hashed-storage-attachments' into 'master'Douwe Maan2017-10-318-36/+162
|\ \ \ \
| * | | | Make `#hashed_storage?` require feature argument3674-hashed-storage-attachmentsGabriel Mazetto2017-10-314-19/+14
| * | | | Code Style changes and `hashed_storage?` now receives optional featureGabriel Mazetto2017-10-314-26/+40
| * | | | ChangelogGabriel Mazetto2017-10-301-0/+5
| * | | | Document existing storable objects and their status regarding Hashed storageGabriel Mazetto2017-10-301-1/+24
| * | | | Use the Hashed Storage compatible layer to store AttachmentsGabriel Mazetto2017-10-302-14/+40
| * | | | Moved renaming operations to storage layer abstractionGabriel Mazetto2017-10-274-13/+76
* | | | | Merge branch '39639-clusters-poll' into 'master'Phil Hughes2017-10-312-8/+19
|\ \ \ \ \
| * | | | | Adds callback function to inital cluster request39639-clusters-pollFilipa Lacerda2017-10-312-8/+19
| | |_|_|/ | |/| | |
* | | | | Merge branch '39619-cancel-merge-when-pipeline-succeeds-from-the-api-fails' i...Rémy Coutable2017-10-313-1/+30
|\ \ \ \ \
| * | | | | Fix namespacing for MergeWhenPipelineSucceedsService in MR APIMark Fletcher2017-10-303-1/+30
* | | | | | Merge branch 'add-packagist-project-service' into 'master'Kamil Trzciński2017-10-3113-0/+221
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Add Packagist project serviceMatt Coleman2017-10-1313-0/+221
* | | | | | Merge branch 'ph-multi-file-upload-file' into 'master'Filipa Lacerda2017-10-3113-22/+325
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Upload files through the multi-file editorPhil Hughes2017-10-3113-22/+325
|/ / / / /
* | | | | Merge branch '39593-emails-on-push-are-sent-to-only-the-first-recipient-when-...Douwe Maan2017-10-313-6/+26
|\ \ \ \ \
| * | | | | Only set Auto-Submitted header once39593-emails-on-push-are-sent-to-only-the-first-recipient-when-using-aws-sesSean McGivern2017-10-303-6/+26
* | | | | | Merge branch '39616-convert-autosize-js-library-to-be-a-yarn-managed-library'...Phil Hughes2017-10-3110-257/+19
|\ \ \ \ \ \
| * | | | | | Resolve "Convert autosize.js library to be a Yarn managed library"Tim Zallmann2017-10-3110-257/+19
|/ / / / / /
* | | | | | Merge branch 'revert-2573818f' into 'master'Phil Hughes2017-10-3116-174/+93
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Revert "Merge branch '2518-saved-configuration-for-issue-board' into 'master'"revert-2573818fDmitriy Zaporozhets2017-10-3016-174/+93
|/ / / / /
* | | | | Merge branch '39582-nestingdepth-6' into 'master'39635-convert-jquery-scrollto-js-library-to-be-a-yarn-managed-libraryAnnabel Dunstone Gray2017-10-305-21/+12
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Enable NestingDepth (level 6) on scss-lintTakuya Noguchi2017-10-305-21/+12
* | | | | Merge branch '39583-reopen-issue-count-cache' into 'master'Rémy Coutable2017-10-303-0/+7
|\ \ \ \ \
| * | | | | Refresh open Issue and Merge Request project counter caches when re-openingRob Ede2017-10-303-0/+7
|/ / / / /
* | | | | Merge branch 'sh-fix-broken-redirection-relative-url-root' into 'master'Rémy Coutable2017-10-306-10/+15
|\ \ \ \ \
| * | | | | Fix broken Members link when relative URL root paths are usedsh-fix-broken-redirection-relative-url-rootStan Hu2017-10-276-10/+15
| | |_|_|/ | |/| | |
* | | | | Merge branch '39570-performance-bar-appears-enabled-even-though-it-won-t-show...Sean McGivern2017-10-306-2/+39
|\ \ \ \ \
| * | | | | Add .gitlab/route-map.ymlRémy Coutable2017-10-301-0/+3
| * | | | | Allow to disable the Performance Bar and document the `p b` shortcut in its d...Rémy Coutable2017-10-305-2/+36
| | |_|/ / | |/| | |
* | | | | Merge branch '38869-importer_status' into 'master'Phil Hughes2017-10-3013-476/+305
|\ \ \ \ \
| * | | | | Fix queried element38869-importer_statusFilipa Lacerda2017-10-301-3/+3
| * | | | | Merge branch 'master' into 38869-importer_statusFilipa Lacerda2017-10-30144-583/+2125
| |\ \ \ \ \
| * | | | | | Remove issuable form from global namespaceFilipa Lacerda2017-10-264-102/+98
View Lorry Controller Status