1. 31 May, 2017 4 commits
    • Lin Jen-Shin's avatar
      Merge remote-tracking branch 'upstream/master' into 24196-protected-variables · afc1fac0
      Lin Jen-Shin authored
      * upstream/master: (89 commits)
        Revert "Merge branch 'grpc-1.3.4' into 'master'"
        Return nil when looking up config for unknown LDAP provider
        Avoid crash when trying to parse string with invalid UTF-8 sequence
        Enable Gitaly by default in GitLab 9.3
        Don’t create comment on JIRA if link already exists
        Disable sub_group_issuables_spec.rb for mysql
        Fix math rendering on blob pages
        Add changelog
        Don't allow to pass a user to ProjectWiki#http_url_to_repo
        Revert "Merge branch '1937-https-clone-url-username' into 'master'"
        Fix bottom padding for build page
        Fix /unsubscribe slash command creating extra todos
        Fix omniauth-google-oauth2 dependencies in Gemfile.lock
        Update looks job log
        'New issue'/'New merge request' dropdowns should show only projects with issues/merge requests feature enabled
        Fix spec for Members::AuthorizedDestroyService
        31616-add-uptime-of-gitlab-instance-in-admin-area
        Set head pipeline when creating merge requests
        Create a separate helper to check if we show particular tab on a search page
        Add performance deltas between app deployments on Merge Request widget
        ...
      afc1fac0
    • Rémy Coutable's avatar
      Merge branch 'dm-oauth-config-for' into 'master' · 228926da
      Rémy Coutable authored
      Return nil when looking up config for unknown LDAP provider
      
      Closes #29342
      
      See merge request !11804
      228926da
    • Sean McGivern's avatar
      Merge branch 'revert-5b67839b' into 'master' · 32dde25a
      Sean McGivern authored
      Revert "Merge branch 'grpc-1.3.4' into 'master'"
      
      See merge request !11813
      32dde25a
    • Jacob Vosmaer (GitLab)'s avatar
      Revert "Merge branch 'grpc-1.3.4' into 'master'" · cdb10300
      Jacob Vosmaer (GitLab) authored
      This reverts merge request !11645
      cdb10300
  2. 30 May, 2017 36 commits