4 files changed, 7 insertions(+), 22 deletions(-)

M git/blueprints/cgit.py
M git/types/__init__.py
D git/types/group.py
M git/types/repository.py

@@ 6,18 6,18 @@ cgit = Blueprint('cgit', __name__)
 
 upstream = cfg("cgit", "remote")
 
-@cgit.route("/<user>/<repo>", defaults={ "cgit_path": "" })
-@cgit.route("/<user>/<repo>/", defaults={ "cgit_path": "" })
-@cgit.route("/<user>/<repo>/<path:cgit_path>")
+@cgit.route("/~<user>/<repo>", defaults={ "cgit_path": "" })
+@cgit.route("/~<user>/<repo>/", defaults={ "cgit_path": "" })
+@cgit.route("/~<user>/<repo>/<path:cgit_path>")
 def cgit_passthrough(user, repo, cgit_path):
     r = requests.get("{}/{}".format(upstream, request.full_path))
     return render_template("cgit.html",
             cgit_html=r.text,
-            owner_name=user,
+            owner_name="~" + user,
             repo_name=repo)
 
-@cgit.route("/<user>/<repo>/patch")
-@cgit.route("/<user>/<repo>/patch/")
+@cgit.route("/~<user>/<repo>/patch")
+@cgit.route("/~<user>/<repo>/patch/")
 def cgit_plain(user, repo):
     r = requests.get("{}/{}".format(upstream, request.full_path))
     return Response(r.text, mimetype="text/plain")

@@ 1,3 1,2 @@
 from .user import User
 from .repository import Repository
-from .group import Group

@@ 1,12 0,0 @@
-import sqlalchemy as sa
-import sqlalchemy_utils as sau
-from srht.database import Base
-
-class Group(Base):
-    __tablename__ = 'group'
-    id = sa.Column(sa.Integer, primary_key=True)
-    created = sa.Column(sa.DateTime, nullable=False)
-    updated = sa.Column(sa.DateTime, nullable=False)
-    name = sa.Column(sa.Unicode(256), nullable=False)
-    owner_id = sa.Column(sa.Integer, sa.ForeignKey('user.id'), nullable=False)
-    owner = sa.orm.relationship('User', backref=sa.orm.backref('groups'))

@@ 8,7 8,5 @@ class Repository(Base):
     created = sa.Column(sa.DateTime, nullable=False)
     updated = sa.Column(sa.DateTime, nullable=False)
     name = sa.Column(sa.Unicode(256), nullable=False)
-    owner_id = sa.Column(sa.Integer, sa.ForeignKey('user.id'))
+    owner_id = sa.Column(sa.Integer, sa.ForeignKey('user.id'), nullable=False)
     owner = sa.orm.relationship('User', backref=sa.orm.backref('repos'))
-    group_id = sa.Column(sa.Integer, sa.ForeignKey('group.id'))
-    group = sa.orm.relationship('Group', backref=sa.orm.backref('repos'))