From cc0663140fb2d54f7f9962c9c27c82e2eb5116df Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 9 May 2018 10:55:37 +0100
Subject: Fixed empty editors in the IDE

Closes #46153
---
 app/assets/javascripts/ide/lib/common/model.js    | 6 +++---
 app/assets/javascripts/ide/stores/actions/file.js | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'app/assets/javascripts')

diff --git a/app/assets/javascripts/ide/lib/common/model.js b/app/assets/javascripts/ide/lib/common/model.js
index 016dcda1fa1..b1e43a1e38c 100644
--- a/app/assets/javascripts/ide/lib/common/model.js
+++ b/app/assets/javascripts/ide/lib/common/model.js
@@ -14,12 +14,12 @@ export default class Model {
       (this.originalModel = this.monaco.editor.createModel(
         head ? head.content : this.file.raw,
         undefined,
-        new this.monaco.Uri(null, null, `original/${this.file.key}`),
+        new this.monaco.Uri(null, null, `original/${this.path}`),
       )),
       (this.model = this.monaco.editor.createModel(
         this.content,
         undefined,
-        new this.monaco.Uri(null, null, this.file.key),
+        new this.monaco.Uri(null, null, this.path),
       )),
     );
     if (this.file.mrChange) {
@@ -27,7 +27,7 @@ export default class Model {
         (this.baseModel = this.monaco.editor.createModel(
           this.file.baseRaw,
           undefined,
-          new this.monaco.Uri(null, null, `target/${this.file.path}`),
+          new this.monaco.Uri(null, null, `target/${this.path}`),
         )),
       );
     }
diff --git a/app/assets/javascripts/ide/stores/actions/file.js b/app/assets/javascripts/ide/stores/actions/file.js
index 3ac9b9222ca..b6baa693104 100644
--- a/app/assets/javascripts/ide/stores/actions/file.js
+++ b/app/assets/javascripts/ide/stores/actions/file.js
@@ -196,6 +196,8 @@ export const unstageChange = ({ commit }, path) => {
 };
 
 export const openPendingTab = ({ commit, getters, dispatch, state }, { file, keyPrefix }) => {
+  if (getters.activeFile && getters.activeFile.key === `${keyPrefix}-${file.key}`) return false;
+
   state.openFiles.forEach(f => eventHub.$emit(`editor.update.model.dispose.${f.key}`));
 
   commit(types.ADD_PENDING_TAB, { file, keyPrefix });
-- 
cgit v1.2.1


From 5c8f31eb7ee9a4993b41a72d34afddd43831517e Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 9 May 2018 17:07:02 +0100
Subject: Hide merge request option in IDE when merge requests are disabled

Closes #45698
---
 app/assets/javascripts/ide/components/commit_sidebar/actions.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'app/assets/javascripts')

diff --git a/app/assets/javascripts/ide/components/commit_sidebar/actions.vue b/app/assets/javascripts/ide/components/commit_sidebar/actions.vue
index 6a5790c9dff..b4f3778d946 100644
--- a/app/assets/javascripts/ide/components/commit_sidebar/actions.vue
+++ b/app/assets/javascripts/ide/components/commit_sidebar/actions.vue
@@ -1,5 +1,5 @@
 <script>
-import { mapActions, mapState } from 'vuex';
+import { mapActions, mapState, mapGetters } from 'vuex';
 import { sprintf, __ } from '~/locale';
 import * as consts from '../../stores/modules/commit/constants';
 import RadioGroup from './radio_group.vue';
@@ -10,6 +10,7 @@ export default {
   },
   computed: {
     ...mapState(['currentBranchId', 'changedFiles', 'stagedFiles']),
+    ...mapGetters(['currentProject']),
     commitToCurrentBranchText() {
       return sprintf(
         __('Commit to %{branchName} branch'),
@@ -52,6 +53,7 @@ export default {
       :show-input="true"
     />
     <radio-group
+      v-if="currentProject.merge_requests_enabled"
       :value="$options.commitToNewBranchMR"
       :label="__('Create a new branch and merge request')"
       :show-input="true"
-- 
cgit v1.2.1


From 0cc349f083b1436033608f4bec42dcd8d6c0d605 Mon Sep 17 00:00:00 2001
From: Paul Slaughter <pslaughter@gitlab.com>
Date: Wed, 9 May 2018 17:57:01 +0000
Subject: refactor "deploy_keys" to use axios

---
 .../javascripts/deploy_keys/service/index.js       | 33 +++++++---------------
 1 file changed, 10 insertions(+), 23 deletions(-)

(limited to 'app/assets/javascripts')

diff --git a/app/assets/javascripts/deploy_keys/service/index.js b/app/assets/javascripts/deploy_keys/service/index.js
index 194e95e4fca..9dc3b21f6f6 100644
--- a/app/assets/javascripts/deploy_keys/service/index.js
+++ b/app/assets/javascripts/deploy_keys/service/index.js
@@ -1,37 +1,24 @@
-import Vue from 'vue';
-import VueResource from 'vue-resource';
-
-Vue.use(VueResource);
+import axios from '~/lib/utils/axios_utils';
 
 export default class DeployKeysService {
   constructor(endpoint) {
-    this.endpoint = endpoint;
-
-    this.resource = Vue.resource(
-      `${this.endpoint}{/id}`,
-      {},
-      {
-        enable: {
-          method: 'PUT',
-          url: `${this.endpoint}{/id}/enable`,
-        },
-        disable: {
-          method: 'PUT',
-          url: `${this.endpoint}{/id}/disable`,
-        },
-      },
-    );
+    this.axios = axios.create({
+      baseURL: endpoint,
+    });
   }
 
   getKeys() {
-    return this.resource.get().then(response => response.json());
+    return this.axios.get()
+      .then(response => response.data);
   }
 
   enableKey(id) {
-    return this.resource.enable({ id }, {});
+    return this.axios.put(`${id}/enable`)
+      .then(response => response.data);
   }
 
   disableKey(id) {
-    return this.resource.disable({ id }, {});
+    return this.axios.put(`${id}/disable`)
+      .then(response => response.data);
   }
 }
-- 
cgit v1.2.1


From 0421fbcdada7bdc746979c420706f99836fafb46 Mon Sep 17 00:00:00 2001
From: Paul Slaughter <pslaughter@gitlab.com>
Date: Wed, 9 May 2018 21:21:06 +0000
Subject: refactor 'cycle_analytics' to use axios

---
 .../cycle_analytics/cycle_analytics_bundle.js      |  2 --
 .../cycle_analytics/cycle_analytics_service.js     | 30 ++++++++++++----------
 2 files changed, 17 insertions(+), 15 deletions(-)

(limited to 'app/assets/javascripts')

diff --git a/app/assets/javascripts/cycle_analytics/cycle_analytics_bundle.js b/app/assets/javascripts/cycle_analytics/cycle_analytics_bundle.js
index 87f8854f940..1c43fc3cdc7 100644
--- a/app/assets/javascripts/cycle_analytics/cycle_analytics_bundle.js
+++ b/app/assets/javascripts/cycle_analytics/cycle_analytics_bundle.js
@@ -82,7 +82,6 @@ export default () => {
 
         this.service
           .fetchCycleAnalyticsData(fetchOptions)
-          .then(resp => resp.json())
           .then((response) => {
             this.store.setCycleAnalyticsData(response);
             this.selectDefaultStage();
@@ -116,7 +115,6 @@ export default () => {
             stage,
             startDate: this.startDate,
           })
-          .then(resp => resp.json())
           .then((response) => {
             this.isEmptyStage = !response.events.length;
             this.store.setStageEvents(response.events, stage);
diff --git a/app/assets/javascripts/cycle_analytics/cycle_analytics_service.js b/app/assets/javascripts/cycle_analytics/cycle_analytics_service.js
index f496c38208d..4cf416c50e5 100644
--- a/app/assets/javascripts/cycle_analytics/cycle_analytics_service.js
+++ b/app/assets/javascripts/cycle_analytics/cycle_analytics_service.js
@@ -1,16 +1,20 @@
-import Vue from 'vue';
-import VueResource from 'vue-resource';
-
-Vue.use(VueResource);
+import axios from '~/lib/utils/axios_utils';
 
 export default class CycleAnalyticsService {
   constructor(options) {
-    this.requestPath = options.requestPath;
-    this.cycleAnalytics = Vue.resource(this.requestPath);
+    this.axios = axios.create({
+      baseURL: options.requestPath,
+    });
   }
 
   fetchCycleAnalyticsData(options = { startDate: 30 }) {
-    return this.cycleAnalytics.get({ cycle_analytics: { start_date: options.startDate } });
+    return this.axios
+      .get('', {
+        params: {
+          'cycle_analytics[start_date]': options.startDate,
+        },
+      })
+      .then(x => x.data);
   }
 
   fetchStageData(options) {
@@ -19,12 +23,12 @@ export default class CycleAnalyticsService {
       startDate,
     } = options;
 
-    return Vue.http.get(`${this.requestPath}/events/${stage.name}.json`, {
-      params: {
-        cycle_analytics: {
-          start_date: startDate,
+    return this.axios
+      .get(`events/${stage.name}.json`, {
+        params: {
+          'cycle_analytics[start_date]': startDate,
         },
-      },
-    });
+      })
+      .then(x => x.data);
   }
 }
-- 
cgit v1.2.1


From 0e15b493f6286a26dc88961c16b25a9402dfecd8 Mon Sep 17 00:00:00 2001
From: James Ramsay <james@jramsay.com.au>
Date: Wed, 9 May 2018 13:18:23 -0400
Subject: Fix outdated web ide copy

---
 app/assets/javascripts/ide/components/ide.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/assets/javascripts')

diff --git a/app/assets/javascripts/ide/components/ide.vue b/app/assets/javascripts/ide/components/ide.vue
index d479b705e35..6c373a92776 100644
--- a/app/assets/javascripts/ide/components/ide.vue
+++ b/app/assets/javascripts/ide/components/ide.vue
@@ -110,8 +110,8 @@ export default {
                     Welcome to the GitLab IDE
                   </h4>
                   <p>
-                    You can select a file in the left sidebar to begin
-                    editing and use the right sidebar to commit your changes.
+                    Select a file from the left sidebar to begin editing.
+                    Afterwards, you'll be able to commit your changes.
                   </p>
                 </div>
               </div>
-- 
cgit v1.2.1