- 04 Dec, 2018 40 commits
-
-
Will Chandler authored
-
Nick Thomas authored
Encrypt runners tokens Closes #51232 and #52931 See merge request gitlab-org/gitlab-ce!23412
-
Stan Hu authored
Update batch-loader dependency See merge request gitlab-org/gitlab-ce!23535
-
Filipa Lacerda authored
Fixed multiple diff line discussions not expanding Closes #53600 See merge request gitlab-org/gitlab-ce!23539
-
Rémy Coutable authored
Automatically merge CE master into EE master See merge request gitlab-org/gitlab-ce!23453
-
Achilleas Pipinellis authored
update installation from source guide See merge request gitlab-org/gitlab-ce!23516
-
Alex Hanselka authored
-
Douwe Maan authored
CE port of Add new service to create the web ide terminal See merge request gitlab-org/gitlab-ce!23514
-
Francisco Javier López authored
-
Sean McGivern authored
[CE backport]Add sort direction button with sort dropdown for epics See merge request gitlab-org/gitlab-ce!23506
-
Rémy Coutable authored
Added a Hebrew proofreader See merge request gitlab-org/gitlab-ce!21863
-
Fatih Acet authored
Fix multiple commits shade overlapping vertical discussion line See merge request gitlab-org/gitlab-ce!23515
-
Annabel Dunstone Gray authored
-
Rémy Coutable authored
Fixes a typo that prevented assets from being properly compiled Closes #54825 See merge request gitlab-org/gitlab-ce!23528
-
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.
-
Rémy Coutable authored
# Conflicts: # doc/development/i18n/proofreader.md
-
Grzegorz Bizon authored
-
Phil Hughes authored
-
Grzegorz Bizon authored
-
Kamil Trzciński authored
[CE] Backport TokenAuthenticatable comparison method and stub_default_url_options See merge request gitlab-org/gitlab-ce!19094
-
Kamil Trzciński authored
Check the uniqueness of the values of pipeline enum See merge request gitlab-org/gitlab-ce!23504
-
Douwe Maan authored
-
Douwe Maan authored
CE port Refactor Gitlab::Checks::ChangeAccess class See merge request gitlab-org/gitlab-ce!23533
-
Francisco Javier López authored
-
Kamil Trzciński authored
Fallback to admin KUBE_TOKEN for project clusters only See merge request gitlab-org/gitlab-ce!23527
-
Phil Hughes authored
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53600
-
Shinya Maeda authored
-
Fatih Acet authored
Fix collapsing discussion replies Closes #54646 See merge request gitlab-org/gitlab-ce!23462
-
Winnie Hellmann authored
-
Kamil Trzciński authored
Revert "Merge branch 'auto-devops-support-for-group-security-dashboard' into 'master'" See merge request gitlab-org/gitlab-ce!23530
-
Grzegorz Bizon authored
-
Phil Hughes authored
CE Port2 of "Add empty and disabled web terminal tab" See merge request gitlab-org/gitlab-ce!23509
-
Phil Hughes authored
Update -font-size variable name See merge request gitlab-org/gitlab-ce!23519
-
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
-
Grzegorz Bizon authored
* commit '83f0798e': (101 commits)
-
Grzegorz Bizon authored
-
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
-