Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into 'bootstrap4' | Clement Ho | 2018-05-10 | 1 | -26/+5 |
|\ | | | | | | | # Conflicts: # app/views/shared/runners/_form.html.haml | ||||
| * | refactor "deploy_keys" to use axios | Paul Slaughter | 2018-05-09 | 1 | -3/+3 |
| | | |||||
| * | bump upath dependency to a version compatible with node 10 | Mike Greiling | 2018-05-09 | 1 | -23/+2 |
| | | |||||
* | | Merge branch 'master' into bootstrap4 | Clement Ho | 2018-05-08 | 1 | -720/+1298 |
|\ \ | |/ | |||||
| * | Backport of EE added dependency | Filipa Lacerda | 2018-05-08 | 1 | -0/+15 |
| | | |||||
| * | Merge branch 'upgrade-to-webpack-v4' into 'master' | Clement Ho | 2018-05-07 | 1 | -376/+1158 |
| |\ | | | | | | | | | | | | | | | | | | | Upgrade to Webpack 4 Closes #43400 See merge request gitlab-org/gitlab-ce!17218 | ||||
| | * | resolve conflicts with master | Mike Greiling | 2018-05-07 | 1 | -3/+3 |
| | | | |||||
| | * | remove unused name-all-modules-plugin | Mike Greiling | 2018-05-04 | 1 | -4/+0 |
| | | | |||||
| | * | update webpack to v4.7.0 along with a few dependencies | Mike Greiling | 2018-05-04 | 1 | -55/+110 |
| | | | |||||
| | * | update several packages to remove deprecation warnings | Mike Greiling | 2018-05-01 | 1 | -121/+46 |
| | | | |||||
| | * | update more dependencies | Mike Greiling | 2018-05-01 | 1 | -62/+51 |
| | | | |||||
| | * | update webpack webpack-dev-server and other webpack dependencies | Mike Greiling | 2018-05-01 | 1 | -215/+1032 |
| | | | |||||
| * | | Resolve "Inform users of up to $500 offer for GCP account" | Dennis Tang | 2018-05-07 | 1 | -3/+3 |
| | | | |||||
| * | | Upgrade underscore.js | Tim Zallmann | 2018-05-07 | 1 | -3/+3 |
| |/ | |||||
| * | Fix memory and performance issues in Karma test suite | Mike Greiling | 2018-05-01 | 1 | -388/+169 |
| | | |||||
* | | Merge branch 'master' into bootstrap4 | Clement Ho | 2018-04-26 | 1 | -47/+185 |
|\ \ | |/ | |||||
| * | Upgrading Vue libraries | Tim Zallmann | 2018-04-26 | 1 | -47/+185 |
| | | |||||
* | | Merge branch 'master' into bootstrap4 | Clement Ho | 2018-04-25 | 1 | -0/+8 |
|\ \ | |/ | |||||
| * | Merge branch '30998-add-babel-rewire-plugin' into 'master' | Clement Ho | 2018-04-24 | 1 | -0/+4 |
| |\ | | | | | | | | | | | | | | | | | | | Resolve "Add some way to mock and spy on default ES modules" Closes #30998 See merge request gitlab-org/gitlab-ce!18116 | ||||
| | * | add babel-plugin-rewire to karma build | Mike Greiling | 2018-04-23 | 1 | -0/+4 |
| | | | |||||
| * | | Merge branch 'master' into ide-file-finder | Phil Hughes | 2018-04-23 | 1 | -252/+37 |
| |\ \ | | |/ | |||||
| * | | Added fuzzy file finder to web IDE | Phil Hughes | 2018-04-16 | 1 | -0/+4 |
| | | | | | | | | | | | | Closes #44841 | ||||
* | | | Merge branch 'master' into bootstrap4 | Clement Ho | 2018-04-23 | 1 | -252/+37 |
|\ \ \ | | |/ | |/| | |||||
| * | | Dedupe yarn dependencies | Lukas Eipert | 2018-04-20 | 1 | -252/+37 |
| |/ | |||||
* | | Upgrade to bootstrap 4.1 and added popper.js | Clement Ho | 2018-04-17 | 1 | -3/+7 |
| | | |||||
* | | Merge branch 'master' into 'bootstrap4' | Clement Ho | 2018-04-16 | 1 | -3/+3 |
|\ \ | |/ | | | | | # Conflicts: # app/views/admin/application_settings/_signin.html.haml | ||||
| * | Update gitlab-svgs to 1.18.0 | Clement Ho | 2018-04-13 | 1 | -3/+3 |
| | | |||||
* | | Merge branch 'master' into bootstrap4 | Clement Ho | 2018-04-12 | 1 | -3/+3 |
|\ \ | |/ | |||||
| * | use commander for safer cli argument parsing | Lukas Eipert | 2018-04-11 | 1 | -3/+3 |
| | | |||||
* | | Merge branch 'master' into 'bootstrap4' | Clement Ho | 2018-04-09 | 1 | -3/+3 |
|\ \ | |/ | | | | | | | | | # Conflicts: # app/helpers/issuables_helper.rb # app/views/projects/_home_panel.html.haml # app/views/projects/commits/_commit.html.haml | ||||
| * | Update GitLab SVGs version | Phil Hughes | 2018-04-09 | 1 | -3/+3 |
| | | |||||
* | | Upgrade to Bootstrap 4 | Clement Ho | 2018-04-06 | 1 | -0/+4 |
|/ | |||||
* | Revert "Merge branch 'sh-add-fsevents-dev-dependency' into 'master'" | Stan Hu | 2018-03-30 | 1 | -1/+1 |
| | | | This reverts merge request !17971 | ||||
* | Merge branch 'sh-add-fsevents-dev-dependency' into 'master' | Mike Greiling | 2018-03-27 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | Add fsevents as an optional dependency to avoid Webpack killing the CPU Closes #33886 See merge request gitlab-org/gitlab-ce!17971 | ||||
| * | Install fsevents as an optional dependency in package.jsonsh-add-fsevents-dev-dependency | Stan Hu | 2018-03-25 | 1 | -1/+1 |
| | | |||||
| * | Revert "Add fsevents as a dev dependency to avoid Webpack killing the CPU" | Stan Hu | 2018-03-25 | 1 | -1/+1 |
| | | | | | | | | This reverts commit ec2aa7063496a3a5ead3ab93e5b8d65ba5fad2be. | ||||
| * | Add fsevents as a dev dependency to avoid Webpack killing the CPU | Stan Hu | 2018-03-23 | 1 | -1/+1 |
| | | | | | | | | Closes #33886 | ||||
* | | Make use of the prettier ignore file during our save script | Lukas Eipert | 2018-03-26 | 1 | -1/+1 |
|/ | |||||
* | Updates svg dependency | Filipa Lacerda | 2018-03-19 | 1 | -3/+3 |
| | |||||
* | Prettier Phase 1: Prettier Configuration, Prettifying of files and documentation | Tim Zallmann | 2018-03-14 | 1 | -3/+3 |
| | |||||
* | Update dependency for svgs | Filipa Lacerda | 2018-03-12 | 1 | -3/+3 |
| | |||||
* | Updates svg dependencyfl-updat-svg-dependency | Filipa Lacerda | 2018-03-08 | 1 | -3/+3 |
| | |||||
* | Prevent webpack from rebooting while switching branches | Mike Greiling | 2018-02-27 | 1 | -3/+3 |
| | |||||
* | Merge branch 'upgrade-frontend-build-dependencies' into 'master' | Tim Zallmann | 2018-02-21 | 1 | -899/+1930 |
|\ | | | | | | | | | | | | | Upgrade frontend build dependencies Closes #41400 See merge request gitlab-org/gitlab-ce!17246 | ||||
| * | update karma dependencies | Mike Greiling | 2018-02-20 | 1 | -473/+379 |
| | | |||||
| * | upgrade several webpack loaders | Mike Greiling | 2018-02-20 | 1 | -147/+309 |
| | | |||||
| * | update nodemon | Mike Greiling | 2018-02-20 | 1 | -190/+198 |
| | | |||||
| * | upgrade various webpack plugins | Mike Greiling | 2018-02-20 | 1 | -169/+321 |
| | | |||||
| * | upgrade webpack and webpack-dev-server | Mike Greiling | 2018-02-20 | 1 | -51/+854 |
| | | |||||
* | | Update to jQuery 3. | Jacob Schatz | 2018-02-20 | 1 | -3/+3 |
|/ |