summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update VERSION to 10.8.0-rc4v10.8.0-rc4Mayra Cabrera2018-05-081-1/+1
* Merge branch '10-8-stable-prepare-rc4' into '10-8-stable'Mayra Cabrera2018-05-08659-9584/+23244
|\
| * Merge branch '46136-fix-dependencies' into 'master'Phil Hughes2018-05-082-0/+16
| * Merge branch 'master' into 10-8-stable-prepare-rc4Filipa Lacerda2018-05-08133-1793/+3904
| |\
| | * Merge branch 'fix-failed-jobs-tab' into 'master'Grzegorz Bizon2018-05-084-12/+60
| | |\
| | | * Respect permissions when showing Failed JobsKamil Trzciński2018-05-064-12/+60
| | * | Merge branch 'vendor-auto-devops-template-in-10-8' into 'master'Mayra Cabrera2018-05-081-23/+166
| | |\ \
| | | * | Vendor Auto-DevOps.gitlab-ci.ymlFabio Busatto2018-05-081-23/+166
| | |/ /
| | * | Merge branch '5794-we-should-failover-gracefully-when-we-can-t-connect-to-geo...Stan Hu2018-05-083-20/+81
| | |\ \
| | | * | Backport: Keep ShaAttribute from halting startup when we can’t connect to a...Brett Walker2018-05-083-20/+81
| | |/ /
| | * | Merge branch 'blackst0ne-replace-spinach-project-builds-artifacts.feature' in...Robert Speicher2018-05-078-344/+159
| | |\ \
| | | * | Replace the `project/builds/artifacts.feature` spinach test with an rspec analogblackst0ne2018-05-078-344/+159
| | |/ /
| | * | Merge branch 'dm-project-factory-import-state' into 'master'Robert Speicher2018-05-072-46/+22
| | |\ \
| | | * | Force creation of new import_state when setting an import state fieldDouwe Maan2018-05-071-18/+18
| | | * | Don't always create a new import_state record from project factoryDouwe Maan2018-05-071-28/+4
| | * | | Merge branch '43557-osw-present-merge-sha-commit' into 'master'Robert Speicher2018-05-0710-0/+83
| | |\ \ \
| | | * | | Display merge commit SHA in merge widget after mergeOswaldo Ferreira2018-05-0710-0/+83
| | * | | | Merge branch '41783-monitoring-graphs-popover-value-improvements' into 'master'Mike Greiling2018-05-0712-49/+111
| | |\ \ \ \
| | | * | | | Resolve "Monitoring graphs - Popover value improvements"Jose Ivan Vargas2018-05-0712-49/+111
| | |/ / / /
| | * | | | Merge branch '5480-epic-notifications-ce' into 'master'Douwe Maan2018-05-0719-96/+131
| | |\ \ \ \
| | | * | | | Backport 5480-epic-notifications from EEMario de la Ossa2018-05-0719-96/+131
| | * | | | | Merge branch 'upgrade-to-webpack-v4' into 'master'Clement Ho2018-05-0714-564/+1377
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch 'master' into upgrade-to-webpack-v4Mike Greiling2018-05-07417-5284/+12642
| | | |\ \ \ \ \
| | | * | | | | | resolve conflicts with masterMike Greiling2018-05-072-4/+4
| | | * | | | | | remove unused methods until neededMike Greiling2018-05-071-22/+0
| | | * | | | | | add webpack_ prefix to entrypoint paths helperMike Greiling2018-05-071-4/+4
| | | * | | | | | consolidate main bootstrap entriesMike Greiling2018-05-062-9/+9
| | | * | | | | | prettify main.jsMike Greiling2018-05-061-15/+30
| | | * | | | | | remove unused name-all-modules-pluginMike Greiling2018-05-043-6/+0
| | | * | | | | | update webpack to v4.7.0 along with a few dependenciesMike Greiling2018-05-042-60/+115
| | | * | | | | | add better description for resetServiceWorkersPublicPathMike Greiling2018-05-041-1/+4
| | | * | | | | | truncate long chunkhashes within filenamesMike Greiling2018-05-041-6/+6
| | | * | | | | | fix raven specsMike Greiling2018-05-031-1/+1
| | | * | | | | | prevent duplicate chunks from being loaded in webpack_helperMike Greiling2018-05-031-2/+9
| | | * | | | | | remove force_same_domain option from webpack helpersMike Greiling2018-05-031-8/+6
| | | * | | | | | add better filename template to worker-loaderMike Greiling2018-05-031-1/+9
| | | * | | | | | adjust IDE page loading config to ensure web workers are not loaded cross-originMike Greiling2018-05-034-19/+20
| | | * | | | | | ensure parent entrypoint is loaded if direct one is unavailableMike Greiling2018-05-011-5/+11
| | | * | | | | | update several packages to remove deprecation warningsMike Greiling2018-05-013-145/+69
| | | * | | | | | combine ancestor entrypoints into child entrypoints instead of importing bund...Mike Greiling2018-05-012-13/+26
| | | * | | | | | update webpack manifest integration to recognize multi-chunk entrypointsMike Greiling2018-05-013-11/+56
| | | * | | | | | move dev server middleware to new namespaceMike Greiling2018-05-012-3/+3
| | | * | | | | | temporarily disable deterministic chunk hash logicMike Greiling2018-05-011-44/+0
| | | * | | | | | adjust webpack configMike Greiling2018-05-012-37/+40
| | | * | | | | | update more dependenciesMike Greiling2018-05-012-70/+59
| | | * | | | | | update webpack webpack-dev-server and other webpack dependenciesMike Greiling2018-05-012-223/+1041
| | * | | | | | | Merge branch 'fix-shortcut-close-screen-with-key' into 'master'Annabel Gray2018-05-072-0/+6
| | |\ \ \ \ \ \ \
| | | * | | | | | | Fix close keyboard shortcuts dialog using the keyboard shortcutLars Greiss2018-05-072-0/+6
| | |/ / / / / / /
| | * | | | | | | Merge branch '41082-make-deploykeys-table-more-clearly-structured' into 'master'Clement Ho2018-05-0720-518/+766
| | |\ \ \ \ \ \ \
| | | * | | | | | | Make deploy keys table more clearly structuredLukas Eipert2018-05-0720-518/+766
| | |/ / / / / / /
View Lorry Controller Status