- 03 May, 2018 17 commits
-
-
King Chung Huang authored
-
King Chung Huang authored
The expected values for the recursive merge specs were missing "variables" at the top level.
-
King Chung Huang authored
Modify the changelog title to focus on the feature being added, not how it's implemented (deep merging).
-
King Chung Huang authored
Recursive merging does not extend lists. Add a blurb in the ci/yaml docs about this.
-
King Chung Huang authored
Rework the section about include in the ci/yaml docs to describe recursive merges. Also add a note that in prior releases of GitLab, the .gitlab-ci.yml took strict precedence over includes.
-
King Chung Huang authored
-
King Chung Huang authored
When both external files and gitlab_ci.yml define a dictionary of variables where some variable keys overlap, later declarations should take precedence.
-
King Chung Huang authored
When both external files and gitlab_ci.yml define a dictionary of distinct variables, they should be merged together.
-
King Chung Huang authored
When combining GitLab CI YAML content, use deep_merge instead of merge to combine external files and the inline content. This merges the external files and inline content recursively, providing more options for customizing jobs loaded from external files.
-
Achilleas Pipinellis authored
Update group menu position based on 10.x UI changes. See merge request gitlab-org/gitlab-ee!5544
-
Brendan O'Leary 🐢 authored
-
Rémy Coutable authored
Replace the `groups_management.feature` spinach test with an rspec analog See merge request gitlab-org/gitlab-ee!5516
-
blackst0ne authored
-
Rémy Coutable authored
Replace the `group_hooks.feature` spinach test with an rspec analog See merge request gitlab-org/gitlab-ee!5515
-
blackst0ne authored
-
Achilleas Pipinellis authored
Port to EE: Include documentation about STAGING_ENABLED variable for AutoDevops See merge request gitlab-org/gitlab-ee!5536
-
Mayra Cabrera authored
-
- 02 May, 2018 23 commits
-
-
Mayra Cabrera authored
[ci skip]
-
Mayra Cabrera authored
[ci skip]
-
Nick Thomas authored
Geo: Exclude expired job artifacts from syncing and counts Closes #5357 See merge request gitlab-org/gitlab-ee!5380
-
Rémy Coutable authored
CE upstream - 2018-05-02 09:27 UTC See merge request gitlab-org/gitlab-ee!5540
-
Clement Ho authored
EE-Port for Emoji Sprites Optimisation See merge request gitlab-org/gitlab-ee!5538
-
Rémy Coutable authored
Resolve "The `ee-specific-lines-check` should ignore files under `ee/`" Closes #5856 See merge request gitlab-org/gitlab-ee!5549
-
DJ Mountney authored
Adding initial outline of pgbouncer documentation Closes omnibus-gitlab#2649 See merge request gitlab-org/gitlab-ee!5351
-
Lin Jen-Shin authored
-
Rémy Coutable authored
Make ee/spec/features/admin/admin_sends_notification_spec.rb more reliable See merge request gitlab-org/gitlab-ee!5547
-
Douwe Maan authored
-
Filipa Lacerda authored
Unify app/assets/javascripts/clusters/components/application_row.vue with CE See merge request gitlab-org/gitlab-ee!5545
-
Valery Sizov authored
reliable
-
Nick Thomas authored
Merge branch '5841-geo-basesyncservice-should-prune-the-geo-temporary-directory-before-fetching' into 'master' Resolve "Geo: BaseSyncService should prune the @geo-temporary directory before fetching" Closes #5841 See merge request gitlab-org/gitlab-ee!5543
-
Rémy Coutable authored
Skip master for EE-specific check See merge request gitlab-org/gitlab-ee!5542
-
Ian Baum authored
* Add link to components in HA README * Fix typo in pgbouncer page
-
Lin Jen-Shin authored
-
Valery Sizov authored
-
Lin Jen-Shin authored
master is a special case that CE master is not crafted toward EE master, thus it could be ahead of EE master. In this case we should compare with the merge-base, but that could make the code unnecessarily complex and is not worth the effort.
-
Valery Sizov authored
-
GitLab Bot authored
# Conflicts: # app/views/groups/_group_admin_settings.html.haml # spec/requests/api/runner_spec.rb [ci skip]
-
Rémy Coutable authored
Replace the `admin/emails.feature` spinach test with an rspec analog See merge request gitlab-org/gitlab-ee!5513
-
blackst0ne authored
-
Rémy Coutable authored
Replace the `admin/push_rules.feature` spinach test with an rspec analog See merge request gitlab-org/gitlab-ee!5512
-