- 04 Dec, 2018 40 commits
-
-
Sean McGivern authored
Users can unlink Group SAML from accounts page Closes #5016 See merge request gitlab-org/gitlab-ee!8682
-
Rémy Coutable authored
EE: Automatically merge CE master into EE master See merge request gitlab-org/gitlab-ee!8657
-
Steve Azzopardi authored
CE upstream - 2018-12-04 12:21 UTC See merge request gitlab-org/gitlab-ee!8693
-
Douwe Maan authored
Add new service to create the web ide terminal See merge request gitlab-org/gitlab-ee!8549
-
Francisco Javier López authored
-
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.
-
Yorick Peterse authored
Fix EE load balancing crashing on Rails 5 Closes #8692 See merge request gitlab-org/gitlab-ee!8687
-
James Edwards-Jones authored
Changes to the :group_saml trait were previously breaking the ee-specific-lines check.
-
James Edwards-Jones authored
Previously we used @user, but this changed to local_assigns[:user] so we could pass a second variable to the view from an EE module Since we were already using current_user librally there it makes sense to replace the remaining usages. See: https://docs.gitlab.com/ee/development/module_with_instance_variables.html
-
James Edwards-Jones authored
Allows users to unlink their Group SAML accounts. Needed so that users can decide when they no longer want to allow an organization to log them into GitLab.com Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/5016
-
Filipa Lacerda authored
Handle null start or due dates for dates sourcing milestone in Epics Closes #8700 See merge request gitlab-org/gitlab-ee!8689
-
Francisco Javier López authored
-
Francisco Javier López authored
-
Francisco Javier López authored
-
GitLab Bot authored
# Conflicts: # lib/gitlab/checks/base_checker.rb # lib/gitlab/checks/change_access.rb # lib/gitlab/checks/diff_check.rb [ci skip]
-
James Lopez authored
Resolve "Add usage ping for Package Management" Closes #8320 See merge request gitlab-org/gitlab-ee!8641
-
Douwe Maan authored
CE port Refactor Gitlab::Checks::ChangeAccess class See merge request gitlab-org/gitlab-ce!23533
-
Douwe Maan authored
Refactor Gitlab::Checks::ChangeAccess class See merge request gitlab-org/gitlab-ee!8464
-
Francisco Javier López authored
-
Kushal Pandya authored
-
Kushal Pandya authored
-
🤖 GitLab Bot 🤖 authored
CE upstream - 2018-12-04 10:23 UTC See merge request gitlab-org/gitlab-ee!8690
-
Kamil Trzciński authored
Fallback to admin KUBE_TOKEN for project clusters only See merge request gitlab-org/gitlab-ce!23527
-
Sean McGivern authored
Resolve "Group-level project templates: Mini renaming" Closes #8637 See merge request gitlab-org/gitlab-ee!8688
-
GitLab Bot authored
-
Fatih Acet authored
Fix collapsing discussion replies Closes #54646 See merge request gitlab-org/gitlab-ce!23462
-
Winnie Hellmann authored
-
Steve Azzopardi authored
CE upstream - 2018-12-04 00:21 UTC Closes gitlab-ce#45992 See merge request gitlab-org/gitlab-ee!8686
-
Francisco Javier López authored
This class handles the validations of git pushes. It is quite big and all the logic is inside one file. This commit refactors the code and split it into different files.
-
Kamil Trzciński authored
Revert "Merge branch 'auto-devops-support-for-group-security-dashboard' into 'master'" See merge request gitlab-org/gitlab-ce!23530
-
Phil Hughes authored
CE Port2 of "Add empty and disabled web terminal tab" See merge request gitlab-org/gitlab-ce!23509
-
Phil Hughes authored
Add empty and disabled web terminal tab See merge request gitlab-org/gitlab-ee!8665
-
Paul Slaughter authored
-
Phil Hughes authored
Update -font-size variable name See merge request gitlab-org/gitlab-ce!23519
-
Dennis Tang authored
-
Sean McGivern authored
Disable format determination based on path extension Closes #54278 See merge request gitlab-org/gitlab-ce!23454
-
Sean McGivern authored
Make docs about expect_next_instance_of consistent See merge request gitlab-org/gitlab-ce!23507
-
Fabio Busatto authored
This reverts merge request !23165
-
Stan Hu authored
Approximate table counts based on TABLESAMPLE See merge request gitlab-org/gitlab-ce!22650
-