- 05 Dec, 2018 4 commits
-
-
Ash McKenzie authored
Added specs for #deploy_key_pushable?() and #type()
-
Ash McKenzie authored
LfsToken::HMACToken#token_valid?() will be examined and if false, look in redis via LfsToken::LegacyRedisDeviseToken#token_valid?().
-
Ash McKenzie authored
-
Nick Thomas authored
Upgrade GitLab Workhorse to v7.4.0 See merge request gitlab-org/gitlab-ce!23557
-
- 04 Dec, 2018 36 commits
-
-
Mike Greiling authored
Forward gitlab-svg See merge request gitlab-org/gitlab-ce!23543
-
Dan Davison authored
[QA] Add a log-out step and expectation to `qa/qa/specs/features/browser_ui/1_manage/login/log_in_spec.rb` Closes #52700 See merge request gitlab-org/gitlab-ce!23554
-
Stan Hu authored
Fixed typo in bitbucket import See merge request gitlab-org/gitlab-ce!23568
-
Jason Colyer authored
-
Stan Hu authored
[CE] Backport GroupSAML unlink changes See merge request gitlab-org/gitlab-ce!23536
-
Mike Greiling authored
Remove pronunciation tip for knative Closes #54724 See merge request gitlab-org/gitlab-ce!23549
-
Kamil Trzciński authored
Define the default value for only/except policies See merge request gitlab-org/gitlab-ce!23531
-
Marin Jankovski authored
Temporarily disable automatic merging See merge request gitlab-org/gitlab-ce!23560
-
Yorick Peterse authored
This reverts commit d7291c64
-
Yorick Peterse authored
It appears that for some jobs (https://gitlab.com/gitlab-org/gitlab-ce/-/jobs/129705025 for example) we process a range of commits far greater than necessary, which can lead to commits getting reverted that were merged a long time ago. [ci skip]
-
🤖 GitLab Bot 🤖 authored
This reverts commit c3d0f129
-
Stan Hu authored
-
Mesut Güneş 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
-
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
- Improves spacing between account buttons on Profile - AccountsController#show uses locals instead of instance variables - New `display_providers_on_profile?` helper method - Adds `render_if_exists` for GroupSAMl unlink buttons See: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8682
-
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
-
Shinya Maeda authored
Currently, if a job does not have only/except policies, the policy is considered as an unspecified state, and therefore the job is executed regardless of how it's executed and which branch/tags are targetted. Ideally, this should be specified as only: ['branches', 'tags'], as it indicates that unspecified policy jobs are meant to run on any git references.
-
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
-
George Tsiolis authored
-
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
-