1. 31 May, 2016 2 commits
    • Rémy Coutable's avatar
      Merge branch 'patch/wiki_page_events' into 'master' · ba81c912
      Rémy Coutable authored
      Enable Wiki Page events from Webhook admin UI in a Project
      
      * Added UI to enable page wiki events
      * Documentation for this event in Webhooks page
      
      Fixes #17506
      
      --- 
      
      ![new_webhook_UI](/uploads/63ef24b4ccef13ac7a5fda83e9ce64ad/new_webhook_UI.png)
      
      See merge request !4135
      ba81c912
    • Stan Hu's avatar
      Merge branch... · 9951243b
      Stan Hu authored
      Merge branch 'make-container-registry-authentication-service-compatible-with-older-docker' into 'master'
      
      Make authentication service for Container Registry to be compatible with < Docker 1.11
      
      This removes the usage of `offline_token` which is only present when using `Docker 1.11.x` instead we relay on `scope`. This should make it compatible with any client starting from 1.6 (I did test only 1.8 and up).
      
      Right now we return 403 if unauthorized user doesn't have access to anything. In all other cases we return token, but with empty `access`, which simply disallow requested action.
      
      
      
      See merge request !4363
      9951243b
  2. 30 May, 2016 38 commits