Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'protected-tags-bundle-refactor' into 'master' | Clement Ho | 2018-03-01 | 1 | -1/+0 |
|\ | | | | | | | | | Removed protected_tags webpack bundle See merge request gitlab-org/gitlab-ce!17334 | ||||
| * | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵protected-tags-bundle-refactor | Constance Okoghenun | 2018-02-27 | 1 | -38/+50 |
| |\ | | | | | | | | | | protected-tags-bundle-refactor | ||||
| * \ | Resolved conflicts in ↵ | Constance Okoghenun | 2018-02-26 | 2 | -4/+3 |
| |\ \ | | | | | | | | | | | | | app/assets/javascripts/pages/projects/settings/repository/show/index.js | ||||
| * | | | Removed protected_tags webpack bundle | Constance Okoghenun | 2018-02-23 | 1 | -1/+0 |
| | | | | |||||
* | | | | Merge branch 'pipelines_show_refactor' into 'master' | Jacob Schatz | 2018-02-28 | 1 | -1/+0 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Refactor pipelines show for webpack bundle tag removal See merge request gitlab-org/gitlab-ce!17127 | ||||
| * \ \ \ | Merge branch 'master' into 'pipelines_show_refactor'pipelines_show_refactor | Clement Ho | 2018-02-28 | 4 | -42/+40 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | # Conflicts: # config/webpack.config.js | ||||
| * \ \ \ \ | Merge branch 'master' into 'pipelines_show_refactor' | Clement Ho | 2018-02-27 | 1 | -1/+0 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # config/webpack.config.js | ||||
| * \ \ \ \ \ | Merge branch 'master' into 'pipelines_show_refactor' | Clement Ho | 2018-02-27 | 2 | -41/+53 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | # Conflicts: # config/webpack.config.js | ||||
| * | | | | | | Fix conflicts | Jacob Schatz | 2018-02-23 | 1 | -1/+0 |
| | | | | | | | |||||
* | | | | | | | Remove webpack bundle tag for enviroments | Constance Okoghenun | 2018-02-28 | 1 | -1/+0 |
| |_|_|/ / / |/| | | | | | |||||
* | | | | | | Merge branch 'master' into 'dispatcher-cleanup' | Jacob Schatz | 2018-02-28 | 4 | -4/+36 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # config/webpack.config.js | ||||
| * | | | | | | Remove cycle analytics bundle webpack entry point | Clement Ho | 2018-02-28 | 1 | -3/+0 |
| | | | | | | | |||||
| * | | | | | | Fix for open-ended parameter's in lograge causing elastic memory issues | Andrew Newdigate | 2018-02-28 | 1 | -1/+6 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'feature/edit_pages_domain' into 'master' | Nick Thomas | 2018-02-28 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PagesDomain: allow update of key/certificate Closes #29720 See merge request gitlab-org/gitlab-ce!17376 | ||||
| | * | | | | | | PagesDomain: Add edit/update functionality | Rob Watson | 2018-02-28 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Specify base controller for Doorkeeperbvl-fix-qa-doorkeeper | Bob Van Landuyt | 2018-02-28 | 1 | -0/+2 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will make sure the `ApplicantionController#can?` method is available for views rendering menus based on the current user's abilities. | ||||
* | | | | | | | prefer let and const in webpack config | Mike Greiling | 2018-02-28 | 1 | -27/+27 |
| | | | | | | | |||||
* | | | | | | | remove common_vue from CommonsChunkPlugin | Mike Greiling | 2018-02-28 | 1 | -28/+0 |
| | | | | | | | |||||
* | | | | | | | remove unused ui_development_kit webpack bundle | Mike Greiling | 2018-02-28 | 1 | -1/+0 |
| | | | | | | | |||||
* | | | | | | | remove unused filtered_search webpack bundle | Mike Greiling | 2018-02-28 | 1 | -1/+0 |
| | | | | | | | |||||
* | | | | | | | remove unused project_import_gl webpack bundle | Mike Greiling | 2018-02-28 | 1 | -1/+0 |
| | | | | | | | |||||
* | | | | | | | remove unused help webpack bundle | Mike Greiling | 2018-02-28 | 1 | -1/+0 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'remove-merge-conflicts-bundle' into 'master' | Jacob Schatz | 2018-02-28 | 1 | -4/+0 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove merge_conflicts bundle See merge request gitlab-org/gitlab-ce!17408 | ||||
| * | | | | | | remove duplicate common and common_vue definitionsremove-merge-conflicts-bundle | Mike Greiling | 2018-02-27 | 1 | -2/+0 |
| | | | | | | | |||||
| * | | | | | | remove merge_conflicts bundle in favor of pages directory entry point | Mike Greiling | 2018-02-27 | 1 | -2/+0 |
| | | | | | | | |||||
* | | | | | | | Render MR Notes with Vue with behind a cookie | Fatih Acet | 2018-02-28 | 2 | -0/+3 |
|/ / / / / / | |||||
* | | | | | | Merge branch '43669-fix-webpack-trailing-comma' into 'master' | Mike Greiling | 2018-02-27 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix webpack.config.js syntax error from trailing comma Closes #43669 See merge request gitlab-org/gitlab-ce!17404 | ||||
| * | | | | | | Remove trailing comma in webpack config to support Node@<8 | Eric Eastwood | 2018-02-27 | 1 | -1/+1 |
| | |/ / / / | |/| | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/43669 | ||||
* | | | | | | Remove snippet bundle webpack entry point | Clement Ho | 2018-02-27 | 1 | -1/+0 |
| |_|/ / / |/| | | | | |||||
* | | | | | Resolved conflicts in dispatcher.jsprofile-bundle-tag-refactor | Constance Okoghenun | 2018-02-27 | 1 | -38/+50 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch 'remove-sidebar-bundle' into 'master' | Jacob Schatz | 2018-02-27 | 1 | -1/+0 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Remove sidebar bundle webpack entry point See merge request gitlab-org/gitlab-ce!17343 | ||||
| | * \ \ \ | Merge branch 'master' into remove-sidebar-bundleremove-sidebar-bundle | Clement Ho | 2018-02-23 | 1 | -1/+2 |
| | |\ \ \ \ | |||||
| | * | | | | | Remove sidebar bundle webpack entry point | Clement Ho | 2018-02-23 | 1 | -1/+0 |
| | | |/ / / | | |/| | | | |||||
| * | | | | | Prevent webpack from rebooting while switching branches | Mike Greiling | 2018-02-27 | 1 | -25/+52 |
| | | | | | | |||||
| * | | | | | Merge branch 'refactor-commit-show' into 'master' | Phil Hughes | 2018-02-27 | 1 | -2/+0 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove diff notes webpack entry point See merge request gitlab-org/gitlab-ce!17382 | ||||
| | * \ \ \ \ | Merge branch 'master' into 'refactor-commit-show'refactor-commit-show | Phil Hughes | 2018-02-27 | 1 | -4/+0 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # config/webpack.config.js | ||||
| | * \ \ \ \ \ | Merge branch 'master' into refactor-commit-show | Clement Ho | 2018-02-26 | 1 | -8/+3 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Remove diff notes webpack entry point | Clement Ho | 2018-02-26 | 1 | -2/+0 |
| | | |_|_|_|_|/ | | |/| | | | | | |||||
| * | | | | | | | Merge branch 'master' into 'ph-webpack-bundle-tags'ph-webpack-bundle-tags | Phil Hughes | 2018-02-27 | 1 | -13/+3 |
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/pages/projects/merge_requests/show/index.js | ||||
| | * | | | | | | Merge branch 'refactor-pipelines-list' into 'master' | Phil Hughes | 2018-02-27 | 1 | -2/+0 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove commit_pipelines webpack entry point See merge request gitlab-org/gitlab-ce!17379 | ||||
| | | * \ \ \ \ \ | Merge branch 'master' into refactor-pipelines-listrefactor-pipelines-list | Clement Ho | 2018-02-26 | 1 | -8/+3 |
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | | | |||||
| | | * | | | | | | Remove commit_pipelines webpack entry point | Clement Ho | 2018-02-26 | 1 | -2/+0 |
| | | | |/ / / / | | | |/| | | | | |||||
| | * | | | | | | Merge branch 'master' into refactor-environments-folderrefactor-environments-folder | Clement Ho | 2018-02-26 | 1 | -8/+3 |
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | |||||
| | | * | | | | | Refactor wildcard dispatcher imports | Clement Ho | 2018-02-26 | 1 | -8/+2 |
| | | | | | | | | |||||
| | | * | | | | | Move EE-specific JavaScript files to ee/app/assets/javascripts | Rémy Coutable | 2018-02-26 | 1 | -0/+1 |
| | | |/ / / / | |||||
| | * | | | | | Remove environments folder webpack entry point | Clement Ho | 2018-02-26 | 1 | -2/+0 |
| | |/ / / / | |||||
| * | | | | | Converted webpack_bundle_tag to be automatic webpack bundles | Phil Hughes | 2018-02-26 | 1 | -3/+0 |
| | | | | | | |||||
* | | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵ | Constance Okoghenun | 2018-02-26 | 6 | -14/+28 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | profile-bundle-tag-refactor | ||||
| * | | | | | Remove webpack bundle tags for blob | Jacob Schatz | 2018-02-26 | 1 | -1/+0 |
| |/ / / / | |||||
| * | | | | Restart Unicorn and Sidekiq when GRPC throws 14:Endpoint read failed | Jacob Vosmaer (GitLab) | 2018-02-26 | 1 | -1/+1 |
| | |/ / | |/| | |