summaryrefslogtreecommitdiff
path: root/package.json
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into ideMike Greiling2017-08-071-7/+7
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (86 commits) Show all labels 33874 confidential issue redesign Exclude merge_jid on Import/Export attribute configuration Resolve "User dropdown in filtered search does not load avatar on `master`" Re-add column locked_at on migration rollback Group-level new issue & MR using previously selected project [EE Backport] Update log audit event in omniauth_callbacks_controller.rb more eagerly bail when the state is prevented Move locked_at removal to post-deployment migration Add class to other sidebars Improve mobile sidebar reduce iterations by keeping a count of remaining enablers Store & use ConvDev percentages returned by Version app Store MergeWorker JID on merge request, and clean up stuck merges Backport changes in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2551 to CE DRY up caching in AbstractReferenceFilter Update CHANGELOG Add CHANGELOG entry Fix html structure Removes test for removed behavior Port form back to use form_tag ...
| * upgrade webpack to v3.4.0Mike Greiling2017-08-071-1/+1
| |
| * upgrade webpack to v3.1.0Mike Greiling2017-08-071-1/+1
| |
| * update webpack-dev-server to v2.6.1Mike Greiling2017-08-071-1/+1
| | | | | | | | [ci skip]
| * update karma-webpack to v2.0.4Mike Greiling2017-08-071-1/+1
| |
| * update eslint-import-resolver-webpack to v0.8.3Mike Greiling2017-08-071-1/+1
| |
| * update babel-loader to v7.1.xMike Greiling2017-08-071-1/+1
| |
| * upgrade webpack to v3.0.0Mike Greiling2017-08-071-1/+1
| |
| * replace stats-webpack-plugin with webpack-stats-pluginMike Greiling2017-08-071-2/+2
| |
* | Merge branch 'master' into ideMike Greiling2017-08-071-1/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (177 commits) Add changelog Bump gitlab-shell version to 5.8.0 to fix Git for Windows 2.14 Make contextual sidebar collapsible Fixed sidebar context header hover colors Use correct `Environment`-class within `Gitlab` namespace Remove gl.Activities from Commits page Move `let` calls inside the `describe` block using them Add `/assign me` alias support for assigning issuables to oneself GRPC::Unavailable (< GRPC::BadStatus) is wrapped in a CommandError Use `broken_storage` in the fs_shards_spec. Eager load project creators for project dashboards Memoize a user's personal projects count Remove redundant query from User#recent_push Improve checking if projects would be returned Change spelling of gitlab-shell Remove unused #tree-holder Add custom linter for inline JavaScript to haml_lint Rename user_can_admin? because it's more accurate Synchronous zanata community contribution translation Add Korean translation to i18n ...
| * Fix issues with pdf-js dependenciesMike Greiling2017-08-071-1/+0
| |
* | Merge branch 'master' into ideDouwe Maan2017-08-031-0/+1
|\ \ | |/
| * include cropper jQuery plugin as an npm moduleuse-npm-cropperMike Greiling2017-08-011-0/+1
| |
* | Merge remote-tracking branch 'origin/master' into ideLuke "Jared" Bennett2017-07-201-1/+2
|\ \ | |/
| * Update vue-resourceFilipa Lacerda2017-07-121-1/+1
| |
| * ensure eslint recognizes es2015 dynamic import() syntaxMike Greiling2017-06-281-0/+1
| |
* | Remove es6-map and es6-set infavour of existing core-jsLuke "Jared" Bennett2017-07-181-2/+0
| |
* | Add es6-set polyfill for test_utils.jsLuke "Jared" Bennett2017-07-181-0/+1
| |
* | Add Map polyfill for rspec tests using phantomjsLuke "Jared" Bennett2017-07-181-0/+1
| |
* | move copy-webpack-plugin to production dependenciesMike Greiling2017-07-181-1/+0
| |
* | fix global context and relative_url_root for monaco editorMike Greiling2017-07-181-0/+2
| |
* | Remove multiple methods of including monaco related code and remove static ↵Luke "Jared" Bennett2017-07-181-0/+1
| | | | | | | | monaco assets from public
* | Merge branch 'dm-tree-json' into ide Resolving conflicts.Jacob Schatz2017-06-231-3/+3
|\ \ | |/
| * upgrade jasmine to attempt to resolve browser timeout issuesMike Greiling2017-06-141-1/+1
| |
| * upgrade karma to v1.7.0Mike Greiling2017-06-141-1/+1
| |
| * remove phantomjs from our frontend dev dependenciesMike Greiling2017-06-141-1/+0
| |
| * replace PhantomJS with headless Chrome as karma test runnerMike Greiling2017-06-141-0/+1
| |
* | Adds axios and initial call.Jacob Schatz2017-06-171-0/+1
| |
* | Add monaco editor.Jacob Schatz2017-06-151-0/+1
|/
* Revert "Merge branch 'karma-headless-chrome' into 'master'"Mike Greiling2017-06-131-1/+1
| | | This reverts merge request !12036
* remove phantomjs from our frontend dev dependenciesMike Greiling2017-06-131-1/+0
|
* replace PhantomJS with headless Chrome as karma test runnerMike Greiling2017-06-131-0/+1
|
* Merge branch 'task-list-2' into 'master'Filipa Lacerda2017-05-311-0/+1
|\ | | | | | | | | | | | | Update task_list to version 2.0.0 Closes #22470 See merge request !11525
| * Upgrade to task_list v2Jared Deckard2017-05-231-0/+1
| |
* | update webpack to v2.6.1 patch release to fix "Can't find variable: Promise" ↵32737-audit-long-term-cacheability-of-webpack-assetsMike Greiling2017-05-251-1/+1
| | | | | | | | error
* | update webpack-bundle-analyzer past v2.4.1 to support NamedChunksPluginMike Greiling2017-05-251-1/+1
| |
* | add NameAllModulesPlugin to cover shortcomings of NamedModulesPluginMike Greiling2017-05-251-0/+1
| |
* | upgrade to latest webpack versionMike Greiling2017-05-251-1/+1
|/
* Merge branch 'balsalmiq-support' into 'master' Phil Hughes2017-05-051-0/+1
|\ | | | | | | | | Initial balsamiq support See merge request !10564
| * Merge branch 'master' into 'balsalmiq-support'Luke "Jared" Bennett2017-05-021-0/+2
| |\ | | | | | | | | | | | | # Conflicts: # spec/features/projects/commit/cherry_pick_spec.rb # spec/features/projects/environments/environment_spec.rb
| * \ Merge branch 'master' into 'balsalmiq-support'Luke "Jared" Bennett2017-04-261-0/+3
| |\ \ | | | | | | | | | | | | # Conflicts: # config/webpack.config.js
| * \ \ Merge branch 'master' into 'balsalmiq-support'Luke "Jared" Bennett2017-04-121-5/+11
| |\ \ \ | | | | | | | | | | | | | | | # Conflicts: # app/models/blob.rb
| * | | | Get initial sql values back from file which is databaseJacob Schatz2017-04-101-0/+1
| | | | |
* | | | | Merge branch 'add-sentry-js-again-with-vue' into 'master' Phil Hughes2017-05-051-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add sentry JS See merge request !6764
| * \ \ \ \ Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vueLuke "Jared" Bennett2017-05-031-0/+2
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'master' into 'add-sentry-js-again-with-vue'Luke "Jared" Bennett2017-04-261-0/+3
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | # Conflicts: # config/webpack.config.js
| * | | | | Removed rewire and fixed testsLuke "Jared" Bennett2017-04-151-1/+0
| | | | | |
| * | | | | Merge branch 'master' into 'add-sentry-js-again-with-vue'Luke "Jared" Bennett2017-04-151-7/+19
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | # Conflicts: # app/views/layouts/_head.html.haml # config/webpack.config.js
| * | | | | Updated specs, added rewire, updated layouts to move conditional raven and ↵Luke "Jared" Bennett2017-04-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | gon to head
| * | | | | [ci skip] Remove loadscript class in favour of backend conditionalLuke "Jared" Bennett2017-04-131-0/+1
| | | | | |