Fixed conflicts

app/assets/javascripts/application.js

@@ -12,10 +12,7 @@
 /*= require jquery.atwho */
 /*= require jquery.scrollTo */
 /*= require jquery.turbolinks */
-<<<<<<< HEAD
 /*= require jquery.tablesorter */
-=======
->>>>>>> 68162ba900f1b9003fa3d07613333f201be8154a
 /*= require turbolinks */
 /*= require autosave */
 /*= require bootstrap/affix */
@@ -132,11 +129,8 @@
 
   window.addEventListener("hashchange", shiftWindow);
 
-<<<<<<< HEAD
   $.timeago.settings.allowFuture = true;
 
-=======
->>>>>>> 68162ba900f1b9003fa3d07613333f201be8154a
   window.onload = function() {
     if (location.hash) {
       return setTimeout(shiftWindow, 100);
@@ -238,7 +232,6 @@
     });
     $document.off("click", '.js-confirm-danger');
     $document.on("click", '.js-confirm-danger', function(e) {
-<<<<<<< HEAD
       var btn, form, text, warningMessage;
       e.preventDefault();
       btn = $(e.target);
@@ -248,14 +241,6 @@
       return new ConfirmDangerModal(form, text, {
         warningMessage: warningMessage
       });
-=======
-      var btn, form, text;
-      e.preventDefault();
-      btn = $(e.target);
-      text = btn.data("confirm-danger-message");
-      form = btn.closest("form");
-      return new ConfirmDangerModal(form, text);
->>>>>>> 68162ba900f1b9003fa3d07613333f201be8154a
     });
     $document.on('click', 'button', function() {
       return $(this).blur();

app/assets/javascripts/confirm_danger_modal.js

 (function() {
   this.ConfirmDangerModal = (function() {
-<<<<<<< HEAD
     function ConfirmDangerModal(form, text, arg) {
       var project_path, submit, warningMessage;
       warningMessage = (arg != null ? arg : {}).warningMessage;
@@ -9,12 +8,6 @@
       if (warningMessage) {
         $('.js-warning-text').html(warningMessage);
       }
-=======
-    function ConfirmDangerModal(form, text) {
-      var project_path, submit;
-      this.form = form;
-      $('.js-confirm-text').text(text || '');
->>>>>>> 68162ba900f1b9003fa3d07613333f201be8154a
       $('.js-confirm-danger-input').val('');
       $('#modal-confirm-danger').modal('show');
       project_path = $('.js-confirm-danger-match').text();

app/assets/javascripts/dispatcher.js

@@ -171,7 +171,6 @@
           break;
         case 'search:show':
           new Search();
-<<<<<<< HEAD
           break;
         case 'projects:mirrors:show':
         case 'projects:mirrors:update':
@@ -179,8 +178,6 @@
           break;
         case 'admin:emails:show':
           new AdminEmailSelect();
-=======
->>>>>>> 68162ba900f1b9003fa3d07613333f201be8154a
       }
       switch (path.first()) {
         case 'admin':

app/assets/javascripts/groups_select.js

@@ -5,20 +5,14 @@
     function GroupsSelect() {
       $('.ajax-groups-select').each((function(_this) {
         return function(i, select) {
-<<<<<<< HEAD
           var skip_group, url;
           skip_group = $(select).data("skip-group");
           url = $(select).data("url");
-=======
-          var skip_ldap;
-          skip_ldap = $(select).hasClass('skip_ldap');
->>>>>>> 68162ba900f1b9003fa3d07613333f201be8154a
           return $(select).select2({
             placeholder: "Search for a group",
             multiple: $(select).hasClass('multiselect'),
             minimumInputLength: 0,
             query: function(query) {
-<<<<<<< HEAD
               return $.ajax({
                 url: url,
                 data: {
@@ -38,13 +32,6 @@
                   }
                   data.results.push(group);
                 }
-=======
-              return Api.groups(query.term, skip_ldap, function(groups) {
-                var data;
-                data = {
-                  results: groups
-                };
->>>>>>> 68162ba900f1b9003fa3d07613333f201be8154a
                 return query.callback(data);
               });
             },

app/assets/javascripts/lib/utils/common_utils.js

@@ -35,12 +35,9 @@
         }
       });
     };
-<<<<<<< HEAD
     gl.utils.capitalize = function(str) {
       return str[0].toUpperCase() + str.slice(1);
     };
-=======
->>>>>>> 68162ba900f1b9003fa3d07613333f201be8154a
     gl.utils.getPagePath = function() {
       return $('body').data('page').split(':')[0];
     };

app/assets/javascripts/merge_request_widget.js

@@ -61,7 +61,6 @@
               callback = function() {
                 return merge_request_widget.mergeInProgress(deleteSourceBranch);
               };
-<<<<<<< HEAD
               return setTimeout(callback, 1000);
             }
           };
@@ -80,9 +79,6 @@
               return setTimeout(merge_request_widget.rebaseInProgress, 1000);
             } else {
               return location.reload();
-=======
-              return setTimeout(callback, 2000);
->>>>>>> 68162ba900f1b9003fa3d07613333f201be8154a
             }
           };
         })(this),

app/assets/javascripts/notes.js

@@ -181,11 +181,7 @@
             _this.last_fetched_at = data.last_fetched_at;
             _this.setPollingInterval(data.notes.length);
             return $.each(notes, function(i, note) {
-<<<<<<< HEAD
               if (note.discussion_with_diff_html != null) {
-=======
-              if (note.discussion_html != null) {
->>>>>>> 68162ba900f1b9003fa3d07613333f201be8154a
                 return _this.renderDiscussionNote(note);
               } else {
                 return _this.renderNote(note);
@@ -205,7 +201,7 @@
     Increase @pollingInterval up to 120 seconds on every function call,
     if `shouldReset` has a truthy value, 'null' or 'undefined' the variable
     will reset to @basePollingInterval.
-    
+
     Note: this function is used to gradually increase the polling interval
     if there aren't new notes coming from the server
      */
@@ -227,7 +223,7 @@
 
     /*
     Render note in main comments area.
-    
+
     Note: for rendering inline notes use renderDiscussionNote
      */
 
@@ -269,7 +265,7 @@
 
     /*
     Render note in discussion area.
-    
+
     Note: for rendering inline notes use renderDiscussionNote
      */
 
@@ -291,20 +287,12 @@
         discussionContainer = $(".notes[data-discussion-id='" + note.original_discussion_id + "']");
       }
       if (discussionContainer.length === 0) {
-<<<<<<< HEAD
         row.after(note.discussion_html);
-=======
-        row.after(note.diff_discussion_html);
->>>>>>> 68162ba900f1b9003fa3d07613333f201be8154a
         row.next().find(".note").remove();
         discussionContainer = $(".notes[data-discussion-id='" + note.discussion_id + "']");
         discussionContainer.append(note_html);
         if ($('body').attr('data-page').indexOf('projects:merge_request') === 0) {
-<<<<<<< HEAD
           $('ul.main-notes-list').append(note.discussion_with_diff_html).syntaxHighlight();
-=======
-          $('ul.main-notes-list').append(note.discussion_html).syntaxHighlight();
->>>>>>> 68162ba900f1b9003fa3d07613333f201be8154a
         }
       } else {
         discussionContainer.append(note_html);
@@ -316,7 +304,7 @@
 
     /*
     Called in response the main target form has been successfully submitted.
-    
+
     Removes any errors.
     Resets text and preview.
     Resets buttons.
@@ -341,7 +329,7 @@
 
     /*
     Shows the main form and does some setup on it.
-    
+
     Sets some hidden fields in the form.
      */
 
@@ -361,7 +349,7 @@
 
     /*
     General note form setup.
-    
+
     deactivates the submit button when text is empty
     hides the preview button when text is empty
     setup GFM auto complete
@@ -378,7 +366,7 @@
 
     /*
     Called in response to the new note form being submitted
-    
+
     Adds new note to list.
      */
 
@@ -393,7 +381,7 @@
 
     /*
     Called in response to the new note form being submitted
-    
+
     Adds new note to list.
      */
 
@@ -405,7 +393,7 @@
 
     /*
     Called in response to the edit note form being submitted
-    
+
     Updates the current note field.
      */
 
@@ -422,7 +410,7 @@
 
     /*
     Called in response to clicking the edit note link
-    
+
     Replaces the note text with the note edit form
     Adds a data attribute to the form with the original content of the note for cancellations
      */
@@ -462,7 +450,7 @@
 
     /*
     Called in response to clicking the edit note link
-    
+
     Hides edit form and restores the original note text to the editor textarea.
      */
 
@@ -484,7 +472,7 @@
 
     /*
     Called in response to deleting a note of any kind.
-    
+
     Removes the actual note from view.
     Removes the whole discussion if the last note is being removed.
      */
@@ -510,7 +498,7 @@
 
     /*
     Called in response to clicking the delete attachment link
-    
+
     Removes the attachment wrapper view, including image tag if it exists
     Resets the note editing form
      */
@@ -527,7 +515,7 @@
 
     /*
     Called when clicking on the "reply" button for a diff line.
-    
+
     Shows the note form below the notes.
      */
 
@@ -543,9 +531,9 @@
 
     /*
     Shows the diff or discussion form and does some setup on it.
-    
+
     Sets some hidden fields in the form.
-    
+
     Note: dataHolder must have the "discussionId", "lineCode", "noteableType"
     and "noteableId" data attributes set.
      */
@@ -569,7 +557,7 @@
 
     /*
     Called when clicking on the "add a comment" button on the side of a diff line.
-    
+
     Inserts a temporary row for the form below the line.
     Sets up the form and shows it.
      */
@@ -617,7 +605,7 @@
 
     /*
     Called in response to "cancel" on a diff note form.
-    
+
     Shows the reply button again.
     Removes the form and if necessary it's temporary row.
      */
@@ -646,7 +634,7 @@
 
     /*
     Called after an attachment file has been selected.
-    
+
     Updates the file name for the selected attachment.
      */
 

app/assets/javascripts/project_new.js

@@ -16,20 +16,12 @@
 
     ProjectNew.prototype.toggleSettings = function() {
       this._showOrHide('#project_builds_enabled', '.builds-feature');
-<<<<<<< HEAD
       this._showOrHide('#project_merge_requests_enabled', '.merge-requests-feature');
       return this._showOrHide('#project_issues_enabled', '.issues-feature');
     };
 
     ProjectNew.prototype.toggleSettingsOnclick = function() {
       return $('#project_builds_enabled, #project_merge_requests_enabled, #project_issues_enabled').on('click', this.toggleSettings);
-=======
-      return this._showOrHide('#project_merge_requests_enabled', '.merge-requests-feature');
-    };
-
-    ProjectNew.prototype.toggleSettingsOnclick = function() {
-      return $('#project_builds_enabled, #project_merge_requests_enabled').on('click', this.toggleSettings);
->>>>>>> 68162ba900f1b9003fa3d07613333f201be8154a
     };
 
     ProjectNew.prototype._showOrHide = function(checkElement, container) {

app/assets/javascripts/users_select.js

@@ -185,7 +185,6 @@
       $('.ajax-users-select').each((function(_this) {
         return function(i, select) {
           var firstUser, showAnyUser, showEmailUser, showNullUser;
-<<<<<<< HEAD
           _this.skipLdap = $(select).hasClass('skip_ldap');
           _this.projectId = $(select).data('project-id');
           _this.groupId = $(select).data('group-id');
@@ -193,12 +192,6 @@
           _this.pushCodeToProtectedBranches = $(select).data('push-code-to-protected-branches');
           _this.authorId = $(select).data('author-id');
           _this.skipUsers = $(select).data('skip-users');
-=======
-          _this.projectId = $(select).data('project-id');
-          _this.groupId = $(select).data('group-id');
-          _this.showCurrentUser = $(select).data('current-user');
-          _this.authorId = $(select).data('author-id');
->>>>>>> 68162ba900f1b9003fa3d07613333f201be8154a
           showNullUser = $(select).data('null-user');
           showAnyUser = $(select).data('any-user');
           showEmailUser = $(select).data('email-user');
@@ -329,16 +322,11 @@
           active: true,
           project_id: this.projectId,
           group_id: this.groupId,
-<<<<<<< HEAD
           skip_ldap: this.skipLdap,
           current_user: this.showCurrentUser,
           push_code_to_protected_branches: this.pushCodeToProtectedBranches,
           author_id: this.authorId,
           skip_users: this.skipUsers
-=======
-          current_user: this.showCurrentUser,
-          author_id: this.authorId
->>>>>>> 68162ba900f1b9003fa3d07613333f201be8154a
         },
         dataType: "json"
       }).done(function(users) {

app/views/projects/branches/index.html.haml

@@ -27,14 +27,9 @@
                 = sort_title_recently_updated
               = link_to filter_branches_path(sort: 'last_updated') do
                 = sort_title_oldest_updated
-<<<<<<< HEAD
-
-  = render 'projects/commits/mirror_status'
-
-=======
         = link_to new_namespace_project_branch_path(@project.namespace, @project), class: 'btn btn-create' do
           New branch
->>>>>>> 68162ba900f1b9003fa3d07613333f201be8154a
+  = render 'projects/commits/mirror_status'
   - if @branches.any?
     %ul.content-list.all-branches
       - @branches.each do |branch|