Skip to content
Snippets Groups Projects

Add support to configure webhook_timeout in gitlab.yaml

Closed Add support to configure webhook_timeout in gitlab.yaml
github/fork/wesgurn/master into master
Closed gitlab-qa-bot requested to merge github/fork/wesgurn/master into master
Viewing commit bf309fcf
Prev Next
Show latest version
1 file
+ 1
− 2
Compare changes
  • Side-by-side
  • Inline
  • bf309fcf 
    If you are running another sidekiq instance on your server, e.g. GitLab
CI, the check script would parse the output of `ps aux` searching for
`sidekiq` and returning success, although the GitLab sidekiq may not be
running.

Now the `ps` call will only print the processes run by the GitLab user.
app/views/devise/shared/_links.erb
+ 1
− 1
@@ -2,7 +2,7 @@
<%= link_to "Sign in", new_session_path(resource_name), class: "btn" %><br />
<% end -%>
<%- if devise_mapping.registerable? && controller_name != 'registrations' %>
<%- if devise_mapping.registerable? && controller_name != 'registrations' && Gitlab.config.gitlab.signup_enabled %>
<%= link_to "Sign up", new_registration_path(resource_name) %><br />
<% end -%>