summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Increase lazy loader performancelazy-load-check-when-has-imagesPhil Hughes2017-10-311-8/+7
| | | | This stops the checkElementsInView method from running when there aren't any lazy load images on the page. By calling this method we are causing an unnecessary reflow which on large pages is a massive performance issue
* Merge branch 'multi-file-editor-vuex' into 'master'Filipa Lacerda2017-10-3163-2447/+1826
|\ | | | | | | | | Move multi-file editor store to Vuex See merge request gitlab-org/gitlab-ce!15046
| * fixed up upload feature after master mergemulti-file-editor-vuexPhil Hughes2017-10-317-46/+64
| |
| * Merge branch 'master' into multi-file-editor-vuexPhil Hughes2017-10-3121-264/+283
| |\
| * | get branch name from the DOMPhil Hughes2017-10-312-2/+4
| | |
| * | Merge branch 'master' into multi-file-editor-vuexPhil Hughes2017-10-3166-750/+695
| |\ \
| * | | spec fixesPhil Hughes2017-10-313-2/+7
| | | |
| * | | spec fixesPhil Hughes2017-10-307-13/+19
| | | | | | | | | | | | | | | | increased perf of scrolling tabs into view
| * | | addressed feedback from reviewPhil Hughes2017-10-3019-74/+93
| | | | | | | | | | | | | | | | spec fixes
| * | | Merge branch 'master' into multi-file-editor-vuexPhil Hughes2017-10-30132-524/+2018
| |\ \ \
| * | | | updated karma specsPhil Hughes2017-10-2727-1030/+612
| | | | |
| * | | | reset hash when changing filesPhil Hughes2017-10-262-2/+3
| | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | various different performance improvementsPhil Hughes2017-10-2610-37/+24
| | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | fixed render_error not being hooked up correctlyPhil Hughes2017-10-265-34/+9
| | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | fixed some state bugs with the tabsPhil Hughes2017-10-2610-38/+53
| | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | correctly activate the next tab when closing a tabPhil Hughes2017-10-263-3/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scroll to the active tab when opening/closing [ci skip]
| * | | | moved new file/directory into new storePhil Hughes2017-10-2619-692/+176
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removed old store, helper & monaco loader moved monaco loader into editor component because it is the only component that requires monaco [ci skip]
| * | | | [WIP] Move multi-file editor store to VuexPhil Hughes2017-10-2633-584/+910
| | | | |
* | | | | Merge branch 'zj/gitlab-ce-zj-ruby-2.3.5' into 'master'Sean McGivern2017-10-314-6/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Ruby to 2.3.5 See merge request gitlab-org/gitlab-ce!15099
| * | | | | Be able to bundle gems with newer rubieszj/gitlab-ce-zj-ruby-2.3.5Zeger-Jan van de Weg2017-10-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Upgrade Ruby to 2.3.5Zeger-Jan van de Weg2017-10-314-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | Part of gitlab-org/gitlab-ce#38040
* | | | | | Merge branch 'docs/improve-maintenance' into 'master'Stan Hu2017-10-311-13/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve the maintenance policy page See merge request gitlab-org/gitlab-ce!15112
| * | | | | | Improve the maintenance policy pageRémy Coutable2017-10-311-13/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make clear that we may backport bug fixes to the previous stable release. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch '23206-load-participants-async' into 'master'Phil Hughes2017-10-3145-205/+911
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Load participants async Closes #23206 See merge request gitlab-org/gitlab-ce!14836
| * | | | | | | Load participants asyncEric Eastwood2017-10-3145-205/+911
|/ / / / / / /
* | | | | | | Merge branch 'fix/import-issue-assignees' into 'master'Sean McGivern2017-10-317-1/+27
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix missing issue assignees Closes #39170 See merge request gitlab-org/gitlab-ce!15109
| * | | | | | add changelogJames Lopez2017-10-311-0/+5
| | | | | | |
| * | | | | | fix spec failureJames Lopez2017-10-311-0/+3
| | | | | | |
| * | | | | | fix specsfix/import-issue-assigneesJames Lopez2017-10-313-7/+10
| | | | | | |
| * | | | | | fix missing issue assigneesJames Lopez2017-10-314-1/+16
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch '39509-fix-wiki-create-sidebar-overlap' into 'master'Annabel Dunstone Gray2017-10-312-5/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix overlap of right-sidebar and wiki create page form Closes #39509 See merge request gitlab-org/gitlab-ce!15075
| * | | | | | Fix overlap of right-sidebar and wiki create page form39509-fix-wiki-create-sidebar-overlapEric Eastwood2017-10-312-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/39509
* | | | | | | Merge branch '31454-missing-project-id-pipeline-hook-data' into 'master'Rémy Coutable2017-10-313-0/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds project_id to pipeline hook data Closes #31454 See merge request gitlab-org/gitlab-ce!15044
| * | | | | | | Adds project_id to pipeline hook dataJacopo2017-10-303-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pipeline hook data now includes the project_id
* | | | | | | | Merge branch 'issue_38777' into 'master'Sean McGivern2017-10-3110-13/+230
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow promoting project milestones to group milestones Closes #38777 See merge request gitlab-org/gitlab-ce!14831
| * | | | | | | | Allow promoting project milestones to group milestonesFelipe Artur2017-10-3110-13/+230
|/ / / / / / / /
* | | | | | | | Merge branch 'feature/migrate-wiki-delete-page-to-gitaly' into 'master'Sean McGivern2017-10-317-28/+69
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate Gitlab::Git::Wiki#delete_page to Gitaly Closes gitaly#673 See merge request gitlab-org/gitlab-ce!14910
| * | | | | | | | Migrate Gitlab::Git::Wiki#delete_page to GitalyAhmad Sherif2017-10-317-28/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes gitaly#673
* | | | | | | | | Merge branch '39561-seed_fu-fails-to-load-gitlab-test' into 'master'Sean McGivern2017-10-314-3/+114
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle large values on `MergeRequestDiffCommit` dates Closes #39561 See merge request gitlab-org/gitlab-ce!15093
| * | | | | | | | | 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. See merge request gitlab-org/gitlab-ce!15104
| * | | | | | | | | Fix example typo.Lawrence2017-10-311-1/+1
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch '38869-issue' into 'master'Phil Hughes2017-10-317-53/+40
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove issue and issue status select from global namespace See merge request gitlab-org/gitlab-ce!15090
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hashed Storage support for Attachments See merge request gitlab-org/gitlab-ce!15068
| * | | | | | | | | 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
| | | | | | | | | |