summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fixed up copy button click methodmulti-file-blob-viewerPhil Hughes2017-11-212-8/+19
* fixed karma specsPhil Hughes2017-11-212-12/+3
* fixed up some JS based on commentsPhil Hughes2017-11-2118-33/+415
* fixed karma specsPhil Hughes2017-11-213-1/+3
* correctly conditionally load expanded blobPhil Hughes2017-11-214-11/+15
* match functionality to current blob viewerPhil Hughes2017-11-2116-79/+309
* fixed rubocopPhil Hughes2017-11-215-5/+9
* ruby specsPhil Hughes2017-11-2112-17/+176
* fixed karma specsPhil Hughes2017-11-2114-38/+186
* change check inside of render locally getterPhil Hughes2017-11-211-11/+14
* async load in the blob viewer componentsPhil Hughes2017-11-213-20/+48
* added local error preview statePhil Hughes2017-11-2111-56/+165
* fixed parent tree URL being incorrect on frontendPhil Hughes2017-11-211-1/+1
* reduced complexity by always fetching from serverPhil Hughes2017-11-218-152/+5
* added some frontend blob viewersPhil Hughes2017-11-2116-96/+275
* fixed failing karma specsPhil Hughes2017-11-217-24/+416
* fixed stylingPhil Hughes2017-11-214-5/+6
* added blob viewer switcherPhil Hughes2017-11-219-15/+241
* Fix BlobBasicEntity when used to render a tree blobDouwe Maan2017-11-212-4/+6
* Move blob JSON to entity and expose blob viewer JSONDouwe Maan2017-11-2111-53/+97
* Merge branch '38869-milestone' into 'master'Phil Hughes2017-11-2110-209/+176
|\
| * Export code as ES6 modules38869-milestoneFilipa Lacerda2017-11-2010-209/+176
* | Merge branch 'backport-3434' into 'master'Filipa Lacerda2017-11-216-3/+72
|\ \
| * | Backport ability to enable/disable file attachments in issuable formClement Ho2017-11-216-3/+72
|/ /
* | Merge branch 'sh-memoize-gitlab-shell' into 'master'Douwe Maan2017-11-211-1/+1
|\ \
| * | Memoize GitlabShellAdapter for performance and ease of testingStan Hu2017-11-201-1/+1
* | | Merge branch '39821-fix-commits-list-with-multi-file-editor' into 'master'Phil Hughes2017-11-213-0/+14
|\ \ \
| * | | Fix commits list 500 with multi-file editor new_repo cookie39821-fix-commits-list-with-multi-file-editorEric Eastwood2017-11-203-0/+14
* | | | Merge branch 'rc/remove-useless-allow-failure' into 'master'Grzegorz Bizon2017-11-211-2/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Remove a useless `allow_failure: no` and use `true` instead of `yes`rc/remove-useless-allow-failureRémy Coutable2017-11-201-2/+1
* | | | Merge branch 'grpc-update' into 'master'Robert Speicher2017-11-211-2/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | Update gRPC to v1.7.2Alejandro Rodríguez2017-11-201-2/+2
* | | | Merge branch '40290-remove-rake-gitlab-sidekiq-drop-post-receive' into 'master'Nick Thomas2017-11-202-47/+5
|\ \ \ \
| * | | | added changelog entry40290-remove-rake-gitlab-sidekiq-drop-post-receivedigitalMoksha2017-11-201-0/+5
| * | | | remove the rake task `gitlab:sidekiq:drop_post_receive`digitalMoksha2017-11-201-47/+0
* | | | | Merge branch 'fix-mr-cleanup' into 'master'Sean McGivern2017-11-201-4/+4
|\ \ \ \ \
| * | | | | Fix merge_requests.source_project_id migrationfix-mr-cleanupYorick Peterse2017-11-201-4/+4
* | | | | | Merge branch '1870-impersonation-stuck-on-password-change-ce' into 'master'Sean McGivern2017-11-204-4/+34
|\ \ \ \ \ \
| * | | | | | Fix MR IID in changelog item1870-impersonation-stuck-on-password-change-ceDouwe Maan2017-11-201-1/+1
| * | | | | | Impersonation no longer gets stuck on password change.Tiago Botelho2017-11-204-4/+34
| |/ / / / /
* | | | | | Merge branch '39497-inline-edit-issue-on-mobile' into 'master'Annabel Dunstone Gray2017-11-207-79/+105
|\ \ \ \ \ \
| * | | | | | Add inline editing to issues on mobileEric Eastwood2017-11-187-79/+105
* | | | | | | Merge branch '4080-align-retry-btn' into 'master'Annabel Dunstone Gray2017-11-203-1/+7
|\ \ \ \ \ \ \
| * | | | | | | Align retry button with job title with new grid sizeFilipa Lacerda2017-11-203-1/+7
|/ / / / / / /
* | | | | | | Merge branch '40292-bitbucket-import-hashed-storage' into 'master'Douwe Maan2017-11-203-5/+37
|\ \ \ \ \ \ \
| * | | | | | | Fix bitbucket wiki import with hashed storage enabledNick Thomas2017-11-203-5/+37
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'req-docs' into 'master'Rémy Coutable2017-11-201-3/+3
|\ \ \ \ \ \ \
| * | | | | | | formatting cleanup, swamp details, unicorn defaultsBen Bodenmiller2017-11-071-3/+3
* | | | | | | | Merge branch 'fix-protected-branches-descriptions' into 'master'Douwe Maan2017-11-203-4/+9
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Clarify wording of protected branch settings for the default branchSean McGivern2017-11-203-4/+9