Merge branch 'master' into discussions

Conflicts:
	app/assets/stylesheets/main.scss
	app/models/project.rb
	app/views/notes/_common_form.html.haml
	app/views/notes/_per_line_form.html.haml
	lib/gitlab/markdown.rb
	spec/models/note_spec.rb

app/assets/javascripts/gfm_auto_complete.js.coffee

@@ -1,52 +1,38 @@
 # Creates the variables for setting up GFM auto-completion
 
 window.GitLab ?= {}
-GitLab.GfmAutoComplete ?= {}
-
-# Emoji
-data      = []
-template  = "<li data-value='${insert}'>${name} <img alt='${name}' height='20' src='${image}' width='20' /></li>"
-GitLab.GfmAutoComplete.Emoji = {data, template}
-
-# Team Members
-data      = []
-url     = '';
-params  = {private_token: '', page: 1}
-GitLab.GfmAutoComplete.Members = {data, url, params}
-
-# Add GFM auto-completion to all input fields, that accept GFM input.
-GitLab.GfmAutoComplete.setup = ->
-  input = $('.js-gfm-input')
-
+GitLab.GfmAutoComplete =
   # Emoji
-  input.atWho ':',
-    data: GitLab.GfmAutoComplete.Emoji.data,
-    tpl: GitLab.GfmAutoComplete.Emoji.template
+  Emoji:
+    data: []
+    template: '<li data-value="${insert}">${name} <img alt="${name}" height="20" src="${image}" width="20" /></li>'
 
   # Team Members
-  input.atWho '@', (query, callback) ->
-    (getMoreMembers = ->
-      $.getJSON(GitLab.GfmAutoComplete.Members.url, GitLab.GfmAutoComplete.Members.params)
-        .success (members) ->
-          # pick the data we need
-          newMembersData = $.map(members, (m) -> m.name )
+  Members:
+    data: []
+    url: ''
+    params:
+      private_token: ''
+    template: '<li data-value="${username}">${username} <small>${name}</small></li>'
 
-          # add the new page of data to the rest
-          $.merge(GitLab.GfmAutoComplete.Members.data, newMembersData)
+  # Add GFM auto-completion to all input fields, that accept GFM input.
+  setup: ->
+    input = $('.js-gfm-input')
 
-          # show the pop-up with a copy of the current data
-          callback(GitLab.GfmAutoComplete.Members.data[..])
+    # Emoji
+    input.atWho ':',
+      data: @Emoji.data
+      tpl: @Emoji.template
 
-          # are we past the last page?
-          if newMembersData.length is 0
-            # set static data and stop callbacks
-            input.atWho '@',
-              data: GitLab.GfmAutoComplete.Members.data
-              callback: null
-          else
-            # get next page
-            getMoreMembers()
+    # Team Members
+    input.atWho '@',
+      tpl: @Members.template
+      callback: (query, callback) =>
+        request_params = $.extend({}, @Members.params, query: query)
+        $.getJSON(@Members.url, request_params).done (members) =>
+          new_members_data = $.map(members, (m) ->
+            username: m.username,
+            name: m.name
+          )
+          callback(new_members_data)
 
-      # so the next request gets the next page
-      GitLab.GfmAutoComplete.Members.params.page += 1
-    ).call()

app/assets/javascripts/issues.js

@@ -1,43 +1,3 @@
-function switchToNewIssue(){
-  $(".issues_content").hide("fade", { direction: "left" }, 150, function(){
-    $('select#issue_assignee_id').chosen();
-    $('select#issue_milestone_id').chosen();
-    $("#new_issue_dialog").show("fade", { direction: "right" }, 150);
-    $('.top-tabs .add_new').hide();
-    disableButtonIfEmptyField("#issue_title", ".save-btn");
-    GitLab.GfmAutoComplete.setup();
-  });
-}
-
-function switchToEditIssue(){
-  $(".issues_content").hide("fade", { direction: "left" }, 150, function(){
-    $('select#issue_assignee_id').chosen();
-    $('select#issue_milestone_id').chosen();
-    $("#edit_issue_dialog").show("fade", { direction: "right" }, 150);
-    $('.add_new').hide();
-    disableButtonIfEmptyField("#issue_title", ".save-btn");
-    GitLab.GfmAutoComplete.setup();
-  });
-}
-
-function switchFromNewIssue(){
-  backToIssues();
-}
-
-function switchFromEditIssue(){
-  backToIssues();
-}
-
-function backToIssues(){
-  $("#edit_issue_dialog, #new_issue_dialog").hide("fade", { direction: "right" }, 150, function(){
-    $(".issues_content").show("fade", { direction: "left" }, 150, function() { 
-      $("#edit_issue_dialog").html("");
-      $("#new_issue_dialog").html("");
-      $('.add_new').show();
-    });
-  });
-}
-
 function initIssuesSearch() { 
   var href       = $('#issue_search_form').attr('action');
   var last_terms = '';
@@ -76,23 +36,15 @@ function issuesPage(){
     $(this).closest("form").submit();
   });
 
-  $("#new_issue_link").click(function(){
-    updateNewIssueURL();
-  });
-
-  $('body').on('ajax:success', '.close_issue, .reopen_issue, #new_issue', function(){
+  $('body').on('ajax:success', '.close_issue, .reopen_issue', function(){
     var t = $(this),
         totalIssues,
-        reopen = t.hasClass('reopen_issue'),
-        newIssue = false;
-    if( this.id == 'new_issue' ){
-      newIssue = true;
-    }
-    $('.issue_counter, #new_issue').each(function(){
+        reopen = t.hasClass('reopen_issue');
+    $('.issue_counter').each(function(){
       var issue = $(this);
       totalIssues = parseInt( $(this).html(), 10 );
 
-      if( newIssue || ( reopen && issue.closest('.main_menu').length ) ){
+      if( reopen && issue.closest('.main_menu').length ){
         $(this).html( totalIssues+1 );
       }else {
         $(this).html( totalIssues-1 );
@@ -126,20 +78,3 @@ function issuesCheckChanged() {
     $('.issues_filters').show();
   }
 }
-
-function updateNewIssueURL(){
-  var new_issue_link = $("#new_issue_link");
-  var milestone_id = $("#milestone_id").val();
-  var assignee_id = $("#assignee_id").val();
-  var new_href = "";
-  if(milestone_id){
-    new_href = "issue[milestone_id]=" + milestone_id + "&";
-  }
-  if(assignee_id){
-    new_href = new_href + "issue[assignee_id]=" + assignee_id;
-  }
-  if(new_href.length){
-    new_href = new_issue_link.attr("href") + "?" + new_href;
-    new_issue_link.attr("href", new_href);
-  }
-};

app/assets/javascripts/main.js.coffee

@@ -7,6 +7,18 @@ window.slugify = (text) ->
 window.ajaxGet = (url) ->
   $.ajax({type: "GET", url: url, dataType: "script"})
 
+window.errorMessage = (message) ->
+  ehtml = $("<p>")
+  ehtml.addClass("error_message")
+  ehtml.html(message)
+  ehtml
+
+window.split = (val) ->
+  return val.split( /,\s*/ )
+
+window.extractLast = (term) ->
+  return split( term ).pop()
+
 # Disable button if text field is empty
 window.disableButtonIfEmptyField = (field_selector, button_selector) ->
   field = $(field_selector)

app/assets/javascripts/merge_requests.js

@@ -26,6 +26,12 @@ var MergeRequest = {
           self.showState(data.state);
         }, "json");
       }
+
+      if(self.opts.ci_enable){
+        $.get(self.opts.url_to_ci_check, function(data){
+          self.showCiState(data.status);
+        }, "json");
+      }
     },
 
   initTabs:
@@ -79,6 +85,11 @@ var MergeRequest = {
       $(".automerge_widget." + state).show();
     },
 
+  showCiState:
+    function(state){
+      $(".ci_widget").hide();
+      $(".ci_widget.ci-" + state).show();
+    },
 
   loadDiff:
     function() { 

app/assets/javascripts/projects.js.coffee

@@ -18,10 +18,3 @@ $ ->
   # Ref switcher
   $('.project-refs-select').on 'change', ->
     $(@).parents('form').submit()
-
-class @GraphNav
-  @init: ->
-    $('.graph svg').css 'position', 'relative'
-    $('body').bind 'keyup', (e) ->
-      $('.graph svg').animate(left: '+=400') if e.keyCode is 37 # left
-      $('.graph svg').animate(left: '-=400') if e.keyCode is 39 # right