summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add es6-set polyfill for test_utils.jsLuke "Jared" Bennett2017-07-183-56/+8
* Fix scss_lint offenses in repo, variables and layout sheetsLuke "Jared" Bennett2017-07-183-184/+206
* Fix haml_lint offenses in tree_content and tree_headerLuke "Jared" Bennett2017-07-182-24/+24
* Fix RepoHelper Flash importLuke "Jared" Bennett2017-07-181-1/+2
* Add Map polyfill for rspec tests using phantomjsLuke "Jared" Bennett2017-07-183-0/+58
* Fix repo_sidebar lintingLuke "Jared" Bennett2017-07-182-25/+22
* Fix rubocop repo_url offsenseLuke "Jared" Bennett2017-07-181-1/+1
* Merge branch 'ide' of gitlab.com:gitlab-org/gitlab-ce into ideLuke "Jared" Bennett2017-07-1810-18/+60
|\
| * fix redundant vue libraryMike Greiling2017-07-184-1/+4
| * remove needless rails helperMike Greiling2017-07-184-9/+6
| * move copy-webpack-plugin to production dependenciesMike Greiling2017-07-181-1/+0
| * fix global context and relative_url_root for monaco editorMike Greiling2017-07-186-8/+51
* | Restore file_spec and parser_spec file conflict markersLuke "Jared" Bennett2017-07-182-0/+38
|/
* Remove multiple methods of including monaco related code and remove static mo...Luke "Jared" Bennett2017-07-18144-121009/+91
* Add support for syntax highlighting any support lang for monaco.Jacob Schatz2017-07-174-34/+39
* Made BlobViewer jasmine integration spec use snippets view instead of pblob viewLuke "Jared" Bennett2017-07-172-9/+7
* Removed TreeViewLuke "Jared" Bennett2017-07-173-70/+0
* Remove BlobViewer from project repo viewLuke "Jared" Bennett2017-07-171-6/+0
* Fixed RepoHelper.loadingError call in repo_binary_viewerLuke "Jared" Bennett2017-07-171-2/+2
* Further eslint fixes after conflict resolutionLuke "Jared" Bennett2017-07-1710-73/+71
* Resolve conflicts from eslint changesLuke "Jared" Bennett2017-07-179-142/+1
* Merge branch 'ide' of gitlab.com:gitlab-org/gitlab-ce into ide With conflictsJacob Schatz2017-07-1717-186/+310
|\
| * Further eslint fixesLuke "Jared" Bennett2017-07-155-13/+11
| * Merge branch 'ide' of gitlab.com:gitlab-org/gitlab-ce into ideLuke "Jared" Bennett2017-07-1521-168/+388
| |\
| * | Fix eslint warningsLuke "Jared" Bennett2017-07-1515-192/+191
* | | Adds support for multiple file updating.Jacob Schatz2017-07-1714-63/+228
| |/ |/|
* | Initial line linking.Jacob Schatz2017-07-146-14/+41
* | Fixes bug and gets repo running again.Jacob Schatz2017-07-142-2/+2
* | Adds editor buttonsJacob Schatz2017-07-149-79/+109
* | Adds prev dir back inJacob Schatz2017-07-115-13/+23
* | Add Readme rendering by checking out the `md` ext.Jacob Schatz2017-07-112-2/+18
* | Get README to render.Jacob Schatz2017-07-114-18/+25
* | Get single view working.Jacob Schatz2017-07-104-29/+40
* | Fixes bugs in implementation and adds new/folder buttonsJacob Schatz2017-07-1014-46/+164
|/
* Update tree.Jacob Schatz2017-07-051-1/+0
* Renders spinners on loading tabsJacob Schatz2017-07-0214-18/+223
* Add styles to look good on windows in general.Jacob Schatz2017-07-015-3/+24
* Show PNG's and setup nice framework for showing any binary fine.Jacob Schatz2017-06-309-17/+126
* Gets syntax highlighting working.Jacob Schatz2017-06-303-2/+10
* Remove children when closing folder.Jacob Schatz2017-06-305-6/+31
* Add file and tab switching.Jacob Schatz2017-06-3013-39/+199
* Adds back button.Jacob Schatz2017-06-295-13/+18
* Functionality to move between files.Jacob Schatz2017-06-2911-40/+115
* Adds popstateJacob Schatz2017-06-275-3/+52
* Merge branch 'dm-tree-json' into ide Resolving conflicts.Jacob Schatz2017-06-231381-8816/+17710
|\
| * Merge branch 'dm-tree-json' of gitlab.com:gitlab-org/gitlab-ce into dm-tree-jsondm-tree-jsonDmitriy Zaporozhets2017-06-222-1/+25
| |\
| * | Expose last_commit information for tree and blob when serializedDmitriy Zaporozhets2017-06-222-0/+8
| * | Merge remote-tracking branch 'origin/master' into dm-tree-jsonDmitriy Zaporozhets2017-06-222619-18883/+52984
| |\ \
| | * \ Merge branch '33853-environments-buttons' into 'master'Phil Hughes2017-06-221-2/+13
| | |\ \
| | | * | Only show gray footer space if environment actions exist33853-environments-buttonsAnnabel Dunstone Gray2017-06-211-2/+13