summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | Merge branch 'leipert-resolve-ee-diff' into 'master'Phil Hughes2019-07-231-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Port common class only used in EEleipert-resolve-ee-diffLukas Eipert2019-07-221-0/+1
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'issue/61207' into 'master'Phil Hughes2019-07-233-20/+37
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | hoverable area on collapsed sidebar iconsMichel Engelen2019-07-233-20/+37
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'rs-fixtures-parity' into 'master'Lin Jen-Shin2019-07-231-3/+15
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | CE pipelines don't respond to sourced_pipelinesrs-fixtures-parityRobert Speicher2019-07-221-3/+3
| * | | | | | | | | | | | CE-EE parity for pipelines development fixtureRobert Speicher2019-07-221-1/+13
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'update-gitlab-runner-helm-chart-to-0-7-0' into 'master'Grzegorz Bizon2019-07-232-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Update GitLab Runner Helm Chart to 0.7.0update-gitlab-runner-helm-chart-to-0-7-0Steve Azzopardi2019-07-192-1/+6
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'sh-update-webpack-bundle-analyzer' into 'master'Kushal Pandya2019-07-232-15/+16
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Update webpack-bundle-analyzer to 3.3.2sh-update-webpack-bundle-analyzerStan Hu2019-07-222-15/+16
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'docs-saml-sso-updates' into 'master'Evan Read2019-07-232-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Docs: Update old SAML settings screenshotTristan Williams2019-07-232-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'pl-flat_map-qa' into 'master'Dan Davison2019-07-224-9/+7
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | QA: Prefer `flat_map` over `map` + `flatten`Peter Leitzen2019-07-224-9/+7
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'ce-4946-resolve-ee-config' into 'master'Robert Speicher2019-07-221-0/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Port EE specific settings to CELin Jen-Shin2019-07-221-0/+1
* | | | | | | | | | | | Merge branch '64091-fix-sprockets-paths' into 'master'Stan Hu2019-07-222-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add CHANGELOG.md entryMike Greiling2019-07-221-0/+5
| * | | | | | | | | | | | Fix xterm CSS not loadingMike Greiling2019-07-221-1/+4
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'sh-make-githost-json' into 'master'Mayra Cabrera2019-07-223-9/+16
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Convert githost.log to JSON formatStan Hu2019-07-223-9/+16
* | | | | | | | | | | | | Merge branch 'group_with_cluster_factory' into 'master'Robert Speicher2019-07-222-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Adds cluster_for_group factory for convienencegroup_with_cluster_factoryThong Kuah2019-07-192-6/+6
* | | | | | | | | | | | | Merge branch 'fix-params-name-bug' into 'master'Mayra Cabrera2019-07-222-5/+69
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add review remarksGosia Ksionek2019-07-222-5/+69
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'resolve-remaining-import-export-differences' into 'master'Robert Speicher2019-07-223-2/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Backport import/export spec changes from EEresolve-remaining-import-export-differencesYorick Peterse2019-07-222-1/+7
| * | | | | | | | | | | | Backport project.json fixture from EEYorick Peterse2019-07-221-1/+2
* | | | | | | | | | | | | Merge branch '64930-fix-node-sass-compilation-error' into 'master'Stan Hu2019-07-221-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Use debian based node images for qa tests64930-fix-node-sass-compilation-errorLukas Eipert2019-07-221-3/+3
* | | | | | | | | | | | | Merge branch 'fix-i18n-updated-projects' into 'master'Clement Ho2019-07-222-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fix translation of 'Updated' term in projects listPaul Gascou-Vaillancourt2019-07-222-1/+6
* | | | | | | | | | | | | Merge branch 'docs-dry-the-stage-and=group-labels-list' into 'master'Mek Stittri2019-07-221-54/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Dry the list of stage and group labels by linking to them directlydocs-dry-the-stage-and=group-labels-listRémy Coutable2019-07-221-54/+5
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'remove-duplicate-all-models-entry' into 'master'Robert Speicher2019-07-221-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Remove duplicate entry from all_models.ymlremove-duplicate-all-models-entryYorick Peterse2019-07-221-1/+0
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch '64870-can-t-save-pages-domain-form-with-let-s-encrypt-enabled-i...Nick Thomas2019-07-224-1/+115
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Validate certificate chain only if it's changedVladimir Shushlin2019-07-224-1/+115
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'maintainers-can-create-subgroup' into 'master'Sean McGivern2019-07-2224-36/+340
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Resolve some issues in MRFabio Papa2019-07-192-3/+2
| * | | | | | | | | | | Merge branch 'maintainers-can-create-subgroup' of https://gitlab.com/fapapa/g...Fabio Papa2019-07-191-2/+2
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Apply suggestion to doc/user/group/subgroups/index.mdFabio Papa2019-07-191-4/+9
| | * | | | | | | | | | | Apply suggestion to doc/user/permissions.mdFabio Papa2019-07-191-1/+1
| | * | | | | | | | | | | Add a link from the permissions table to the subgroups/creating aFabio Papa2019-07-121-2/+3
| | * | | | | | | | | | | Merge branch 'maintainers-can-create-subgroup' of https://gitlab.com/fapapa/g...Fabio Papa2019-07-121176-8136/+17452
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into 'maintainers-can-create-subgroup'Fabio Papa2019-07-121176-8136/+17452
| | | |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | Make Group#subgroup_creation_level return Owner if it is nil in DBif-ee_compat_testFabio Papa2019-07-101-1/+1
| | * | | | | | | | | | | | Regenerate locale stringsFabio Papa2019-07-051-0/+12
| | * | | | | | | | | | | | Merge branch 'maintainers-can-create-subgroup' of https://gitlab.com/fapapa/g...Fabio Papa2019-07-053-6/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \