Merge branch 'ide' of gitlab.com:gitlab-org/gitlab-ce into ide

app/assets/javascripts/gl_dropdown.js

@@ -206,7 +206,7 @@ GitLabDropdown = (function() {
 
   CURSOR_SELECT_SCROLL_PADDING = 5;
 
-  FILTER_INPUT = '.dropdown-input .dropdown-input-field';
+  FILTER_INPUT = '.dropdown-input .dropdown-input-field:not(.dropdown-no-filter)';
 
   function GitLabDropdown(el1, options) {
     var searchFields, selector, self;

app/assets/javascripts/project.js

@@ -118,9 +118,15 @@ import Cookies from 'js-cookie';
             e.preventDefault();
             if ($('input[name="ref"]').length) {
               var $form = $dropdown.closest('form');
+
+              var $visit = $dropdown.data('visit');
+              var shouldVisit = typeof $visit === 'undefined' ? true : $visit;
               var action = $form.attr('action');
               var divider = action.indexOf('?') === -1 ? '?' : '&';
-              gl.utils.visitUrl(action + '' + divider + '' + $form.serialize());
+              if(shouldVisit){
+                gl.utils.visitUrl(action + '' + divider + '' + $form.serialize());  
+              }
+              
             }
           }
         });

app/assets/javascripts/repo/index.js

@@ -10,7 +10,8 @@ import RepoTabs from './repo_tabs.vue';
 import RepoFileButtons from './repo_file_buttons.vue';
 import RepoBinaryViewer from './repo_binary_viewer.vue';
 import { repoEditorLoader } from './repo_editor';
-import RepoMiniMixin from './repo_mini_mixin';
+import RepoMixin from './repo_mixin';
+import PopupDialog from '../vue_shared/components/popup_dialog.vue'
 
 function initRepo() {
   const repo = document.getElementById('repo');
@@ -36,9 +37,10 @@ function initRepo() {
           <repo-binary-viewer/>
         </div>
         <repo-commit-section/>
+        <popup-dialog :open="dialog.open" kind="warning" title="Are you sure?" body="Are you sure you want to discard your changes?" @toggle="dialogToggled" @submit="dialogSubmitted"></popup-dialog>
       </div>
     `,
-    mixins: [RepoMiniMixin],
+    mixins: [RepoMixin],
     components: {
       'repo-sidebar': RepoSidebar,
       'repo-tabs': RepoTabs,
@@ -46,7 +48,19 @@ function initRepo() {
       'repo-binary-viewer': RepoBinaryViewer,
       'repo-editor': repoEditorLoader,
       'repo-commit-section': RepoCommitSection,
+      'popup-dialog': PopupDialog,
     },
+
+    methods: {
+      dialogToggled(toggle) {
+        this.dialog.open = toggle;
+      },
+
+      dialogSubmitted(status) {
+        this.dialog.open = false;
+        this.dialog.status = status;
+      }
+    }
   });
 
   const editButton = document.getElementById('editable-mode');

app/assets/javascripts/repo/repo_commit_section.vue

@@ -2,10 +2,13 @@
 /* global Flash */
 import Store from './repo_store';
 import Api from '../api';
+import RepoMixin from './repo_mixin'
 
 const RepoCommitSection = {
   data: () => Store,
 
+  mixins: [RepoMixin],
+
   methods: {
     makeCommit() {
       // see https://docs.gitlab.com/ce/api/commits.html#create-a-commit-with-multiple-files-and-actions
@@ -36,14 +39,6 @@ const RepoCommitSection = {
       });
     },
   },
-
-  computed: {
-    changedFiles() {
-      const changedFileList = this.openedFiles
-      .filter(file => file.changed);
-      return changedFileList;
-    },
-  },
 };
 
 export default RepoCommitSection;

app/assets/javascripts/repo/repo_edit_button.js

 import Vue from 'vue';
 import Store from './repo_store';
+import RepoMixin from './repo_mixin'
 
 export default class RepoEditButton {
   constructor(el) {
@@ -9,10 +10,11 @@ export default class RepoEditButton {
   initVue(el) {
     this.vue = new Vue({
       el,
+      mixins: [RepoMixin],
       data: () => Store,
       computed: {
         buttonLabel() {
-          return this.editMode ? 'Read-only mode' : 'Edit mode';
+          return this.editMode ? 'Cancel edit' : 'Edit';
         },
 
         buttonIcon() {
@@ -21,9 +23,25 @@ export default class RepoEditButton {
       },
       methods: {
         editClicked() {
+          console.log('thiscf', this.changedFiles)
+          if(this.changedFiles.length) {
+            this.dialog.open = true;
+            return;
+          }
           this.editMode = !this.editMode;
         },
       },
+
+      watch: {
+        dialog: {
+          handler(obj) {
+            if(obj.status) {
+              obj.status = false;
+            }
+          },
+          deep: true,
+        }
+      }
     });
   }
 }

app/assets/javascripts/repo/repo_file_buttons.vue

 <script>
 import Store from './repo_store';
 import Helper from './repo_helper';
-import RepoMiniMixin from './repo_mini_mixin';
+import RepoMixin from './repo_mixin';
 
 const RepoFileButtons = {
   data: () => Store,
 
-  mixins: [RepoMiniMixin],
+  mixins: [RepoMixin],
 
   computed: {
     editableBorder() {

app/assets/javascripts/repo/repo_mini_mixin.js → app/assets/javascripts/repo/repo_mixin.js

 import Store from './repo_store';
 
-const RepoMiniMixin = {
+const RepoMixin = {
   computed: {
     isMini() {
       return !!Store.openedFiles.length;
     },
+
+    changedFiles() {
+      const changedFileList = this.openedFiles
+      .filter(file => file.changed);
+      return changedFileList;
+    },
   },
 };
 
-export default RepoMiniMixin;
+export default RepoMixin;

app/assets/javascripts/repo/repo_sidebar.vue

@@ -6,10 +6,10 @@ import RepoPreviousDirectory from './repo_prev_directory.vue';
 import RepoFileOptions from './repo_file_options.vue';
 import RepoFile from './repo_file.vue';
 import RepoLoadingFile from './repo_loading_file.vue';
-import RepoMiniMixin from './repo_mini_mixin';
+import RepoMixin from './repo_mixin';
 
 const RepoSidebar = {
-  mixins: [RepoMiniMixin],
+  mixins: [RepoMixin],
   components: {
     'repo-file-options': RepoFileOptions,
     'repo-previous-directory': RepoPreviousDirectory,

app/assets/javascripts/repo/repo_store.js

@@ -27,7 +27,12 @@ const RepoStore = {
   minTabSize: 30,
   tabsOverflow: 41,
   submitCommitsLoading: false,
-  binaryLoaded: false,
+  binaryLoaded:false,
+  dialog: {
+    open: false,
+    title: '',
+    status: false,
+  },
   activeFile: RepoHelper.getDefaultActiveFile(),
   activeFileIndex: 0,
   activeLine: 0,

app/assets/javascripts/repo/repo_tabs.vue

@@ -2,10 +2,10 @@
 import Vue from 'vue';
 import Store from './repo_store';
 import RepoTab from './repo_tab.vue';
-import RepoMiniMixin from './repo_mini_mixin';
+import RepoMixin from './repo_mixin';
 
 const RepoTabs = {
-  mixins: [RepoMiniMixin],
+  mixins: [RepoMixin],
 
   components: {
     'repo-tab': RepoTab,

app/assets/javascripts/vue_shared/components/popup_dialog.vue

+<script>
+const PopupDialog = {
+  name: 'popup-dialog',
+
+  props: {
+    open: Boolean,
+    title: String,
+    body: String,
+    kind: {
+      type: String,
+      default: 'primary',
+    },
+    closeButtonLabel: {
+      type: String,
+      default: 'Cancel',
+    },
+    primaryButtonLabel: {
+      type: String,
+      default: 'Save changes',
+    },
+  },
+
+  computed: {
+    typeOfClass() {
+      const className = `btn-${this.kind}`;
+      let returnObj = {};
+      returnObj[className] = true;
+      return returnObj;
+    }
+  },
+
+  methods: {
+    close() {
+      this.$emit('toggle', false);
+    },
+
+    yesClick() {
+      this.$emit('submit', true);
+    },
+
+    noClick() {
+      this.$emit('submit', false);
+    }
+  }
+};
+
+export default PopupDialog;
+</script>
+<template>
+<div class="modal popup-dialog" tabindex="-1" v-show="open" role="dialog">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" @click="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+        <h4 class="modal-title">{{this.title}}</h4>
+      </div>
+      <div class="modal-body">
+        <p>{{this.body}}</p>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal" @click="noClick">{{closeButtonLabel}}</button>
+        <button type="button" class="btn" :class="typeOfClass" @click="yesClick">{{primaryButtonLabel}}</button>
+      </div>
+    </div>
+  </div>
+</div>
+</template>
\ No newline at end of file

app/assets/stylesheets/pages/repo.scss

@@ -7,6 +7,22 @@
   transition: opacity .5s;
 }
 
+.modal.popup-dialog {
+  display: block;
+
+
+  @media (min-width: 992px) {
+    .modal-dialog {
+      width: 600px;
+      margin: 30px auto;
+    }
+  }
+}
+
+.project-refs-form, .project-refs-target-form {
+  display: inline-block;
+}
+
 .fade-enter,
 .fade-leave-to /* .fade-leave-active in <2.1.8 */ {
   opacity: 0;
@@ -55,7 +71,6 @@
     }
 
     #tabs {
-      height: 61px;
       border-bottom: 1px solid $white-normal;
       padding-left: 0;
       margin-bottom: 0;
@@ -65,14 +80,6 @@
       overflow-y: hidden;
       overflow-x: auto;
 
-      &.overflown {
-        height: 61px;
-
-        li {
-          padding: 20px 18px;
-        }
-      }
-
       li {
         animation: swipeRightAppear ease-in 0.1s;
         animation-iteration-count: 1;
@@ -80,9 +87,10 @@
         list-style-type: none;
         background: $gray-normal;
         display: inline-block;
-        padding: 20px 18px;
+        padding: 10px 18px;
         border-right: 1px solid $border-color;
         white-space: nowrap;
+        border-radius: 3px 3px 0 0;
 
         &.active {
           background: $white-light;

app/controllers/projects_controller.rb

@@ -220,13 +220,29 @@ class ProjectsController < Projects::ApplicationController
   end
 
   def refs
-    branches = BranchesFinder.new(@repository, params).execute.map(&:name)
+    find_refs = params['find']
+
+    find_branches = true
+    find_tags = true
+    find_commits = true
+    
+    if !find_refs.nil?
+      find_branches = find_refs.include? 'branches'
+      find_tags = find_refs.include? 'tags'
+      find_commits = find_refs.include? 'commits'
+    end
 
-    options = {
-      s_('RefSwitcher|Branches') => branches.take(100)
-    }
+    branches = []
+    options = {}
+
+    if find_branches
+      branches = BranchesFinder.new(@repository, params).execute.map(&:name)
+      options = {
+        s_('RefSwitcher|Branches') => branches.take(100)
+      }
+    end
 
-    unless @repository.tag_count.zero?
+    if @repository.tag_count.nonzero? && find_tags
       tags = TagsFinder.new(@repository, params).execute.map(&:name)
 
       options[s_('RefSwitcher|Tags')] = tags.take(100)
@@ -234,7 +250,7 @@ class ProjectsController < Projects::ApplicationController
 
     # If reference is commit id - we should add it to branch/tag selectbox
     ref = Addressable::URI.unescape(params[:ref])
-    if ref && options.flatten(2).exclude?(ref) && ref =~ /\A[0-9a-zA-Z]{6,52}\z/
+    if ref && options.flatten(2).exclude?(ref) && ref =~ /\A[0-9a-zA-Z]{6,52}\z/ && find_commits
       options['Commits'] = [ref]
     end
 

app/helpers/dropdowns_helper.rb

@@ -48,11 +48,11 @@ module DropdownsHelper
     end
   end
 
-  def dropdown_title(title, back: false)
+  def dropdown_title(title, options: {})
     content_tag :div, class: "dropdown-title" do
       title_output = ""
 
-      if back
+      if options.fetch(:back, false)
         title_output << content_tag(:button, class: "dropdown-title-button dropdown-menu-back", aria: { label: "Go back" }, type: "button") do
           icon('arrow-left')
         end
@@ -60,14 +60,25 @@ module DropdownsHelper
 
       title_output << content_tag(:span, title)
 
-      title_output << content_tag(:button, class: "dropdown-title-button dropdown-menu-close", aria: { label: "Close" }, type: "button") do
-        icon('times', class: 'dropdown-menu-close-icon')
+      if options.fetch(:close, true)
+        title_output << content_tag(:button, class: "dropdown-title-button dropdown-menu-close", aria: { label: "Close" }, type: "button") do
+          icon('times', class: 'dropdown-menu-close-icon')
+        end
       end
 
       title_output.html_safe
     end
   end
 
+  def dropdown_input(placeholder, input_id: nil)
+    content_tag :div, class: "dropdown-input" do
+      filter_output = search_field_tag input_id, nil, class: "dropdown-input-field dropdown-no-filter", placeholder: placeholder, autocomplete: 'off'
+      filter_output << icon('times', class: "dropdown-input-clear js-dropdown-input-clear", role: "button")
+
+      filter_output.html_safe
+    end
+  end
+
   def dropdown_filter(placeholder, search_id: nil)
     content_tag :div, class: "dropdown-input" do
       filter_output = search_field_tag search_id, nil, class: "dropdown-input-field", placeholder: placeholder, autocomplete: 'off'

app/views/projects/tree/_tree_header.html.haml

 .tree-ref-container
   .tree-ref-holder
     = render 'shared/ref_switcher', destination: 'tree', path: @path
+    =icon('long-arrow-right', title: 'to target branch')
+    = render 'shared/target_switcher', destination: 'tree', path: @path
 
   - if !show_new_repo?
     = render 'projects/tree/old_tree_header'

app/views/shared/_target_switcher.html.haml

+- dropdown_toggle_text = @ref || @project.default_branch
+= form_tag nil, method: :get, class: "project-refs-target-form" do
+  = hidden_field_tag :destination, destination
+  - if defined?(path)
+    = hidden_field_tag :path, path
+  - @options && @options.each do |key, value|
+    = hidden_field_tag key, value, id: nil
+  .dropdown
+    = dropdown_toggle dropdown_toggle_text, { toggle: "dropdown", selected: dropdown_toggle_text, ref: @ref, refs_url: refs_project_path(@project, find: ['branches']), field_name: 'ref', submit_form_on_click: true, visit: false }, { toggle_class: "js-project-refs-dropdown" }
+    %ul.dropdown-menu.dropdown-menu-selectable.git-revision-dropdown{ class: ("dropdown-menu-align-right" if local_assigns[:align_right]) }
+      %li
+        = dropdown_title _("Create a new branch")
+      %li
+        = dropdown_input _("Create a new branch")
+      %li
+        = dropdown_title _("Select existing branch"), options: {close: false}
+      %li
+        = dropdown_filter _("Search branches and tags")
+        = dropdown_content
+        = dropdown_loading