Merge branch 'master' into fdroid

# Conflicts:
#	.gitlab-ci.yml
#	app/build.gradle
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/com/commit451/gitlab/App.java

app/src/main/java/com/commit451/gitlab/model/api/Diff.java

 package com.commit451.gitlab.model.api;
-import com.google.gson.annotations.SerializedName;
+import com.bluelinelabs.logansquare.annotation.JsonField;
+import com.bluelinelabs.logansquare.annotation.JsonObject;
 import org.parceler.Parcel;
 @Parcel
+@JsonObject
 public class Diff {
-    @SerializedName("old_path")
+    @JsonField(name = "old_path")
     String mOldPath;
-    @SerializedName("new_path")
+    @JsonField(name = "new_path")
     String mNewPath;
-    @SerializedName("a_mode")
+    @JsonField(name = "a_mode")
     int mAMode;
-    @SerializedName("b_mode")
+    @JsonField(name = "b_mode")
     int mBMode;
-    @SerializedName("diff")
+    @JsonField(name = "diff")
     String mDiff;
-    @SerializedName("new_file")
+    @JsonField(name = "new_file")
     boolean mNewFile;
-    @SerializedName("renamed_file")
+    @JsonField(name = "renamed_file")
     boolean mRenamedFile;
-    @SerializedName("deleted_file")
+    @JsonField(name = "deleted_file")
     boolean mDeletedFile;
     public Diff() {}

app/src/main/java/com/commit451/gitlab/model/api/Email.java

 package com.commit451.gitlab.model.api;
-import com.google.gson.annotations.SerializedName;
+import com.bluelinelabs.logansquare.annotation.JsonField;
+import com.bluelinelabs.logansquare.annotation.JsonObject;
 import org.parceler.Parcel;
 @Parcel
+@JsonObject
 public class Email {
-    @SerializedName("id")
+    @JsonField(name = "id")
     long mId;
-    @SerializedName("email")
+    @JsonField(name = "email")
     String mEmail;
     public Email() {}

app/src/main/java/com/commit451/gitlab/model/api/FileUploadResponse.java

 package com.commit451.gitlab.model.api;
-import com.google.gson.annotations.SerializedName;
+import com.bluelinelabs.logansquare.annotation.JsonField;
+import com.bluelinelabs.logansquare.annotation.JsonObject;
 import org.parceler.Parcel;
@@ -8,15 +9,16 @@ import org.parceler.Parcel;
  * Response when a file is uploaded
  */
 @Parcel
+@JsonObject
 public class FileUploadResponse {
-    @SerializedName("alt")
+    @JsonField(name = "alt")
     protected String mAlt;
-    @SerializedName("url")
+    @JsonField(name = "url")
     protected String mUrl;
-    @SerializedName("is_image")
+    @JsonField(name = "is_image")
     protected boolean mIsImage;
-    @SerializedName("markdown")
+    @JsonField(name = "markdown")
     protected String mMarkdown;
     protected FileUploadResponse() {

app/src/main/java/com/commit451/gitlab/model/api/ForkedFromProject.java

 package com.commit451.gitlab.model.api;
-import com.google.gson.annotations.SerializedName;
+import com.bluelinelabs.logansquare.annotation.JsonField;
+import com.bluelinelabs.logansquare.annotation.JsonObject;
 import org.parceler.Parcel;
 @Parcel
+@JsonObject
 public class ForkedFromProject {
-    @SerializedName("id")
+    @JsonField(name = "id")
     long mId;
-    @SerializedName("name")
+    @JsonField(name = "name")
     String mName;
-    @SerializedName("name_with_namespace")
+    @JsonField(name = "name_with_namespace")
     String mNameWithNamespace;
-    @SerializedName("path")
+    @JsonField(name = "path")
     String mPath;
-    @SerializedName("path_with_namespace")
+    @JsonField(name = "path_with_namespace")
     String mPathWithNamespace;
     public ForkedFromProject() {}

app/src/main/java/com/commit451/gitlab/model/api/Group.java

@@ -3,23 +3,25 @@ package com.commit451.gitlab.model.api;
 import android.net.Uri;
 import android.support.annotation.Nullable;
-import com.google.gson.annotations.SerializedName;
+import com.bluelinelabs.logansquare.annotation.JsonField;
+import com.bluelinelabs.logansquare.annotation.JsonObject;
 import org.parceler.Parcel;
 @Parcel
+@JsonObject
 public class Group {
-    @SerializedName("id")
+    @JsonField(name = "id")
     long mId;
-    @SerializedName("name")
+    @JsonField(name = "name")
     String mName;
-    @SerializedName("path")
+    @JsonField(name = "path")
     String mPath;
-    @SerializedName("description")
+    @JsonField(name = "description")
     String mDescription;
-    @SerializedName("avatar_url")
+    @JsonField(name = "avatar_url")
     Uri mAvatarUrl;
-    @SerializedName("web_url")
+    @JsonField(name = "web_url")
     Uri mWebUrl;
     public Group() {}

app/src/main/java/com/commit451/gitlab/model/api/GroupDetail.java

 package com.commit451.gitlab.model.api;
-import com.google.gson.annotations.SerializedName;
+import com.bluelinelabs.logansquare.annotation.JsonField;
+import com.bluelinelabs.logansquare.annotation.JsonObject;
 import org.parceler.Parcel;
 import java.util.List;
 @Parcel
+@JsonObject
 public class GroupDetail extends Group {
-    @SerializedName("projects")
+    @JsonField(name = "projects")
     List<Project> mProjects;
     public GroupDetail() {}

app/src/main/java/com/commit451/gitlab/model/api/Identity.java

 package com.commit451.gitlab.model.api;
-import com.google.gson.annotations.SerializedName;
+import com.bluelinelabs.logansquare.annotation.JsonField;
+import com.bluelinelabs.logansquare.annotation.JsonObject;
 import org.parceler.Parcel;
 @Parcel
+@JsonObject
 public class Identity {
-    @SerializedName("provider")
+    @JsonField(name = "provider")
     String mProvider;
-    @SerializedName("extern_uid")
+    @JsonField(name = "extern_uid")
     String mExternUid;
     public Identity() {}

app/src/main/java/com/commit451/gitlab/model/api/Issue.java

 package com.commit451.gitlab.model.api;
-import com.google.gson.annotations.SerializedName;
-
-import org.parceler.Parcel;
-
 import android.net.Uri;
 import android.support.annotation.StringDef;
+import com.bluelinelabs.logansquare.annotation.JsonField;
+import com.bluelinelabs.logansquare.annotation.JsonObject;
+
+import org.parceler.Parcel;
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.Date;
 import java.util.List;
 @Parcel
+@JsonObject
 public class Issue {
     public static final String STATE_REOPEN = "reopen";
     public static final String STATE_CLOSE = "close";
     @StringDef({STATE_REOPEN, STATE_CLOSE})
     @Retention(RetentionPolicy.SOURCE)
-    public @interface EditState {}
-    @SerializedName("id")
+    public @interface EditState {
+    }
+
+    public static final String STATE_OPENED = "opened";
+    public static final String STATE_REOPENED = "reopened";
+    public static final String STATE_CLOSED = "closed";
+
+    @StringDef({STATE_OPENED, STATE_REOPENED, STATE_CLOSED})
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface State {
+    }
+    @JsonField(name = "id")
     long mId;
-    @SerializedName("iid")
+    @JsonField(name = "iid")
     long mIid;
-    @SerializedName("project_id")
+    @JsonField(name = "project_id")
     long mProjectId;
-    @SerializedName("title")
+    @JsonField(name = "title")
     String mTitle;
-    @SerializedName("description")
+    @JsonField(name = "description")
     String mDescription;
-    @SerializedName("state")
-    State mState;
-    @SerializedName("created_at")
+    @JsonField(name = "state")
+    @State
+    String mState;
+    @JsonField(name = "created_at")
     Date mCreatedAt;
-    @SerializedName("updated_at")
+    @JsonField(name = "updated_at")
     Date mUpdatedAt;
-    @SerializedName("labels")
+    @JsonField(name = "labels")
     List<String> mLabels;
-    @SerializedName("milestone")
+    @JsonField(name = "milestone")
     Milestone mMilestone;
-    @SerializedName("assignee")
+    @JsonField(name = "assignee")
     UserBasic mAssignee;
-    @SerializedName("author")
+    @JsonField(name = "author")
     UserBasic mAuthor;
-    public Issue() {}
+    public Issue() {
+    }
     public long getId() {
         return mId;
@@ -68,7 +82,7 @@ public class Issue {
         return mDescription;
     }
-    public State getState() {
+    public @State String getState() {
         return mState;
     }
@@ -117,13 +131,4 @@ public class Issue {
     public int hashCode() {
         return (int) (mId ^ (mId >>> 32));
     }
-
-    public enum State {
-        @SerializedName("opened")
-        OPENED,
-        @SerializedName("reopened")
-        REOPENED,
-        @SerializedName("closed")
-        CLOSED
-    }
 }

app/src/main/java/com/commit451/gitlab/model/api/Label.java

@@ -3,7 +3,8 @@ package com.commit451.gitlab.model.api;
 import android.graphics.Color;
 import android.support.annotation.ColorInt;
-import com.google.gson.annotations.SerializedName;
+import com.bluelinelabs.logansquare.annotation.JsonField;
+import com.bluelinelabs.logansquare.annotation.JsonObject;
 import org.parceler.Parcel;
@@ -11,11 +12,12 @@ import org.parceler.Parcel;
  * A label
  */
 @Parcel
+@JsonObject
 public class Label {
-    @SerializedName("color")
+    @JsonField(name = "color")
     String mColor;
-    @SerializedName("name")
+    @JsonField(name = "name")
     String mName;
     protected Label() {
@@ -31,10 +33,11 @@ public class Label {
         return mName;
     }
-    public @ColorInt int getColor() {
+    @ColorInt
+    public int getColor() {
         try {
             return Color.parseColor(mColor);
-        } catch (IllegalArgumentException e) {
+        } catch (Exception e) {
             return Color.TRANSPARENT;
         }
     }

app/src/main/java/com/commit451/gitlab/model/api/Member.java

 package com.commit451.gitlab.model.api;
-import com.google.gson.annotations.SerializedName;
+import com.bluelinelabs.logansquare.annotation.JsonField;
+import com.bluelinelabs.logansquare.annotation.JsonObject;
 import org.parceler.Parcel;
 @Parcel
+@JsonObject
 public class Member extends UserBasic {
-    @SerializedName("access_level")
+    @JsonField(name = "access_level")
     int mAccessLevel;
     public Member() {}

app/src/main/java/com/commit451/gitlab/model/api/MergeRequest.java

 package com.commit451.gitlab.model.api;
 import android.support.annotation.Nullable;
-import com.google.gson.annotations.SerializedName;
+import android.support.annotation.StringDef;
+import com.bluelinelabs.logansquare.annotation.JsonField;
+import com.bluelinelabs.logansquare.annotation.JsonObject;
 import org.parceler.Parcel;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 import java.util.Date;
 import java.util.List;
 @Parcel
+@JsonObject
 public class MergeRequest {
-    @SerializedName("id")
+
+    public static final String STATE_OPENED = "opened";
+    public static final String STATE_MERGED = "merged";
+    public static final String STATE_CLOSED = "closed";
+
+    @StringDef({STATE_OPENED, STATE_MERGED, STATE_CLOSED})
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface State {}
+
+    @JsonField(name = "id")
     long mId;
-    @SerializedName("iid")
+    @JsonField(name = "iid")
     long mIid;
-    @SerializedName("project_id")
+    @JsonField(name = "project_id")
     long mProjectId;
-    @SerializedName("title")
+    @JsonField(name = "title")
     String mTitle;
-    @SerializedName("description")
+    @JsonField(name = "description")
     String mDescription;
-    @SerializedName("state")
-    State mState;
-    @SerializedName("updated_at")
+    @JsonField(name = "state")
+    @State
+    String mState;
+    @JsonField(name = "updated_at")
     Date mUpdatedAt;
-    @SerializedName("created_at")
+    @JsonField(name = "created_at")
     Date mCreatedAt;
-    @SerializedName("target_branch")
+    @JsonField(name = "target_branch")
     String mTargetBranch;
-    @SerializedName("source_branch")
+    @JsonField(name = "source_branch")
     String mSourceBranch;
-    @SerializedName("upvotes")
+    @JsonField(name = "upvotes")
     long mUpvotes;
-    @SerializedName("downvotes")
+    @JsonField(name = "downvotes")
     long mDownvotes;
-    @SerializedName("author")
+    @JsonField(name = "author")
     UserBasic mAuthor;
-    @SerializedName("assignee")
+    @JsonField(name = "assignee")
     UserBasic mAssignee;
-    @SerializedName("source_project_id")
+    @JsonField(name = "source_project_id")
     long mSourceProjectId;
-    @SerializedName("target_project_id")
+    @JsonField(name = "target_project_id")
     long mTargetProjectId;
-    @SerializedName("labels")
+    @JsonField(name = "labels")
     List<String> mLabels;
-    @SerializedName("work_in_progress")
+    @JsonField(name = "work_in_progress")
     boolean mWorkInProgress;
-    @SerializedName("milestone")
+    @JsonField(name = "milestone")
     Milestone mMilestone;
-    @SerializedName("merge_when_build_succeeds")
+    @JsonField(name = "merge_when_build_succeeds")
     boolean mMergeWhenBuildSucceeds;
-    @SerializedName("merge_status")
+    @JsonField(name = "merge_status")
     String mMergeStatus;
-    @SerializedName("changes")
+    @JsonField(name = "changes")
     @Nullable
     List<Diff> mChanges;
@@ -79,7 +94,7 @@ public class MergeRequest {
         return mDescription;
     }
-    public State getState() {
+    public @State String getState() {
         return mState;
     }
@@ -166,13 +181,4 @@ public class MergeRequest {
     public int hashCode() {
         return (int) (mId ^ (mId >>> 32));
     }
-
-    public enum State {
-        @SerializedName("opened")
-        OPENED,
-        @SerializedName("merged")
-        MERGED,
-        @SerializedName("closed")
-        CLOSED
-    }
 }

app/src/main/java/com/commit451/gitlab/model/api/Milestone.java

@@ -4,7 +4,8 @@ import android.support.annotation.Nullable;
 import android.support.annotation.StringDef;
 import android.text.TextUtils;
-import com.google.gson.annotations.SerializedName;
+import com.bluelinelabs.logansquare.annotation.JsonField;
+import com.bluelinelabs.logansquare.annotation.JsonObject;
 import org.parceler.Parcel;
@@ -18,6 +19,7 @@ import java.util.Locale;
 import timber.log.Timber;
 @Parcel
+@JsonObject
 public class Milestone {
     public static final String STATE_ACTIVE = "active";
     public static final String STATE_CLOSED = "closed";
@@ -35,23 +37,23 @@ public class Milestone {
     public static final SimpleDateFormat DUE_DATE_FORMAT = new SimpleDateFormat("yyyy-MM-d", Locale.US);
-    @SerializedName("id")
+    @JsonField(name = "id")
     long mId;
-    @SerializedName("iid")
+    @JsonField(name = "iid")
     long mIid;
-    @SerializedName("project_id")
+    @JsonField(name = "project_id")
     long mProjectId;
-    @SerializedName("title")
+    @JsonField(name = "title")
     String mTitle;
-    @SerializedName("description")
+    @JsonField(name = "description")
     String mDescription;
-    @SerializedName("state")
+    @JsonField(name = "state")
     String mState;
-    @SerializedName("created_at")
+    @JsonField(name = "created_at")
     Date mCreatedAt;
-    @SerializedName("updated_at")
+    @JsonField(name = "updated_at")
     Date mUpdatedAt;
-    @SerializedName("due_date")
+    @JsonField(name = "due_date")
     String mDueDate;
     public Milestone() {}

app/src/main/java/com/commit451/gitlab/model/api/Note.java

 package com.commit451.gitlab.model.api;
-import com.google.gson.annotations.SerializedName;
+import android.support.annotation.StringDef;
+
+import com.bluelinelabs.logansquare.annotation.JsonField;
+import com.bluelinelabs.logansquare.annotation.JsonObject;
 import org.parceler.Parcel;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 import java.util.Date;
 @Parcel
+@JsonObject
 public class Note {
-    @SerializedName("id")
+
+    public static final String TYPE_ISSUE = "Issue";
+    public static final String TYPE_MERGE_REQUEST = "MergeRequest";
+
+    @StringDef({TYPE_ISSUE, TYPE_MERGE_REQUEST})
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface Type {}
+
+    @JsonField(name = "id")
     long mId;
-    @SerializedName("body")
+    @JsonField(name = "body")
     String mBody;
-    @SerializedName("author")
+    @JsonField(name = "author")
     UserBasic mAuthor;
-    @SerializedName("created_at")
+    @JsonField(name = "created_at")
     Date mCreatedAt;
-    @SerializedName("system")
+    @JsonField(name = "system")
     boolean mSystem;
-    @SerializedName("noteable_id")
+    @JsonField(name = "noteable_id")
     long mNoteableId;
-    @SerializedName("noteable_type")
-    Type mNoteableType;
-    @SerializedName("upvote")
+    @JsonField(name = "noteable_type")
+    @Type
+    String mNoteableType;
+    @JsonField(name = "upvote")
     boolean mUpvote;
-    @SerializedName("downvote")
+    @JsonField(name = "downvote")
     boolean mDownvote;
     public Note() {}
@@ -53,7 +68,7 @@ public class Note {
         return mNoteableId;
     }
-    public Type getNoteableType() {
+    public @Type String getNoteableType() {
         return mNoteableType;
     }
@@ -79,11 +94,4 @@ public class Note {
     public int hashCode() {
         return (int) (mId ^ (mId >>> 32));
     }
-
-    public enum Type {
-        @SerializedName("Issue")
-        ISSUE,
-        @SerializedName("MergeRequest")
-        MERGE_REQUEST
-    }
 }

app/src/main/java/com/commit451/gitlab/model/api/Project.java

@@ -3,7 +3,8 @@ package com.commit451.gitlab.model.api;
 import android.net.Uri;
 import android.support.annotation.Nullable;
-import com.google.gson.annotations.SerializedName;
+import com.bluelinelabs.logansquare.annotation.JsonField;
+import com.bluelinelabs.logansquare.annotation.JsonObject;
 import org.parceler.Parcel;
@@ -11,64 +12,65 @@ import java.util.Date;
 import java.util.List;
 @Parcel
+@JsonObject
 public class Project {
-    @SerializedName("id")
+    @JsonField(name = "id")
     long mId;
-    @SerializedName("description")
+    @JsonField(name = "description")
     String mDescription;
-    @SerializedName("default_branch")
+    @JsonField(name = "default_branch")
     String mDefaultBranch;
-    @SerializedName("tag_list")
+    @JsonField(name = "tag_list")
     List<String> mTagList;
-    @SerializedName("public")
+    @JsonField(name = "public")
     boolean mPublic;
-    @SerializedName("archived")
+    @JsonField(name = "archived")
     boolean mArchived;
-    @SerializedName("visibility_level")
+    @JsonField(name = "visibility_level")
     int mVisibilityLevel;
-    @SerializedName("ssh_url_to_repo")
+    @JsonField(name = "ssh_url_to_repo")
     String mSshUrlToRepo;
-    @SerializedName("http_url_to_repo")
+    @JsonField(name = "http_url_to_repo")
     String mHttpUrlToRepo;
-    @SerializedName("web_url")
+    @JsonField(name = "web_url")
     Uri mWebUrl;
-    @SerializedName("owner")
+    @JsonField(name = "owner")
     UserBasic mOwner;
-    @SerializedName("name")
+    @JsonField(name = "name")
     String mName;
-    @SerializedName("name_with_namespace")
+    @JsonField(name = "name_with_namespace")
     String mNameWithNamespace;
-    @SerializedName("path")
+    @JsonField(name = "path")
     String mPath;
-    @SerializedName("path_with_namespace")
+    @JsonField(name = "path_with_namespace")
     String mPathWithNamespace;
-    @SerializedName("issues_enabled")
+    @JsonField(name = "issues_enabled")
     boolean mIssuesEnabled;
-    @SerializedName("merge_requests_enabled")
+    @JsonField(name = "merge_requests_enabled")
     boolean mMergeRequestsEnabled;
-    @SerializedName("wiki_enabled")
+    @JsonField(name = "wiki_enabled")
     boolean mWikiEnabled;
-    @SerializedName("builds_enabled")
+    @JsonField(name = "builds_enabled")
     boolean mBuildEnabled;
-    @SerializedName("snippets_enabled")
+    @JsonField(name = "snippets_enabled")
     boolean mSnippetsEnabled;
-    @SerializedName("created_at")
+    @JsonField(name = "created_at")
     Date mCreatedAt;
-    @SerializedName("last_activity_at")
+    @JsonField(name = "last_activity_at")
     Date mLastActivityAt;
-    @SerializedName("creator_id")
+    @JsonField(name = "creator_id")
     long mCreatorId;
-    @SerializedName("namespace")
+    @JsonField(name = "namespace")
     ProjectNamespace mNamespace;
-    @SerializedName("forked_from_project")
+    @JsonField(name = "forked_from_project")
     ForkedFromProject mForkedFromProject;
-    @SerializedName("avatar_url")
+    @JsonField(name = "avatar_url")
     Uri mAvatarUrl;
-    @SerializedName("star_count")
+    @JsonField(name = "star_count")
     int mStarCount;
-    @SerializedName("forks_count")
+    @JsonField(name = "forks_count")
     int mForksCount;
-    @SerializedName("open_issues_count")
+    @JsonField(name = "open_issues_count")
     int mOpenIssuesCount;
     public Project() {}

app/src/main/java/com/commit451/gitlab/model/api/ProjectNamespace.java

 package com.commit451.gitlab.model.api;
-import com.google.gson.annotations.SerializedName;
-import org.parceler.Parcel;
-import android.net.Uri;
+import android.net.Uri;
+import com.bluelinelabs.logansquare.annotation.JsonField;
+import com.bluelinelabs.logansquare.annotation.JsonObject;
+import org.parceler.Parcel;
 import java.util.Date;
 @Parcel
+@JsonObject
 public class ProjectNamespace {
-    @SerializedName("id")
+    @JsonField(name = "id")
     long mId;
-    @SerializedName("name")
+    @JsonField(name = "name")
     String mName;
-    @SerializedName("path")
+    @JsonField(name = "path")
     String mPath;
-    @SerializedName("owner_id")
+    @JsonField(name = "owner_id")
     long mOwnerId;
-    @SerializedName("created_at")
+    @JsonField(name = "created_at")
     Date mCreatedAt;
-    @SerializedName("updated_at")
+    @JsonField(name = "updated_at")
     Date mUpdatedAt;
-    @SerializedName("description")
+    @JsonField(name = "description")
     String mDescription;
-    @SerializedName("avatar")
+    @JsonField(name = "avatar")
     Avatar mAvatar;
-    @SerializedName("public")
+    @JsonField(name = "public")
     boolean mPublic;
-    public ProjectNamespace() {}
+    public ProjectNamespace() {
+    }
     public long getId() {
         return mId;
@@ -83,11 +86,13 @@ public class ProjectNamespace {
     }
     @Parcel
+    @JsonObject
     public static class Avatar {
-        @SerializedName("url")
+        @JsonField(name = "url")
         Uri mUrl;
-        public Avatar() {}
+        public Avatar() {
+        }
         public Uri getUrl() {
             return mUrl;

app/src/main/java/com/commit451/gitlab/model/api/RepositoryCommit.java

 package com.commit451.gitlab.model.api;
-import com.google.gson.annotations.SerializedName;
-
+import com.bluelinelabs.logansquare.annotation.JsonField;
+import com.bluelinelabs.logansquare.annotation.JsonObject;
 import com.commit451.gitlab.util.ObjectUtil;
 import org.parceler.Parcel;
@@ -9,20 +9,21 @@ import org.parceler.Parcel;
 import java.util.Date;
 @Parcel
+@JsonObject
 public class RepositoryCommit {
-    @SerializedName("id")
+    @JsonField(name = "id")
     String mId;
-    @SerializedName("short_id")
+    @JsonField(name = "short_id")
     String mShortId;
-    @SerializedName("title")
+    @JsonField(name = "title")
     String mTitle;
-    @SerializedName("author_name")
+    @JsonField(name = "author_name")
     String mAuthorName;
-    @SerializedName("author_email")
+    @JsonField(name = "author_email")
     String mAuthorEmail;
-    @SerializedName("created_at")
+    @JsonField(name = "created_at")
     Date mCreatedAt;
-    @SerializedName("message")
+    @JsonField(name = "message")
     String mMessage;
     public RepositoryCommit() {}

app/src/main/java/com/commit451/gitlab/model/api/RepositoryFile.java

 package com.commit451.gitlab.model.api;
-import com.google.gson.annotations.SerializedName;
+import com.bluelinelabs.logansquare.annotation.JsonField;
+import com.bluelinelabs.logansquare.annotation.JsonObject;
 import org.parceler.Parcel;
 @Parcel
+@JsonObject
 public class RepositoryFile {
-    @SerializedName("file_name")
+    @JsonField(name = "file_name")
     String mFileName;
-    @SerializedName("file_path")
+    @JsonField(name = "file_path")
     String mFilePath;
-    @SerializedName("size")
+    @JsonField(name = "size")
     long mSize;
-    @SerializedName("encoding")
+    @JsonField(name = "encoding")
     String mEncoding;
-    @SerializedName("content")
+    @JsonField(name = "content")
     String mContent;
-    @SerializedName("ref")
+    @JsonField(name = "ref")
     String mRef;
-    @SerializedName("blob_id")
+    @JsonField(name = "blob_id")
     String mBlobId;
-    @SerializedName("commit_id")
+    @JsonField(name = "commit_id")
     String mCommitId;
-    @SerializedName("last_commit_id")
+    @JsonField(name = "last_commit_id")
     String mLastCommitId;
     public RepositoryFile() {}

app/src/main/java/com/commit451/gitlab/model/api/RepositoryTreeObject.java

 package com.commit451.gitlab.model.api;
 import android.net.Uri;
+import android.support.annotation.StringDef;
+import com.bluelinelabs.logansquare.annotation.JsonField;
+import com.bluelinelabs.logansquare.annotation.JsonObject;
 import com.commit451.gitlab.R;
-import com.google.gson.annotations.SerializedName;
 import org.parceler.Parcel;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
 @Parcel
+@JsonObject
 public class RepositoryTreeObject {
-    @SerializedName("id")
+
+    public static final String TYPE_FOLDER = "tree";
+    public static final String TYPE_REPO = "submodule";
+    public static final String TYPE_FILE = "blob";
+
+    @StringDef({TYPE_FOLDER, TYPE_REPO, TYPE_FILE})
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface Type {
+    }
+
+    @JsonField(name = "id")
     String mId;
-    @SerializedName("name")
+    @JsonField(name = "name")
     String mName;
-    @SerializedName("type")
-    Type mType;
-    @SerializedName("mode")
+    @JsonField(name = "type")
+    @Type
+    String mType;
+    @JsonField(name = "mode")
     String mMode;
     public RepositoryTreeObject() {}
@@ -28,7 +45,7 @@ public class RepositoryTreeObject {
         return mName;
     }
-    public Type getType() {
+    public @Type String getType() {
         return mType;
     }
@@ -41,11 +58,11 @@ public class RepositoryTreeObject {
             return R.drawable.ic_unknown_24dp;
         }
         switch (mType) {
-            case FILE:
+            case TYPE_FILE:
                 return R.drawable.ic_file_24dp;
-            case FOLDER:
+            case TYPE_FOLDER:
                 return R.drawable.ic_folder_24dp;
-            case REPO:
+            case TYPE_REPO:
                 return R.drawable.ic_repo_24dp;
         }
@@ -60,13 +77,4 @@ public class RepositoryTreeObject {
                 .appendPath(mName)
                 .build();
     }
-
-    public enum Type {
-        @SerializedName("tree")
-        FOLDER,
-        @SerializedName("submodule")
-        REPO,
-        @SerializedName("blob")
-        FILE
-    }
 }

app/src/main/java/com/commit451/gitlab/model/api/Runner.java

 package com.commit451.gitlab.model.api;
-import com.google.gson.annotations.SerializedName;
+import com.bluelinelabs.logansquare.annotation.JsonField;
+import com.bluelinelabs.logansquare.annotation.JsonObject;
 import org.parceler.Parcel;
@@ -8,17 +9,18 @@ import org.parceler.Parcel;
  * A runner. It runs builds. yeah
  */
 @Parcel
+@JsonObject
 public class Runner {
-    @SerializedName("id")
+    @JsonField(name = "id")
     long mId;
-    @SerializedName("description")
+    @JsonField(name = "description")
     String mDescription;
-    @SerializedName("active")
+    @JsonField(name = "active")
     boolean mActive;
-    @SerializedName("is_shared")
+    @JsonField(name = "is_shared")
     boolean mIsShared;
-    @SerializedName("name")
+    @JsonField(name = "name")
     String mName;
     public long getId() {

app/src/main/java/com/commit451/gitlab/model/api/Snippet.java

+package com.commit451.gitlab.model.api;
+
+import com.bluelinelabs.logansquare.annotation.JsonField;
+import com.bluelinelabs.logansquare.annotation.JsonObject;
+
+import org.parceler.Parcel;
+
+import java.util.Date;
+
+/**
+ * A snippet!
+ */
+@Parcel
+@JsonObject
+public class Snippet {
+    @JsonField(name = "id")
+    long mId;
+    @JsonField(name = "title")
+    String mTitle;
+    @JsonField(name = "file_name")
+    String mFileName;
+    @JsonField(name = "author")
+    Author mAuthor;
+    @JsonField(name = "expires_at")
+    Date mExpiresAt;
+    @JsonField(name = "updated_at")
+    Date mUpdatedAt;
+    @JsonField(name = "created_at")
+    Date mCreatedAt;
+
+    protected Snippet() {
+        //for json
+    }
+
+    public long getId() {
+        return mId;
+    }
+
+    public String getTitle() {
+        return mTitle;
+    }
+
+    public String getFileName() {
+        return mFileName;
+    }
+
+    @Parcel
+    @JsonObject
+    public static class Author {
+        @JsonField(name = "id")
+        long mId;
+        @JsonField(name = "username")
+        String mUsername;
+        @JsonField(name = "email")
+        String mEmail;
+        @JsonField(name = "name")
+        String mName;
+        @JsonField(name = "state")
+        String mState;
+        @JsonField(name = "created_at")
+        Date mCreatedAt;
+
+        protected Author() {
+            //for json
+        }
+    }
+}