Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'balsalmiq-support' into 'master' | Phil Hughes | 2017-05-05 | 1 | -0/+4 |
|\ | | | | | | | | | Initial balsamiq support See merge request !10564 | ||||
| * | Merge branch 'master' into 'balsalmiq-support' | Luke "Jared" Bennett | 2017-05-02 | 1 | -1/+25 |
| |\ | | | | | | | | | | | | | # Conflicts: # spec/features/projects/commit/cherry_pick_spec.rb # spec/features/projects/environments/environment_spec.rb | ||||
| * \ | Merge branch 'master' into 'balsalmiq-support' | Luke "Jared" Bennett | 2017-04-26 | 1 | -0/+40 |
| |\ \ | | | | | | | | | | | | | # Conflicts: # config/webpack.config.js | ||||
| * \ \ | Merge branch 'master' into 'balsalmiq-support' | Luke "Jared" Bennett | 2017-04-12 | 1 | -41/+1161 |
| |\ \ \ | | | | | | | | | | | | | | | | # Conflicts: # app/models/blob.rb | ||||
| * | | | | Get initial sql values back from file which is database | Jacob Schatz | 2017-04-10 | 1 | -0/+4 |
| | | | | | |||||
* | | | | | Merge branch 'add-sentry-js-again-with-vue' into 'master' | Phil Hughes | 2017-05-05 | 1 | -1/+7 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add sentry JS See merge request !6764 | ||||
| * \ \ \ \ | Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vue | Luke "Jared" Bennett | 2017-05-03 | 1 | -1/+25 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| * | | | | | Merge branch 'master' into 'add-sentry-js-again-with-vue' | Luke "Jared" Bennett | 2017-04-26 | 1 | -0/+40 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | # Conflicts: # config/webpack.config.js | ||||
| * | | | | | Removed rewire and fixed tests | Luke "Jared" Bennett | 2017-04-15 | 1 | -4/+0 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into 'add-sentry-js-again-with-vue' | Luke "Jared" Bennett | 2017-04-15 | 1 | -75/+1268 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | # Conflicts: # app/views/layouts/_head.html.haml # config/webpack.config.js | ||||
| * | | | | | Updated specs, added rewire, updated layouts to move conditional raven and ↵ | Luke "Jared" Bennett | 2017-04-15 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | gon to head | ||||
| * | | | | | [ci skip] Remove loadscript class in favour of backend conditional | Luke "Jared" Bennett | 2017-04-13 | 1 | -1/+7 |
| | | | | | | |||||
* | | | | | | Merge branch 'master' into 28433-internationalise-cycle-analytics-page | Ruben Davila | 2017-05-02 | 1 | -1/+65 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Move PDFLab into GitLabpdflab-in-repo | Sam Rose | 2017-04-28 | 1 | -1/+25 |
| | |_|/ / | |/| | | | |||||
| * | | | | Merge branch 'notebooklab-in-repo' into 'master' | Jacob Schatz | 2017-04-24 | 1 | -0/+36 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Moved NotebookLab assets into repo See merge request !10630 | ||||
| | * | | | | Moved NotebookLab assets into repo | Phil Hughes | 2017-04-11 | 1 | -0/+36 |
| | | |/ / | | |/| | | | | | | | | | | | | Moved all the notebooklab assets into the GitLab repo | ||||
| * | | | | Add ES lint support to identify poorly written Promises | Kushal Pandya | 2017-04-20 | 1 | -0/+4 |
| |/ / / | |||||
* | | | | Started internationalising cycyle analytics | Phil Hughes | 2017-04-15 | 1 | -4/+15 |
|/ / / | |||||
* | | | use nodemon to watch for changes to webpack config and restart the dev ↵ | Mike Greiling | 2017-04-10 | 1 | -11/+310 |
| | | | | | | | | | | | | server when necessary | ||||
* | | | watch node_modules for changes when a module is missing | Mike Greiling | 2017-04-10 | 1 | -11/+57 |
| | | | |||||
* | | | add eslint support to vue files | Mike Greiling | 2017-04-09 | 1 | -0/+49 |
| | | | |||||
* | | | update Vue to match vue-template-compiler | Mike Greiling | 2017-04-09 | 1 | -3/+3 |
| | | | |||||
* | | | add vue-loader dependencies and basic config | Mike Greiling | 2017-04-09 | 1 | -17/+743 |
| |/ |/| | |||||
* | | upgrade webpack-dev-server to fix issues with SockJS causing odd reload ↵ | Mike Greiling | 2017-04-07 | 1 | -35/+26 |
| | | | | | | | | | | | | behavior in firefox https://github.com/webpack/webpack-dev-server/issues/762 | ||||
* | | upgrade webpack to v2.3.3 to resolve sourcemap issues | Mike Greiling | 2017-04-07 | 1 | -24/+44 |
| | | |||||
* | | Revert yarn.lock file changes | Phil Hughes | 2017-04-07 | 1 | -564/+457 |
| | | |||||
* | | Update droplab | Luke "Jared" Bennett | 2017-04-07 | 1 | -462/+569 |
| | | |||||
* | | STL file viewer | Phil Hughes | 2017-04-06 | 1 | -0/+12 |
| | | |||||
* | | Use PDFLab to render PDFs in GitLab | Sam Rose | 2017-04-05 | 1 | -0/+14 |
| | | |||||
* | | Load a preview of Sketch 43 filessketch-preview-files | Jacob Schatz | 2017-04-05 | 1 | -1/+37 |
|/ | | | | | | | Sketch 43 files are technically a zip file, so the JavaScript opens the zip file & locates a preview.png which is just a quick preview of the last sketch page edited. After that is loaded it simply places the image into the DOM | ||||
* | Adds visbilityjs lib | Filipa Lacerda | 2017-03-23 | 1 | -0/+4 |
| | |||||
* | upgrade Vue to v2.2.4 | Mike Greiling | 2017-03-21 | 1 | -3/+3 |
| | |||||
* | Only add frontend code coverage instrumentation when generating coverage report | Mike Greiling | 2017-03-20 | 1 | -17/+53 |
| | |||||
* | Organize our polyfills and standardize on core-js | Mike Greiling | 2017-03-13 | 1 | -10/+2 |
| | |||||
* | Use native unicode emojis | Eric Eastwood | 2017-03-06 | 1 | -0/+16 |
| | | | | | | | | | | | | | | | | | | | | - gl_emoji for falling back to image/css-sprite when the browser doesn't support an emoji - Markdown rendering (Banzai filter) - Autocomplete - Award emoji menu - Perceived perf - Immediate response because we now build client-side - Update `digests.json` generation in gemojione rake task to be more useful and include `unicodeVersion` MR: !9437 See issues - #26371 - #27250 - #22474 | ||||
* | merge raphael library into the network bundle | Mike Greiling | 2017-03-05 | 1 | -0/+10 |
| | |||||
* | Merge branch 'add-svg-loader' into 'master' | Fatih Acet | 2017-03-02 | 1 | -0/+4 |
|\ | | | | | | | | | | | | | Fixes Tech debt: No need to pass svgs as props into Vue with Webpack Closes #27692 and #27840 See merge request !9522 | ||||
| * | Merge branch 'master' into 'add-svg-loader' | Filipa Lacerda | 2017-02-27 | 1 | -3/+3 |
| |\ | | | | | | | | | | # Conflicts: # app/assets/javascripts/vue_pipelines_index/pipeline_actions.js.es6 | ||||
| * | | Adds loader to load SVG | Filipa Lacerda | 2017-02-24 | 1 | -2/+6 |
| | | | |||||
* | | | update yarn.lock after the removal of jquery-ui in !9649update-yarn-lock | Mike Greiling | 2017-03-02 | 1 | -6/+2 |
| |/ |/| | |||||
* | | Merge branch 'update-vue-2.1' into 'master' | Fatih Acet | 2017-02-26 | 1 | -3/+3 |
|\ \ | |/ |/| | | | | | Update Vue to v2.1 See merge request !9386 | ||||
| * | upgrade Vue from v2.0.3 to v2.1.10 | Mike Greiling | 2017-02-20 | 1 | -6/+6 |
| | | |||||
* | | add webpack bundle analyzer to production output | Mike Greiling | 2017-02-21 | 1 | -5/+46 |
|/ | |||||
* | remove imports loader | Mike Greiling | 2017-02-17 | 1 | -7/+0 |
| | |||||
* | use less strict caret ranges now that yarn.lock will take care of locking ↵ | Mike Greiling | 2017-02-17 | 1 | -9/+9 |
| | | | | | | our dependencies in place see: https://docs.npmjs.com/misc/semver | ||||
* | update yarn resolution for jquery-ui | Mike Greiling | 2017-02-17 | 1 | -1/+1 |
| | |||||
* | Update lock file28339-npm-jqueryui-ssh | Filipa Lacerda | 2017-02-17 | 1 | -1/+1 |
| | |||||
* | Make Karma output look nicer for CI (!9165) | winniehell | 2017-02-15 | 1 | -93/+100 |
| | |||||
* | Fix yarn lock and package.json mismatch caused by MR 9133 | Clement Ho | 2017-02-14 | 1 | -101/+238 |
| | |||||
* | sync yarn.lock with recent changes to package.jsonfix-yarn-lock-file | Mike Greiling | 2017-02-14 | 1 | -3/+129 |
| |