- 04 Dec, 2018 2 commits
-
-
Yorick Peterse authored
This updates the documentation of automatic CE to EE merges to cover the new automatic merging setup.
-
Yorick Peterse authored
This sets up GitLab CI to automatically push CE master changes into EE master, or revert them if the changes cause merge conflicts. The CI configuration contains a single job to do this: `merge:master`. This job is executed for every push to master, and periodically using a CI schedule. The periodic job is necessary because incremental jobs may not be able to revert commits if newly added commits depend on these commits. By re-running the job periodically (including all changes since a large enough time frame), we can ensure that such commits are also reverted (if they still conflict at that time). The job runs in its own "merge" stage, _after_ the build and prepare stages, but _before_ running the tests. This ensures that randomly failing tests won't prevent code from being merged into EE. Running the stage after the "prepare" stage reduces the chances of the job reverting CE changes just because it ran before a corresponding EE MR was merged into EE master.
-
- 03 Dec, 2018 10 commits
-
-
Phil Hughes authored
Updates linked pipelines to render inline Closes #2122 See merge request gitlab-org/gitlab-ee!8607
-
Filipa Lacerda authored
-
Phil Hughes authored
Redesign of MR header sections See merge request gitlab-org/gitlab-ee!8593
-
Paul Slaughter authored
-
Kamil Trzciński authored
Parse and store dependency scanning results in database See merge request gitlab-org/gitlab-ee!8642
-
Olivier Gonzalez authored
-
Achilleas Pipinellis authored
Update maven_repository.md adding a / to the pom.xml repository before packages See merge request gitlab-org/gitlab-ee!8611
-
Phil Hughes authored
Re-orders the Group Security Dashboard See merge request gitlab-org/gitlab-ee!8624
-
Evan Read authored
Docs - Add more info about using NFS with a firewall See merge request gitlab-org/gitlab-ee!8537
-
Cody West authored
-
- 01 Dec, 2018 1 commit
-
-
Stan Hu authored
CE upstream - 2018-11-30 05:21 UTC See merge request gitlab-org/gitlab-ee!8649
-
- 30 Nov, 2018 13 commits
-
-
Clement Ho authored
Fix pod log dropdown not switching Closes #7745 See merge request gitlab-org/gitlab-ee!8660
-
Jose Vargas authored
-
Nick Thomas authored
Fix API::Namespaces to accept namepaces with dots See merge request gitlab-org/gitlab-ee!8627
-
Douwe Maan authored
Make Project's only_mirror_protected_branches value false by default See merge request gitlab-org/gitlab-ee!8643
-
Kushal Pandya authored
Extract shared timeline entry component (EE-port) See merge request gitlab-org/gitlab-ee!8647
-
Imre Farkas authored
It also renames the API::PROJECT_ENDPOINT_REQUIREMENTS constant to API::NAMESPACE_OR_PROJECT_REQUIREMENTS
-
Steve Azzopardi authored
Resolve conflicts for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8649
-
Winnie Hellmann authored
(cherry picked from commit e3bddb62) Conflicts: app/assets/javascripts/notes/components/comment_form.vue app/assets/javascripts/notes/components/noteable_discussion.vue app/assets/javascripts/notes/components/noteable_note.vue
-
Winnie Hellmann authored
(cherry picked from commit 99862050)
-
Brandon Labuschagne authored
-
GitLab Bot authored
# Conflicts: # app/views/projects/tree/_tree_content.html.haml # locale/gitlab.pot [ci skip]
-
Stan Hu authored
Resolve "Add packages_enabled attribute to Projects API" Closes #8492 See merge request gitlab-org/gitlab-ee!8604
-
Stan Hu authored
CE upstream - 2018-11-29 19:21 UTC See merge request gitlab-org/gitlab-ee!8645
-
- 29 Nov, 2018 14 commits
-
-
Clement Ho authored
Resolve "Add border around the repository file tree" Closes #50264 See merge request gitlab-org/gitlab-ce!23018
-
Brandon Labuschagne authored
-
Clement Ho authored
Resolve "Add border around the repository file tree" EE Closes gitlab-ce#50264 See merge request gitlab-org/gitlab-ee!8534
-
Brandon Labuschagne authored
-
Stan Hu authored
-
Evan Read authored
Document how to create service account with admin Closes #50005 See merge request gitlab-org/gitlab-ce!23362
-
Thong Kuah authored
-
Stan Hu authored
Update robots.txt to exclude group_members and project_members, which can expose… See merge request gitlab-org/gitlab-ce!23463
-
Winnie Hellmann authored
-
Winnie Hellmann authored
-
Winnie Hellmann authored
-
otheus authored
Update robots.txt to exclude group_members and project_members, which can expose sensitive user information to the web. Please see https://developers.google.com/search/reference/robots_txt for the correct wildcard format.
-
Robert Speicher authored
Update Security developer workflow template See merge request gitlab-org/gitlab-ce!23458
-