1. 13 4月, 2016 36 次提交
  2. 12 4月, 2016 4 次提交
    • D
    • J
      Merge branch 'commit-message-prefilled' into 'master' · 2082879d
      Jacob Schatz 提交于
      Prefills commit message in edit file
      
      See #14488 
      
      ![Screen_Shot_2016-04-06_at_10.18.06](/uploads/2ace2a21a6ead8d83c79ef9ce5dd34cc/Screen_Shot_2016-04-06_at_10.18.06.png)
      
      See merge request !3564
      2082879d
    • J
      Merge branch 'build-notification-fixes' into 'master' · 63265243
      Jacob Schatz 提交于
      Build notification null check
      
      Cancels build notification interval on page change
      
      See merge request !3540
      63265243
    • R
      Merge branch 'fix-missing-saml-error-handling' into 'master' · d75ec6cd
      Robert Speicher 提交于
      Add proper nil and error handling to SAML login process
      
      While writing the feature that would allow certain Omniauth providers to be marked as external I noticed that there is a scenario where the `gl_user` method can return `nil` and if this is not properly checked, it will lead to exceptions that will cause 500 errors. It is quite easy to land in this scenario, so I added `nil` checks.
      
      I also noticed that the `saml` method in the `omniauth_callbacks_controller.rb` file lacked a `rescue` for `Gitlab::OAuth::SignupDisabledError`, which can happen if the default configuration from `1_settings.rb` is applied. So I also added this check.
      
      See merge request !3609
      d75ec6cd