Merge master into bitbucket

endpoints/api/user.py

@@ -444,19 +444,19 @@ class ConvertToOrganization(ApiResource):
     user = get_authenticated_user()
     convert_data = request.get_json()
 
-    # Ensure that the new admin user is the not user being converted.
-    admin_username = convert_data['adminUser']
-    if admin_username == user.username:
-      raise request_error(reason='invaliduser',
-                           message='The admin user is not valid')
-
     # Ensure that the sign in credentials work.
+    admin_username = convert_data['adminUser']
     admin_password = convert_data['adminPassword']
     (admin_user, error_message) =  authentication.verify_user(admin_username, admin_password)
     if not admin_user:
       raise request_error(reason='invaliduser',
                            message='The admin user credentials are not valid')
 
+    # Ensure that the new admin user is the not user being converted.
+    if admin_user.id == user.id:
+      raise request_error(reason='invaliduser',
+                           message='The admin user is not valid')
+
     # Subscribe the organization to the new plan.
     if features.BILLING:
       plan = convert_data.get('plan', 'free')

endpoints/verbs.py

@@ -140,7 +140,7 @@ def _repo_verb_signature(namespace, repository, tag, verb, checker=None, **kwarg
   # Lookup the derived image storage for the verb.
   derived = model.find_derived_storage(repo_image.storage, verb)
   if derived is None or derived.uploading:
-    abort(404)
+    return make_response('', 202)
 
   # Check if we have a valid signer configured.
   if not signer.name:

endpoints/web.py

@@ -28,6 +28,7 @@ from util.systemlogs import build_logs_archive
 from auth import scopes
 
 import features
+import json
 
 logger = logging.getLogger(__name__)
 
@@ -432,16 +433,16 @@ def request_authorization_code():
 
     # Load the application information.
     oauth_app = provider.get_application_for_client_id(client_id)
-    app_email = oauth_app.email or organization.email
+    app_email = oauth_app.avatar_email or oauth_app.organization.email
 
     oauth_app_view = {
       'name': oauth_app.name,
       'description': oauth_app.description,
       'url': oauth_app.application_uri,
-      'avatar': avatar.get_data(oauth_app.name, app_email, 'app'),
+      'avatar': json.dumps(avatar.get_data(oauth_app.name, app_email, 'app')),
       'organization': {
         'name': oauth_app.organization.username,
-        'avatar': avatar.get_data_for_org(oauth_app.organization)
+        'avatar': json.dumps(avatar.get_data_for_org(oauth_app.organization))
       }
     }
 
@@ -562,6 +563,9 @@ def redirect_to_repository(namespace, reponame, tag):
   permission = ReadRepositoryPermission(namespace, reponame)
   is_public = model.repository_is_public(namespace, reponame)
 
+  if request.args.get('ac-discovery', 0) == 1:
+    return index('')
+
   if permission.can() or is_public:
     repository_name = '/'.join([namespace, reponame])
     return redirect(url_for('web.repository', path=repository_name, tag=tag))