Merge remote-tracking branch 'origin/master' into swaggerlikeus

Conflicts:
	data/database.py
	endpoints/api.py
	endpoints/common.py
	templates/base.html
	test/data/test.db
	test/specs.py

test/specs.py

@@ -71,7 +71,6 @@ UPDATE_REPO_DETAILS = {
   'description': 'A new description',
 }
 
-
 class IndexTestSpec(object):
   def __init__(self, url, sess_repo=None, anon_code=403, no_access_code=403,
                read_code=200, admin_code=200):

test/test_api_usage.py

@@ -788,6 +788,27 @@ class TestDeleteRepository(ApiTestCase):
 
 class TestGetRepository(ApiTestCase):
   PUBLIC_REPO = PUBLIC_USER + '/publicrepo'
+
+  def test_getrepo_badnames(self):
+    self.login(ADMIN_ACCESS_USER)
+
+    bad_names = ['logs', 'build', 'tokens', 'foo.bar', 'foo-bar', 'foo_bar']
+
+    # For each bad name, create the repo.
+    for bad_name in bad_names:
+      json = self.postJsonResponse(RepositoryList, expected_code=201,
+                                   data=dict(repository=bad_name, visibility='public',
+                                             description=''))
+
+      # Make sure we can retrieve its information.
+      json = self.getJsonResponse(Repository,
+                                  params=dict(repository=ADMIN_ACCESS_USER + '/' + bad_name))
+
+      self.assertEquals(ADMIN_ACCESS_USER, json['namespace'])
+      self.assertEquals(bad_name, json['name'])
+      self.assertEquals(True, json['is_public'])
+      
+
   def test_getrepo_public_asguest(self):
     json = self.getJsonResponse(Repository,
                                 params=dict(repository=self.PUBLIC_REPO))