summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bvl-fix-sign-out-on-terms' into 'master'Nick Thomas2018-05-141-2/+7
* Merge branch 'bvl-terms-redirect-loop' into 'master'Douwe Maan2018-05-111-0/+4
* Merge branch '10-8-stable-prepare-rc8-fix-conflict-for-18874' into '10-8-stab...James Lopez2018-05-111-1/+7
|\
| * Merge branch 'correct-runner-type-when-assigning-shared-to-project' into 'mas...Kamil Trzciński2018-05-111-1/+7
* | Merge branch 'ide-mr-open-file-fix' into 'master'Filipa Lacerda2018-05-112-1/+2
|/
* Merge branch '46210-terms-acceptance-dropdown-menu' into 'master'Tim Zallmann2018-05-112-4/+9
* Merge branch 'bw-fix-sha-attribute' into 'master'Stan Hu2018-05-101-1/+2
* Merge branch 'jr-46209-web-ide-copy' into 'master'Tim Zallmann2018-05-101-2/+2
* Merge branch '46147-remove-model-redefinition-worker' into 'master'Douwe Maan2018-05-101-79/+0
* Merge branch 'fix-ide-empty-editor' into 'master'Filipa Lacerda2018-05-092-3/+5
* Merge branch 'add-runner-type-to-cluster-app' into 'master'Grzegorz Bizon2018-05-091-1/+9
* Merge branch 'fix_plural_handling_for_migration_to_ghost_user' into 'master'Robert Speicher2018-05-091-2/+2
* Merge branch 'ide-mr-icon-fixes' into 'master'Filipa Lacerda2018-05-091-2/+2
* Merge branch 'dm-ensure-import-state-persisted' into 'master'Grzegorz Bizon2018-05-091-2/+8
* Merge branch 'fix-failed-jobs-tab' into 'master'Grzegorz Bizon2018-05-083-7/+16
|\
| * Respect permissions when showing Failed JobsKamil Trzciński2018-05-063-7/+16
* | Backport: Keep ShaAttribute from halting startup when we can’t connect to a...Brett Walker2018-05-081-7/+22
* | Merge branch 'dm-project-factory-import-state' into 'master'Robert Speicher2018-05-071-18/+18
|\ \
| * | Force creation of new import_state when setting an import state fieldDouwe Maan2018-05-071-18/+18
* | | Merge branch '43557-osw-present-merge-sha-commit' into 'master'Robert Speicher2018-05-074-0/+27
|\ \ \
| * | | Display merge commit SHA in merge widget after mergeOswaldo Ferreira2018-05-074-0/+27
* | | | Resolve "Monitoring graphs - Popover value improvements"Jose Ivan Vargas2018-05-078-30/+92
* | | | Merge branch '5480-epic-notifications-ce' into 'master'Douwe Maan2018-05-077-26/+57
|\ \ \ \
| * | | | Backport 5480-epic-notifications from EEMario de la Ossa2018-05-077-26/+57
| | |/ / | |/| |
* | | | Merge branch 'upgrade-to-webpack-v4' into 'master'Clement Ho2018-05-076-54/+85
|\ \ \ \
| * \ \ \ Merge branch 'master' into upgrade-to-webpack-v4Mike Greiling2018-05-07181-3704/+7795
| |\ \ \ \
| * | | | | add webpack_ prefix to entrypoint paths helperMike Greiling2018-05-071-4/+4
| * | | | | consolidate main bootstrap entriesMike Greiling2018-05-061-8/+8
| * | | | | prettify main.jsMike Greiling2018-05-061-15/+30
| * | | | | add better description for resetServiceWorkersPublicPathMike Greiling2018-05-041-1/+4
| * | | | | 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
| * | | | | adjust IDE page loading config to ensure web workers are not loaded cross-originMike Greiling2018-05-033-9/+18
| * | | | | ensure parent entrypoint is loaded if direct one is unavailableMike Greiling2018-05-011-5/+11
| * | | | | combine ancestor entrypoints into child entrypoints instead of importing bund...Mike Greiling2018-05-011-11/+8
| * | | | | update webpack manifest integration to recognize multi-chunk entrypointsMike Greiling2018-05-012-11/+7
* | | | | | Fix close keyboard shortcuts dialog using the keyboard shortcutLars Greiss2018-05-071-0/+1
* | | | | | Make deploy keys table more clearly structuredLukas Eipert2018-05-0711-361/+557
* | | | | | Resolve "Inform users of up to $500 offer for GCP account"Dennis Tang2018-05-0713-21/+136
* | | | | | Merge branch '36983-osw-heading-labels-color-fix' into 'master'Filipa Lacerda2018-05-071-1/+2
|\ \ \ \ \ \
| * | | | | | Adjust issue boards list header label text colorOswaldo Ferreira2018-05-071-1/+2
| | |_|_|/ / | |/| | | |
* | | | | | Resolve "Clean up bottom status bar Web IDE"André Luís2018-05-079-70/+183
* | | | | | Improved commit message body renderingConstance Okoghenun2018-05-075-25/+16
* | | | | | Merge branch 'ccr/weight_1481' into 'master'Douwe Maan2018-05-072-2/+5
|\ \ \ \ \ \
| * | | | | | Backport of 1481-changing-weight-values-should-trigger-system-notesChantal Rollison2018-05-032-2/+5
* | | | | | | Merge branch 'add-git-commit-message-predefined-variable' into 'master'Grzegorz Bizon2018-05-071-4/+27
|\ \ \ \ \ \ \
| * | | | | | | Add memoization of commit related values in Ci::PipelineTomasz Maczukin2018-05-071-6/+18
| * | | | | | | Add a CI_COMMIT_MESSAGE predefined variableTomasz Maczukin2018-05-071-0/+11
* | | | | | | | Merge branch '10244-ux-improvements-for-group-runners' into 'master'Kamil Trzciński2018-05-0719-77/+222
|\ \ \ \ \ \ \ \
| * | | | | | | | Use btn-inverted for Enable group RunnersKamil Trzciński2018-05-071-1/+1
View Lorry Controller Status