summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update VERSION to 10.8.0-rc6v10.8.0-rc610-8-stable-prepare-rc7Mayra Cabrera2018-05-091-1/+1
* Merge branch '10-8-stable-prepare-rc6' into '10-8-stable'Mayra Cabrera2018-05-093-8/+46
|\
| * Merge branch '45840-fix-cache-key-docs' into 'master'Achilleas Pipinellis2018-05-091-7/+11
| * Merge branch 'fix/gb/add-tmp-index-to-improve-stages-migration-cleanup' into ...Kamil Trzciński2018-05-091-1/+34
| * Merge branch 'fix/gb/add-missing-foreign-key-to-database-schema' into 'master'Kamil Trzciński2018-05-091-0/+1
|/
* Update VERSION to 10.8.0-rc5v10.8.0-rc5Filipa Lacerda2018-05-091-1/+1
* Merge branch '10-8-stable-prepare-rc5' into '10-8-stable'James Lopez2018-05-0937-203/+444
|\
| * Merge branch 'fix-ide-empty-editor' into 'master'Filipa Lacerda2018-05-094-3/+25
| * Merge branch 'cherry-pick-7b8d754e-ce' into 'master'Grzegorz Bizon2018-05-091-1/+1
| * Merge branch '10-8-update-gitignore' into 'master'James Lopez2018-05-0912-15/+27
| * Merge branch '10-8-dependencies-update' into 'master'James Lopez2018-05-091-162/+234
| * Merge branch '10244-group-runner-docs' into 'master'Achilleas Pipinellis2018-05-091-3/+14
| * Merge branch '45819_update_container_scanning_gitlab_ci_config_doc' into 'mas...Achilleas Pipinellis2018-05-091-1/+1
| * Merge branch 'add-runner-type-to-cluster-app' into 'master'Grzegorz Bizon2018-05-092-3/+10
| * Merge branch 'fix_plural_handling_for_migration_to_ghost_user' into 'master'Robert Speicher2018-05-092-3/+3
| * Merge branch 'fix/gb/add-pipeline-builds-foreign-key' into 'master'Kamil Trzciński2018-05-094-0/+74
| * Merge branch '5750-backport-checksum-git-commanderror-exit-status-128' into '...Stan Hu2018-05-095-6/+32
| * Merge branch 'ide-mr-icon-fixes' into 'master'Filipa Lacerda2018-05-091-2/+2
| * Merge branch '46130-ce-remote_mirrors-table-should-have-boolean-enabled-set-t...Nick Thomas2018-05-092-2/+13
| * Merge branch 'dm-ensure-import-state-persisted' into 'master'Grzegorz Bizon2018-05-091-2/+8
|/
* 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