summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Updates all our stylelint dependenciestz-update-stylelintTim Zallmann2019-07-232-214/+309
| | | | Removed stylelint-error-string-formatter as this was having a circular reference fail
* Merge branch 'pl-flat_map-qa' into 'master'Dan Davison2019-07-224-9/+7
|\ | | | | | | | | QA: Prefer `flat_map` over `map` + `flatten` See merge request gitlab-org/gitlab-ce!30883
| * 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 CE See merge request gitlab-org/gitlab-ce!30998
| * 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
|\ \ | | | | | | | | | | | | | | | | | | Fix xterm CSS not loading Closes #64091 See merge request gitlab-org/gitlab-ce!31023
| * | 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 format See merge request gitlab-org/gitlab-ce!30967
| * | | Convert githost.log to JSON formatStan Hu2019-07-223-9/+16
| | | | | | | | | | | | | | | | | | | | This will make it easier to parse this in production and adds the `correlation_id` if available.
* | | | Merge branch 'group_with_cluster_factory' into 'master'Robert Speicher2019-07-222-6/+6
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Adds cluster_for_group factory for convenience See merge request gitlab-org/gitlab-ce!30826
| * | | Adds cluster_for_group factory for convienencegroup_with_cluster_factoryThong Kuah2019-07-192-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also means we don't have to resort to an update statement to set parent for child groups who also have clusters. This is much shorter than ``` create(:cluster, :provided_by_gcp, :group, groups: [group]) ```
* | | | Merge branch 'fix-params-name-bug' into 'master'Mayra Cabrera2019-07-222-5/+69
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix wrong name of params in events controller See merge request gitlab-org/gitlab-ce!30738
| * | | | Add review remarksGosia Ksionek2019-07-222-5/+69
|/ / / / | | | | | | | | | | | | | | | | | | | | Add cr remarks Add cr remarks
* | | | Merge branch 'resolve-remaining-import-export-differences' into 'master'Robert Speicher2019-07-223-2/+9
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Resolve remaining import export differences See merge request gitlab-org/gitlab-ce!31012
| * | | Backport import/export spec changes from EEresolve-remaining-import-export-differencesYorick Peterse2019-07-222-1/+7
| | | | | | | | | | | | | | | | This backports remaining import/export spec changes from EE to CE.
| * | | Backport project.json fixture from EEYorick Peterse2019-07-221-1/+2
| | | | | | | | | | | | | | | | | | | | This backports all changes made to an import/export fixture file from EE to CE.
* | | | Merge branch '64930-fix-node-sass-compilation-error' into 'master'Stan Hu2019-07-221-3/+3
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Use debian based node images for qa tests Closes #64930 See merge request gitlab-org/gitlab-ce!31020
| * | | Use debian based node images for qa tests64930-fix-node-sass-compilation-errorLukas Eipert2019-07-221-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The alpine images do not contain a full build toolchain, so if the pre-compiled node-sass bindings cannot be downloaded, they will error and break master. By switching to the debian based images, we are able to compile in case the downloads are not available.
* | | | Merge branch 'fix-i18n-updated-projects' into 'master'Clement Ho2019-07-222-1/+6
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Fix translation of 'Updated' term in projects list See merge request gitlab-org/gitlab-ce!30958
| * | | 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 directly See merge request gitlab-org/gitlab-ce!30365
| * | | | 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
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch 'remove-duplicate-all-models-entry' into 'master'Robert Speicher2019-07-221-1/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicate entry from all_models.yml See merge request gitlab-org/gitlab-ce!31010
| * | | | | Remove duplicate entry from all_models.ymlremove-duplicate-all-models-entryYorick Peterse2019-07-221-1/+0
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | This line is already present further down in the YAML file. In EE the line is already removed.
* | | | | Merge branch ↵Nick Thomas2019-07-224-1/+115
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '64870-can-t-save-pages-domain-form-with-let-s-encrypt-enabled-if-current-certificate-is-outdated' into 'master' Resolve "Can't save pages domain form with Let's Encrypt enabled if current certificate is outdated" Closes #64870 See merge request gitlab-org/gitlab-ce!30995
| * | | | Validate certificate chain only if it's changedVladimir Shushlin2019-07-224-1/+115
|/ / / / | | | | | | | | | | | | | | | | This validation prevents the domain from being saved from the UI e.g. when user tries to enable Let's Encrypt integration
* | | | Merge branch 'maintainers-can-create-subgroup' into 'master'Sean McGivern2019-07-2224-36/+340
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add a group setting to allow Maintainers to create sub-groups See merge request gitlab-org/gitlab-ce!29718
| * | | | Resolve some issues in MRFabio Papa2019-07-192-3/+2
| | | | |
| * | | | Merge branch 'maintainers-can-create-subgroup' of ↵Fabio Papa2019-07-191-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | https://gitlab.com/fapapa/gitlab-ce into maintainers-can-create-subgroup
| | * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | subgroup section
| | * | | | Merge branch 'maintainers-can-create-subgroup' of ↵Fabio Papa2019-07-121176-8136/+17452
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/fapapa/gitlab-ce into maintainers-can-create-subgroup
| | | * \ \ \ Merge branch 'master' into 'maintainers-can-create-subgroup'Fabio Papa2019-07-121176-8136/+17452
| | | |\ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | # Conflicts: # doc/user/permissions.md
| | * | | | | 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 ↵Fabio Papa2019-07-053-6/+8
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/fapapa/gitlab-ce into maintainers-can-create-subgroup
| | | * \ \ \ \ Merge branch 'maintainers-can-create-subgroup' of ↵Fabio Papa2019-07-052-12/+14
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/fapapa/gitlab-ce into maintainers-can-create-subgroup
| | | | * | | | | Apply suggestion to doc/user/permissions.mdFabio Papa2019-07-051-1/+1
| | | | | | | | |
| | | | * | | | | Make subgroup creation more clearFabio Papa2019-07-030-0/+0
| | | | | | | | |
| | | | * | | | | Update index.mdFabio Papa2019-07-031-9/+10
| | | | | | | | |
| | | | * | | | | Apply suggestion to doc/user/group/subgroups/index.mdFabio Papa2019-07-031-1/+0
| | | | | | | | |
| | | | * | | | | Apply suggestion to doc/user/permissions.mdFabio Papa2019-07-031-1/+1
| | | | | | | | |
| | | | * | | | | Apply suggestion to doc/user/permissions.mdFabio Papa2019-07-031-1/+1
| | | | | | | | |
| | | | * | | | | Apply suggestion to doc/user/group/subgroups/index.mdFabio Papa2019-07-031-1/+3
| | | | | | | | |
| | | * | | | | | Fixed a failing testFabio Papa2019-07-051-10/+6
| | | |/ / / / /
| | | * | | | | Merge branch 'maintainers-can-create-subgroup' of ↵Fabio Papa2019-07-020-0/+0
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/fapapa/gitlab-ce into maintainers-can-create-subgroup
| | | | * | | | | Apply recomended changes from merge coachFabio Papa2019-07-023-9/+10
| | | | | | | | |
| | | | * | | | | Fix some code style issuesFabio Papa2019-07-012-11/+14
| | | | | | | | |
View Lorry Controller Status