Drop deprecated syntax sugar use

Author: takezoe

src/main/scala/gitbucket/gist/controller/GistController.scala

@@ -8,7 +8,6 @@ import gitbucket.core.controller.ControllerBase
 import gitbucket.core.service.AccountService
 import gitbucket.core.service.RepositoryService.RepositoryInfo
 import gitbucket.core.util._
-import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util.Implicits._
 import gitbucket.core.view.helpers._
 
@@ -194,9 +193,7 @@ trait GistControllerBase extends ControllerBase {
       JGitUtil.getCommitLog(git, "master") match {
         case Right((revisions, hasNext)) => {
           val commits = revisions.map { revision =>
-            defining(JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(revision.id))){ revCommit =>
-              (revision, JGitUtil.getDiffs(git, None, revision.id, true, false))
-            }
+            (revision, JGitUtil.getDiffs(git, None, revision.id, true, false))
           }
 
           val gist = getGist(userName, repoName).get
@@ -228,9 +225,8 @@ trait GistControllerBase extends ControllerBase {
 
         if(gist.mode == "PUBLIC" || context.loginAccount.exists(x => x.isAdmin || x.userName == userName)){
           JGitUtil.getFileList(git, revision, ".").find(_.name == fileName).map { file =>
-            defining(JGitUtil.getContentFromId(git, file.id, false).get){ bytes =>
-              RawData(FileUtil.getMimeType(file.name, bytes), bytes)
-            }
+            val bytes = JGitUtil.getContentFromId(git, file.id, false).get
+            RawData(FileUtil.getMimeType(file.name, bytes), bytes)
           } getOrElse NotFound()
         } else Unauthorized()
       }

src/main/scala/gitbucket/gist/util/GistAuthenticator.scala

@@ -2,7 +2,6 @@ package gitbucket.gist.util
 
 import gitbucket.core.controller.ControllerBase
 import gitbucket.core.service.AccountService
-import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util.Implicits._
 
 /**
@@ -14,14 +13,13 @@ trait GistEditorAuthenticator { self: ControllerBase with AccountService =>
 
   private def authenticate(action: => Any) = {
     {
-      defining(request.paths){ paths =>
-        if(context.loginAccount.map { loginAccount =>
-          loginAccount.isAdmin || loginAccount.userName == paths(1) || getGroupsByUserName(loginAccount.userName).contains(paths(1))
-        }.getOrElse(false)){
-          action
-        } else {
-          Unauthorized()
-        }
+      val paths = request.paths
+      if(context.loginAccount.map { loginAccount =>
+        loginAccount.isAdmin || loginAccount.userName == paths(1) || getGroupsByUserName(loginAccount.userName).contains(paths(1))
+      }.getOrElse(false)){
+        action
+      } else {
+        Unauthorized()
       }
     }
   }