diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-26 09:10:34 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-26 09:10:34 +0300 |
| commit | fb553bbc1899eddaddb07cd9685cdabffbed9962 (patch) | |
| tree | 473f1ad59a01e98d6ee1a04f462e524bb585f1e4 /config | |
| parent | a51e52bf5b7a708255a858ca51de8d4a6e58b074 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/feature_flags/development/track_editor_edit_actions.yml | 7 | ||||
| -rw-r--r-- | config/spring.rb | 10 |
2 files changed, 17 insertions, 0 deletions
diff --git a/config/feature_flags/development/track_editor_edit_actions.yml b/config/feature_flags/development/track_editor_edit_actions.yml new file mode 100644 index 00000000000..662dd9f600b --- /dev/null +++ b/config/feature_flags/development/track_editor_edit_actions.yml @@ -0,0 +1,7 @@ +--- +name: track_editor_edit_actions +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/39694 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/240928 +group: group::editor +type: development +default_enabled: false diff --git a/config/spring.rb b/config/spring.rb index c9119b40c08..0092d0fd1b0 100644 --- a/config/spring.rb +++ b/config/spring.rb @@ -4,3 +4,13 @@ tmp/restart.txt tmp/caching-dev.txt ).each { |path| Spring.watch(path) } + +Spring.after_fork do + if ENV['DEBUGGER_STORED_RUBYLIB'] + ENV['DEBUGGER_STORED_RUBYLIB'].split(File::PATH_SEPARATOR).each do |path| + next unless path =~ /ruby-debug-ide/ + + load path + '/ruby-debug-ide/multiprocess/starter.rb' + end + end +end |