Repo API FIX.repo-api-fix

3 files changed, 18 insertions, 6 deletions

diff --git a/app/assets/javascripts/api.js b/app/assets/javascripts/api.js
index 76b724e1bcb..d49f9aba1c6 100644
--- a/app/assets/javascripts/api.js
+++ b/app/assets/javascripts/api.js
@@ -14,6 +14,18 @@ const Api = {
   issuableTemplatePath: '/:namespace_path/:project_path/templates/:type/:key',
   usersPath: '/api/:version/users.json',
   commitPath: '/api/:version/projects/:id/repository/commits',
+  branchPath: '/api/:version/projects/:id/repository/branches/:branch',
+
+  branch(id, branchName) {
+    const url = Api.buildUrl(Api.branchPath)
+      .replace(':id', id)
+      .replace(':branch', branchName)
+    return Api.wrapAjaxCall({
+      url,
+      type: 'GET',
+      contentType: 'application/json; charset=utf-8',
+    });
+  },
 
   group(groupId, callback) {
     const url = Api.buildUrl(Api.groupPath)
diff --git a/app/assets/javascripts/repo/services/repo_service.js b/app/assets/javascripts/repo/services/repo_service.js
index 8fba928e456..756b1068a4e 100644
--- a/app/assets/javascripts/repo/services/repo_service.js
+++ b/app/assets/javascripts/repo/services/repo_service.js
@@ -13,11 +13,7 @@ const RepoService = {
   richExtensionRegExp: /md/,
 
   checkCurrentBranchIsCommitable() {
-    const url = Store.service.refsUrl;
-    return axios.get(url, { params: {
-      ref: Store.currentBranch,
-      search: Store.currentBranch,
-    } });
+    return Api.branch(Store.projectId, Store.currentBranch);
   },
 
   getRaw(url) {
diff --git a/app/assets/javascripts/repo/stores/repo_store.js b/app/assets/javascripts/repo/stores/repo_store.js
index fe5d6618c03..55af0a2160e 100644
--- a/app/assets/javascripts/repo/stores/repo_store.js
+++ b/app/assets/javascripts/repo/stores/repo_store.js
@@ -70,11 +70,15 @@ const RepoStore = {
     RepoStore.service.checkCurrentBranchIsCommitable()
       .then((data) => {
         // you shouldn't be able to make commits on commits or tags.
+        console.log('data',data);
         const { Branches, Commits, Tags } = data.data;
         if (Branches && Branches.length) RepoStore.isCommitable = true;
         if (Commits && Commits.length) RepoStore.isCommitable = false;
         if (Tags && Tags.length) RepoStore.isCommitable = false;
-      }).catch(() => Flash('Failed to check if branch can be committed to.'));
+      }).catch((a,b,c,d,e) => {
+        console.log('e',a,b,c,d,e)
+        Flash('Failed to check if branch can be committed to.')
+      });
   },
 
   addFilesToDirectory(inDirectory, currentList, newList) {