Merge branch 'master' into monthly-revision

Conflicts: doc/release/monthly.md

Merge branch 'master' into monthly-revision
Conflicts: doc/release/monthly.md
Job van der Voort
2 parents db7f0738 172ad962
Showing 69 changed files with 705 additions and 300 deletions Show diff stats
CHANGELOG
Gemfile
Gemfile.lock
README.md
app/assets/images/ui-icons_222222_256x240.png
app/assets/images/ui-icons_454545_256x240.png
app/assets/javascripts/dispatcher.js.coffee
app/assets/javascripts/notes.js.coffee
app/assets/stylesheets/generic/files.scss
app/controllers/admin/projects_controller.rb
app/controllers/projects/edit_tree_controller.rb
app/controllers/projects/notes_controller.rb
app/finders/notes_finder.rb
app/helpers/commits_helper.rb
app/helpers/projects_helper.rb
app/helpers/tree_helper.rb
app/models/milestone.rb
app/models/note.rb
app/models/project.rb
app/services/git_push_service.rb
+v 6.9.0
+  - Store Rails cache data in the Redis `cache:gitlab` namespace
+  - Adjust MySQL limits for existing installations
+  - Add db index on project_id+iid column. This prevents duplicate on iid (During migration duplicates will be removed)
+  - Markdown preview or diff during editing via web editor (Evgeniy Sokovikov)
+  - Give the Rails cache its own Redis namespace
+  - Add ability to set different ssh host, if different from http/https
+  - Fix syntax highlighting for code comments blocks
+  - Improve comments loading logic
+  - Stop refreshing comments when the tab is hidden
+
 v 6.8.0
   - Ability to at mention users that are participating in issue and merge req. discussion
   - Enabled GZip Compression for assets in example Nginx, make sure that Nginx is compiled with --with-http_gzip_static_module flag (this is default in Ubuntu)
@@ -17,7 +28,6 @@ v 6.8.0
   - Fix download link for huge MR diffs
   - Expose event and mergerequest timestamps in API
   - Fix emails on push service when only one commit is pushed
-  - Store Rails cache data in the Redis `cache:gitlab` namespace
 v 6.7.3
   - Fix the merge notification email not being sent (Pierre de La Morinerie)
@@ -71,6 +71,7 @@ gem &quot;carrierwave&quot;
 # for aws storage
 gem "fog", "~> 1.14", group: :aws
+gem "unf", group: :aws
 # Authorization
 gem "six"
@@ -82,6 +83,9 @@ gem &quot;seed-fu&quot;
 gem "redcarpet",     "~> 2.2.2"
 gem "github-markup"
+# Diffs
+gem 'diffy', '~> 3.0.3'
+
 # Asciidoc to HTML
 gem  "asciidoctor"
@@ -157,8 +161,8 @@ gem &#39;jquery-turbolinks&#39;
 gem 'select2-rails'
 gem 'jquery-atwho-rails', "~> 0.3.3"
-gem "jquery-rails",     "2.1.3"
-gem "jquery-ui-rails",  "2.0.2"
+gem "jquery-rails"
+gem "jquery-ui-rails"
 gem "raphael-rails", "~> 2.1.2"
 gem 'bootstrap-sass', '~> 3.0'
 gem "font-awesome-rails", '~> 3.2'
@@ -232,4 +236,4 @@ end
 group :production do
   gem "gitlab_meta", '6.0'
-end
 \ No newline at end of file
+end
@@ -34,7 +34,6 @@ GEM
       rake (>= 0.8.7)
     arel (4.0.2)
     asciidoctor (0.1.4)
-    atomic (1.1.16)
     awesome_print (1.2.0)
     axiom-types (0.0.5)
       descendants_tracker (~> 0.0.1)
@@ -101,6 +100,7 @@ GEM
     devise-async (0.8.0)
       devise (>= 2.2, < 3.2)
     diff-lcs (1.2.5)
+    diffy (3.0.3)
     docile (1.1.1)
     dotenv (0.9.0)
     email_spec (1.5.0)
@@ -247,15 +247,14 @@ GEM
       rake
     jasmine-core (2.0.0.rc5)
     jquery-atwho-rails (0.3.3)
-    jquery-rails (2.1.3)
-      railties (>= 3.1.0, < 5.0)
-      thor (~> 0.14)
+    jquery-rails (3.1.0)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
     jquery-turbolinks (2.0.1)
       railties (>= 3.1.0)
       turbolinks
-    jquery-ui-rails (2.0.2)
-      jquery-rails
-      railties (>= 3.1.0)
+    jquery-ui-rails (4.2.1)
+      railties (>= 3.2.16)
     json (1.8.1)
     jwt (0.1.8)
       multi_json (>= 1.5)
@@ -280,7 +279,7 @@ GEM
     mime-types (1.25.1)
     mini_portile (0.5.3)
     minitest (4.7.5)
-    multi_json (1.9.2)
+    multi_json (1.9.3)
     multi_xml (0.5.5)
     multipart-post (1.2.0)
     mysql2 (0.3.11)
@@ -375,7 +374,7 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     raindrops (0.12.0)
-    rake (10.1.1)
+    rake (10.3.1)
     raphael-rails (2.1.2)
     rb-fsevent (0.9.3)
     rb-inotify (0.9.2)
@@ -502,9 +501,8 @@ GEM
       daemons (>= 1.0.9)
       eventmachine (>= 1.0.0)
       rack (>= 1.0.0)
-    thor (0.18.1)
-    thread_safe (0.3.1)
-      atomic (>= 1.1.7, < 2)
+    thor (0.19.1)
+    thread_safe (0.3.3)
     tilt (1.4.1)
     timers (1.1.0)
     tinder (1.9.3)
@@ -531,6 +529,9 @@ GEM
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     underscore-rails (1.4.4)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.6)
     unicorn (4.6.3)
       kgio (~> 2.6)
       rack
@@ -574,6 +575,7 @@ DEPENDENCIES
   default_value_for (~> 3.0.0)
   devise (= 3.0.4)
   devise-async (= 0.8.0)
+  diffy (~> 3.0.3)
   email_spec
   email_validator (~> 1.4.0)
   enumerize
@@ -603,9 +605,9 @@ DEPENDENCIES
   httparty
   jasmine (= 2.0.0.rc5)
   jquery-atwho-rails (~> 0.3.3)
-  jquery-rails (= 2.1.3)
+  jquery-rails
   jquery-turbolinks
-  jquery-ui-rails (= 2.0.2)
+  jquery-ui-rails
   kaminari (~> 0.15.1)
   launchy
   letter_opener
@@ -659,6 +661,7 @@ DEPENDENCIES
   turbolinks
   uglifier
   underscore-rails (~> 1.4.4)
+  unf
   unicorn (~> 4.6.3)
   unicorn-worker-killer
   version_sorter
@@ -29,11 +29,11 @@
 * [GitLab.com](https://www.gitlab.com/) includes information about [subscriptions](https://www.gitlab.com/subscription/), [consultancy](https://www.gitlab.com/consultancy/), the [community](https://www.gitlab.com/community/) and the [hosted GitLab Cloud](https://www.gitlab.com/cloud/).
-* [GitLab Enterprise Edition](https://www.gitlab.com/gitlab-ce/) offers additional features that are useful for larger organizations (100+ users).
+* [GitLab Enterprise Edition](https://www.gitlab.com/gitlab-ee/) offers additional features aimed at larger organizations.
 * [GitLab CI](https://www.gitlab.com/gitlab-ci/) is a continuous integration (CI) server that is easy to integrate with GitLab.
-* Unofficial third-party [iPhone app](http://gitlabcontrol.com/) and [Android app](https://play.google.com/store/apps/details?id=com.bd.gitlab&hl=en) for GitLab
+* Unofficial third-party [iPhone app](http://gitlabcontrol.com/)m [Android app](https://play.google.com/store/apps/details?id=com.bd.gitlab&hl=en) and [command line client](https://github.com/drewblessing/gitlab-cli) for GitLab.
 ### Requirements
@@ -59,7 +59,7 @@ class Dispatcher
   initHighlight: ->
     $('.highlight pre code').each (i, e) ->
-      hljs.highlightBlock(e)
       $(e).html($.map($(e).html().split("\n"), (line, i) ->
-        "<div class='line' id='LC" + (i + 1) + "'>" + line + "</div>"
+        "<span class='line' id='LC" + (i + 1) + "'>" + line + "</span>"
       ).join("\n"))
+      hljs.highlightBlock(e)
 class Notes
   @interval: null
-  constructor: (notes_url, note_ids) ->
+  constructor: (notes_url, note_ids, last_fetched_at) ->
     @notes_url = notes_url
     @notes_url = gon.relative_url_root + @notes_url if gon.relative_url_root?
     @note_ids = note_ids
+    @last_fetched_at = last_fetched_at
     @initRefresh()
     @setupMainTargetNoteForm()
     @cleanBinding()
@@ -49,6 +50,9 @@ class Notes
     # hide diff note form
     $(document).on "click", ".js-close-discussion-note-form", @cancelDiscussionForm
+    # fetch notes when tab becomes visible
+    $(document).on "visibilitychange", @visibilityChange
+
   cleanBinding: ->
     $(document).off "ajax:success", ".js-main-target-form"
     $(document).off "ajax:success", ".js-discussion-note-form"
@@ -62,6 +66,7 @@ class Notes
     $(document).off "click", ".js-choose-note-attachment-button"
     $(document).off "click", ".js-discussion-reply-button"
     $(document).off "click", ".js-add-diff-note-button"
+    $(document).off "visibilitychange"
   initRefresh: ->
@@ -71,14 +76,16 @@ class Notes
     , 15000
   refresh: ->
-    @getContent()
+    @getContent() unless document.hidden
   getContent: ->
     $.ajax
       url: @notes_url
+      data: "last_fetched_at=" + @last_fetched_at
       dataType: "json"
       success: (data) =>
         notes = data.notes
+        @last_fetched_at = data.last_fetched_at
         $.each notes, (i, note) =>
           @renderNote(note)
@@ -450,4 +457,10 @@ class Notes
     filename = $(this).val().replace(/^.*[\\\/]/, "")
     form.find(".js-attachment-filename").text filename
+  ###
+  Called when the tab visibility changes
+  ###
+  visibilityChange: =>
+    @refresh()
+
 @Notes = Notes
@@ -26,6 +26,10 @@
       margin-top: -5px;
     }
+    .left-options {
+      margin-top: -3px;
+    }
+
     .file_name {
       color: $style_color;
       font-size: 14px;
@@ -12,6 +12,7 @@ class Admin::ProjectsController &lt; Admin::ApplicationController
     @projects = @projects.with_push if params[:with_push].present?
     @projects = @projects.abandoned if params[:abandoned].present?
     @projects = @projects.search(params[:name]) if params[:name].present?
+    @projects = @projects.sort(@sort = params[:sort])
     @projects = @projects.includes(:namespace).order("namespaces.path, projects.name ASC").page(params[:page]).per(20)
   end
@@ -26,6 +26,18 @@ class Projects::EditTreeController &lt; Projects::BaseTreeController
     end
   end
+  def preview
+    @content = params[:content]
+    #FIXME workaround https://github.com/gitlabhq/gitlabhq/issues/5936
+    @content += "\n" if @blob.data.end_with?("\n")
+
+    diffy = Diffy::Diff.new(@blob.data, @content, diff: '-U 3',
+                            include_diff_info: true)
+    @diff = Gitlab::DiffParser.new(diffy.diff.scan(/.*\n/))
+
+    render layout: false
+  end
+
   private
   def blob
@@ -5,9 +5,10 @@ class Projects::NotesController &lt; Projects::ApplicationController
   before_filter :authorize_admin_note!, only: [:update, :destroy]
   def index
+    current_fetched_at = Time.now.to_i
     @notes = NotesFinder.new.execute(project, current_user, params)
-    notes_json = { notes: [] }
+    notes_json = { notes: [], last_fetched_at: current_fetched_at }
     @notes.each do |note|
       notes_json[:notes] << {
 class NotesFinder
+  FETCH_OVERLAP = 5.seconds
+
   def execute(project, current_user, params)
     target_type = params[:target_type]
     target_id   = params[:target_id]
+    # Default to 0 to remain compatible with old clients
+    last_fetched_at = Time.at(params.fetch(:last_fetched_at, 0).to_i)
-    case target_type
+    notes = case target_type
     when "commit"
       project.notes.for_commit_id(target_id).not_inline.fresh
     when "issue"
@@ -12,6 +16,11 @@ class NotesFinder
       project.merge_requests.find(target_id).mr_and_commit_notes.inc_author.fresh
     when "snippet"
       project.snippets.find(target_id).notes.fresh
+    else
+      raise 'invalid target_type'
     end
+
+    # Use overlapping intervals to avoid worrying about race conditions
+    notes.where('updated_at > ?', last_fetched_at - FETCH_OVERLAP)
   end
 end
@@ -16,9 +16,10 @@ module CommitsHelper
   end
   def each_diff_line(diff, index)
-    Gitlab::DiffParser.new(diff).each do |full_line, type, line_code, line_new, line_old|
-      yield(full_line, type, line_code, line_new, line_old)
-    end
+    Gitlab::DiffParser.new(diff.diff.lines.to_a, diff.new_path)
+      .each do |full_line, type, line_code, line_new, line_old|
+        yield(full_line, type, line_code, line_new, line_old)
+      end
   end
   def each_diff_line_near(diff, index, expected_line_code)
@@ -163,7 +163,7 @@ module ProjectsHelper
   end
   def repository_size(project = nil)
-    "#{(project || @project).repository.size} MB"
+    "#{(project || @project).repository_size} MB"
   rescue
     # In order to prevent 500 error
     # when application cannot allocate memory
@@ -91,4 +91,12 @@ module TreeHelper
   def leave_edit_message
     "Leave edit mode?\nAll unsaved changes will be lost."
   end
+
+  def editing_preview_title(filename)
+    if gitlab_markdown?(filename) || markup?(filename)
+      'Preview'
+    else
+      'Diff'
+    end
+  end
 end
@@ -25,6 +25,7 @@ class Milestone &lt; ActiveRecord::Base
   scope :active, -> { with_state(:active) }
   scope :closed, -> { with_state(:closed) }
+  scope :of_projects, ->(ids) { where(project_id: ids) }
   validates :title, presence: true
   validates :project, presence: true
@@ -184,9 +184,10 @@ class Note &lt; ActiveRecord::Base
     return @diff_line if @diff_line
     if diff
-      Gitlab::DiffParser.new(diff).each do |full_line, type, line_code, line_new, line_old|
-        @diff_line = full_line if line_code == self.line_code
-      end
+      Gitlab::DiffParser.new(diff.diff.lines.to_a, diff.new_path)
+        .each do |full_line, type, line_code, line_new, line_old|
+          @diff_line = full_line if line_code == self.line_code
+        end
     end
     @diff_line
@@ -203,6 +203,7 @@ class Project &lt; ActiveRecord::Base
       when 'oldest' then reorder('projects.created_at ASC')
       when 'recently_updated' then reorder('projects.updated_at DESC')
       when 'last_updated' then reorder('projects.updated_at ASC')
+      when 'largest_repository' then reorder('projects.repository_size DESC')
       else reorder("namespaces.path, projects.name ASC")
       end
     end
@@ -562,4 +563,8 @@ class Project &lt; ActiveRecord::Base
   def forked_from?(project)
     forked? && project == forked_from_project
   end
+
+  def update_repository_size
+    update_attribute(:repository_size, repository.size)
+  end
 end
@@ -25,6 +25,7 @@ class GitPushService
     project.ensure_satellite_exists
     project.repository.expire_cache
+    project.update_repository_size
     if push_to_existing_branch?(ref, oldrev)
       project.update_merge_requests(oldrev, newrev, ref, @user)
@@ -22,12 +22,12 @@
     = f.label :color, "Background Color", class: 'control-label'
     .col-sm-10
       = f.text_field :color, placeholder: "#AA33EE", class: "form-control"
-      .light Hex values as 3 double digit numbers, starting with a # sign.
+      .light 6 character hex values starting with a # sign.
   .form-group.js-toggle-colors-container.hide
     = f.label :font, "Font Color", class: 'control-label'
     .col-sm-10
       = f.text_field :font, placeholder: "#224466", class: "form-control"
-      .light Hex values as 3 double digit numbers, starting with a # sign.
+      .light 6 character hex values starting with a # sign.
   .form-group
     = f.label :starts_at, class: 'control-label'
     .col-sm-10.datetime-controls
@@ -32,6 +32,7 @@
                     = visibility_level_icon(level)
                     = label
         .form-actions
+          = hidden_field_tag :sort, params[:sort]
           = submit_tag "Search", class: "btn submit btn-primary"
           = link_to "Reset", admin_projects_path, class: "btn"
@@ -40,6 +41,28 @@
       .title
         Projects (#{@projects.total_count})
         .pull-right
+          .dropdown.inline
+            %a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"}
+              %span.light sort:
+              - if @sort.present?
+                = @sort.humanize
+              - else
+                Name
+              %b.caret
+            %ul.dropdown-menu
+              %li
+                = link_to admin_projects_path(sort: nil) do
+                  Name
+                = link_to admin_projects_path(sort: 'newest') do
+                  Newest
+                = link_to admin_projects_path(sort: 'oldest') do
+                  Oldest
+                = link_to admin_projects_path(sort: 'recently_updated') do
+                  Recently updated
+                = link_to admin_projects_path(sort: 'last_updated') do
+                  Last updated
+                = link_to admin_projects_path(sort: 'largest_repository') do
+                  Largest repository
           = link_to 'New Project', new_project_path, class: "btn btn-new"
       %ul.well-list
         - @projects.each do |project|
@@ -20,6 +20,10 @@
             = link_to search_path, title: "Search", class: 'has_bottom_tooltip', 'data-original-title' => 'Search area' do
               %i.icon-search
           %li
+            = link_to help_path, title: 'Help', class: 'has_bottom_tooltip',
+               'data-original-title' => 'Help'  do
+              %i.icon-question-sign
+          %li
             = link_to public_root_path, title: "Public area", class: 'has_bottom_tooltip', 'data-original-title' => 'Public area' do
               %i.icon-globe
           %li
@@ -10,7 +10,7 @@
           %p.light
             GitLab is open source software to collaborate on code.
             %br
-            #{link_to "Sign in", new_user_session_path} or browse for #{link_to "public projects", public_projects_path}.
+            Sign in or browse for #{link_to "public projects", public_projects_path}.
     %hr
     .container
       .content
@@ -17,7 +17,7 @@ Changes:
   - else
     = diff.new_path || diff.old_path
   \=====================================
-  = diff.diff
+  != diff.diff
 \
 - if @compare.timeout
   Huge diff. To prevent performance issues it was hidden
@@ -0,0 +1,13 @@
+%table.text-file
+  - each_diff_line(diff, 1) do |line, type, line_code, line_new, line_old, raw_line|
+    %tr.line_holder{ id: line_code, class: "#{type}" }
+      - if type == "match"
+        %td.old_line= "..."
+        %td.new_line= "..."
+        %td.line_content.matched= line
+      - else
+        %td.old_line
+          = link_to raw(type == "new" ? "&nbsp;" : line_old), "##{line_code}", id: line_code
+        %td.new_line= link_to raw(type == "old" ? "&nbsp;" : line_new) , "##{line_code}", id: line_code
+        %td.line_content{class: "noteable_line #{type} #{line_code}", "line_code" => line_code}= raw diff_line_content(line)
+
@@ -0,0 +1,26 @@
+.diff-file
+  .diff-content
+    - if gitlab_markdown?(@blob.name)
+      .file-content.wiki
+        = preserve do
+          = markdown(@content)
+    - elsif markup?(@blob.name)
+      .file-content.wiki
+        = raw GitHub::Markup.render(@blob.name, @content)
+    - else
+      .file-content.code
+        - unless @diff.empty?
+          %table.text-file
+            - @diff.each do |line, type, line_code, line_new, line_old, raw_line|
+              %tr.line_holder{ id: line_code, class: "#{type}" }
+                - if type == "match"
+                  %td.old_line= "..."
+                  %td.new_line= "..."
+                  %td.line_content.matched= line
+                - else
+                  %td.old_line
+                    = link_to raw(type == "new" ? "&nbsp;" : line_old), "##{line_code}", id: line_code
+                  %td.new_line= link_to raw(type == "old" ? "&nbsp;" : line_new) , "##{line_code}", id: line_code
+                  %td.line_content{class: "noteable_line #{type} #{line_code}", "line_code" => line_code}= raw diff_line_content(line)
+        - else
+          %p.nothing_here_message No changes.
 %h3.page-title Edit mode
 .file-editor
   = form_tag(project_edit_tree_path(@project, @id), method: :put, class: "form-horizontal") do
-    .file-holder
+    .file-holder.file
       .file-title
+        .btn-group.js-edit-mode.left-options
+          = link_to 'Edit', '#editor', class: 'active hover btn btn-tiny'
+          = link_to editing_preview_title(@blob.name), '#preview', class: 'btn btn-tiny', 'data-preview-url' => preview_project_edit_tree_path(@project, @id)
         %i.icon-file
         %span.file_name
           = @path
@@ -13,7 +16,8 @@
           .btn-group.tree-btn-group
             = link_to "Cancel", @after_edit_path, class: "btn btn-tiny btn-cancel", data: { confirm: leave_edit_message }
       .file-content.code
-        %pre#editor= @blob.data
+        %pre.js-edit-mode-pane#editor= @blob.data
+        .js-edit-mode-pane#preview.hide
     .form-group.commit_message-group
       = label_tag 'commit_message', class: "control-label" do
@@ -45,3 +49,28 @@
     $("#file-content").val(editor.getValue());
     $(".file-editor form").submit();
   });
+
+  var editModePanes = $('.js-edit-mode-pane'),
+      editModeLinks = $('.js-edit-mode a');
+
+  editModeLinks.click(function(event) {
+    event.preventDefault();
+
+    var currentLink = $(this),
+        paneId = currentLink.attr('href'),
+        currentPane = editModePanes.filter(paneId);
+
+    editModeLinks.removeClass('active hover');
+    currentLink.addClass('active hover');
+    editModePanes.hide();
+
+    if (paneId == '#preview') {
+      $.post(currentLink.data('preview-url'), { content: editor.getValue() }, function(response) {
+        currentPane.empty().append(response);
+        currentPane.fadeIn(200);
+      })
+    } else {
+      currentPane.fadeIn(200);
+      editor.focus()
+    }
+  })
@@ -26,4 +26,4 @@
   .ci_widget.ci-error{style: "display:none"}
     %i.icon-remove
-    %strong Cannot connect to CI server. Please check your setting
+    %strong Cannot connect to the CI server. Please check your settings and try again.
@@ -7,4 +7,4 @@
   = render "projects/notes/form"
 :javascript
-  new Notes("#{project_notes_path(target_id: @noteable.id, target_type: @noteable.class.name.underscore)}", #{@notes.map(&:id).to_json})
+  new Notes("#{project_notes_path(target_id: @noteable.id, target_type: @noteable.class.name.underscore)}", #{@notes.map(&:id).to_json}, #{Time.now.to_i})
@@ -107,7 +107,7 @@ production: &amp;base
     #   ##  :id                - Issue id (from commit messages)
     #   issues_url: "http://redmine.sample/issues/:id"
     #
-    #   ## If not nil, linkis to creating new issues will be replaced with this
+    #   ## If not nil, links to creating new issues will be replaced with this
     #   ## Use placeholders:
     #   ##  :project_id        - GitLab project identifier
     #   ##  :issues_tracker_id - Project Name or Id in external issue tracker
@@ -18,4 +18,16 @@ if File.exists?(aws_file)
     config.fog_authenticated_url_expiration = 1 << 29               # optional time (in seconds) that authenticated urls will be valid.
                                                                     # when fog_public is false and provider is AWS or Google, defaults to 600
   end
+
+  # Mocking Fog requests, based on: https://github.com/carrierwaveuploader/carrierwave/wiki/How-to%3A-Test-Fog-based-uploaders
+  if Rails.env.test?
+    Fog.mock!
+    connection = ::Fog::Storage.new(
+        :aws_access_key_id      => AWS_CONFIG['access_key_id'],
+        :aws_secret_access_key  => AWS_CONFIG['secret_access_key'],
+        :provider               => 'AWS',
+        :region                 => AWS_CONFIG['region']
+      )
+    connection.directories.create(:key => AWS_CONFIG['bucket'])
+  end
 end
@@ -187,7 +187,9 @@ Gitlab::Application.routes.draw do
       resources :blob,      only: [:show, :destroy], constraints: {id: /.+/}
       resources :raw,       only: [:show], constraints: {id: /.+/}
       resources :tree,      only: [:show], constraints: {id: /.+/, format: /(html|js)/ }
-      resources :edit_tree, only: [:show, :update], constraints: {id: /.+/}, path: 'edit'
+      resources :edit_tree, only: [:show, :update], constraints: { id: /.+/ }, path: 'edit' do
+        post :preview, on: :member
+      end
       resources :new_tree,  only: [:show, :update], constraints: {id: /.+/}, path: 'new'
       resources :commit,    only: [:show], constraints: {id: /[[:alnum:]]{6,40}/}
       resources :commits,   only: [:show], constraints: {id: /(?:[^.]|\.(?!atom$))+/, format: /atom/}
@@ -0,0 +1 @@
+require_relative 'limits_to_mysql'
@@ -0,0 +1,32 @@
+class AddIndexOnIid < ActiveRecord::Migration
+  def change
+    RemoveDuplicateIid.clean(Issue)
+    RemoveDuplicateIid.clean(MergeRequest, 'target_project_id')
+    RemoveDuplicateIid.clean(Milestone)
+
+    add_index :issues, [:project_id, :iid], unique: true
+    add_index :merge_requests, [:target_project_id, :iid], unique: true
+    add_index :milestones, [:project_id, :iid], unique: true
+  end
+end
+
+class RemoveDuplicateIid
+  def self.clean(klass, project_field = 'project_id')
+    duplicates = klass.find_by_sql("SELECT iid, #{project_field} FROM #{klass.table_name} GROUP BY #{project_field}, iid HAVING COUNT(*) > 1")
+
+    duplicates.each do |duplicate|
+      project_id = duplicate.send(project_field)
+      iid = duplicate.iid
+      items = klass.of_projects(project_id).where(iid: iid)
+
+      if items.size > 1
+        puts "Remove #{klass.name} duplicates for iid: #{iid} and project_id: #{project_id}"
+        items.shift
+        items.each do |item|
+          item.destroy
+          puts '.'
+        end
+      end
+    end
+  end
+end
@@ -0,0 +1,5 @@
+class AddNotesIndexUpdatedAt < ActiveRecord::Migration
+  def change
+    add_index :notes, :updated_at
+  end
+end
@@ -0,0 +1,5 @@
+class AddRepoSizeToDb < ActiveRecord::Migration
+  def change
+    add_column :projects, :repository_size, :float, default: 0
+  end
+end
@@ -0,0 +1,21 @@
+class MigrateRepoSize < ActiveRecord::Migration
+  def up
+    Project.reset_column_information
+    Project.find_each(batch_size: 500) do |project|
+      begin
+        if project.empty_repo?
+          print '-'
+        else
+          project.update_repository_size
+          print '.'
+        end
+      rescue
+        print 'F'
+      end
+    end
+    puts 'Done'
+  end
+
+  def down
+  end
+end
@@ -0,0 +1,10 @@
+class LimitsToMysql < ActiveRecord::Migration
+  def up
+    return unless ActiveRecord::Base.configurations[Rails.env]['adapter'] =~ /^mysql/
+
+    change_column :merge_request_diffs, :st_commits, :text, limit: 2147483647
+    change_column :merge_request_diffs, :st_diffs, :text, limit: 2147483647
+    change_column :snippets, :content, :text, limit: 2147483647
+    change_column :notes, :st_diff, :text, limit: 2147483647
+  end
+end
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20140416185734) do
+ActiveRecord::Schema.define(version: 20140502125220) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -93,6 +93,7 @@ ActiveRecord::Schema.define(version: 20140416185734) do
   add_index "issues", ["author_id"], name: "index_issues_on_author_id", using: :btree
   add_index "issues", ["created_at"], name: "index_issues_on_created_at", using: :btree
   add_index "issues", ["milestone_id"], name: "index_issues_on_milestone_id", using: :btree
+  add_index "issues", ["project_id", "iid"], name: "index_issues_on_project_id_and_iid", unique: true, using: :btree
   add_index "issues", ["project_id"], name: "index_issues_on_project_id", using: :btree
   add_index "issues", ["title"], name: "index_issues_on_title", using: :btree
@@ -143,6 +144,7 @@ ActiveRecord::Schema.define(version: 20140416185734) do
   add_index "merge_requests", ["source_branch"], name: "index_merge_requests_on_source_branch", using: :btree
   add_index "merge_requests", ["source_project_id"], name: "index_merge_requests_on_source_project_id", using: :btree
   add_index "merge_requests", ["target_branch"], name: "index_merge_requests_on_target_branch", using: :btree
+  add_index "merge_requests", ["target_project_id", "iid"], name: "index_merge_requests_on_target_project_id_and_iid", unique: true, using: :btree
   add_index "merge_requests", ["title"], name: "index_merge_requests_on_title", using: :btree
   create_table "milestones", force: true do |t|
@@ -157,6 +159,7 @@ ActiveRecord::Schema.define(version: 20140416185734) do
   end
   add_index "milestones", ["due_date"], name: "index_milestones_on_due_date", using: :btree
+  add_index "milestones", ["project_id", "iid"], name: "index_milestones_on_project_id_and_iid", unique: true, using: :btree
   add_index "milestones", ["project_id"], name: "index_milestones_on_project_id", using: :btree
   create_table "namespaces", force: true do |t|
@@ -197,6 +200,7 @@ ActiveRecord::Schema.define(version: 20140416185734) do
   add_index "notes", ["noteable_type"], name: "index_notes_on_noteable_type", using: :btree
   add_index "notes", ["project_id", "noteable_type"], name: "index_notes_on_project_id_and_noteable_type", using: :btree
   add_index "notes", ["project_id"], name: "index_notes_on_project_id", using: :btree
+  add_index "notes", ["updated_at"], name: "index_notes_on_updated_at", using: :btree
   create_table "projects", force: true do |t|
     t.string   "name"
@@ -218,6 +222,7 @@ ActiveRecord::Schema.define(version: 20140416185734) do
     t.integer  "visibility_level",       default: 0,        null: false
     t.boolean  "archived",               default: false,    null: false
     t.string   "import_status"
+    t.float    "repository_size",        default: 0.0
   end
   add_index "projects", ["creator_id"], name: "index_projects_on_creator_id", using: :btree
@@ -319,7 +324,6 @@ ActiveRecord::Schema.define(version: 20140416185734) do
     t.integer  "notification_level",       default: 1,     null: false
     t.datetime "password_expires_at"
     t.integer  "created_by_id"
-    t.datetime "last_credential_check_at"
     t.string   "avatar"
     t.string   "confirmation_token"
     t.datetime "confirmed_at"
@@ -327,6 +331,7 @@ ActiveRecord::Schema.define(version: 20140416185734) do
     t.string   "unconfirmed_email"
     t.boolean  "hide_no_ssh_key",          default: false
     t.string   "website_url",              default: "",    null: false
+    t.datetime "last_credential_check_at"
   end
   add_index "users", ["admin"], name: "index_users_on_admin", using: :btree
@@ -13,7 +13,7 @@
 + [Merge Requests](merge_requests.md)
 + [Issues](issues.md)
 + [Milestones](milestones.md)
-+ [Notes](notes.md)
++ [Notes](notes.md) (comments)
 + [Deploy Keys](deploy_keys.md)
 + [System Hooks](system_hooks.md)
 + [Groups](groups.md)
@@ -24,6 +24,7 @@
 + [Ruby Wrapper](https://github.com/NARKOZ/gitlab) - Ruby
 + [python-gitlab](https://github.com/Itxaka/python-gitlab) - Python
 + [java-gitlab-api](https://github.com/timols/java-gitlab-api) - Java
++ [node-gitlab](https://github.com/moul/node-gitlab) - Node.js
 ## Introduction
@@ -193,3 +193,7 @@ Parameters:
 + `id` (required) - The project ID
 + `issue_id` (required) - The ID of the issue
+
+## Comments on issues
+
+Comments are done via the notes resource.
@@ -258,3 +258,7 @@ Parameters:
   }
 ]
 ```
+
+## Comments on issues
+
+Comments are done via the notes resource.
+Notes can be wall notes or comments on snippets, issues or merge requests.
+
 ## Wall
 ### List project wall notes
-+ [Architecture](architecture.md)
-+ [Shell commands](shell_commands.md)
+## Development 
+
++ [Architecture](architecture.md) of GitLab
++ [Shell commands](shell_commands.md) in the GitLab codebase
++ [Rake tasks](rake_tasks.md) for development
@@ -0,0 +1,25 @@
+# Rake tasks for developers
+
+## Setup db with developer seeds:
+
+Note that if your db user does not have advanced privilegies you must create db manually before run this command 
+
+```
+bundle exec rake setup
+```
+
+## Run tests
+
+This runs all test suite present in GitLab 
+
+```
+bundle exec rake test
+```
+
+## Generate searchable docs for source code
+
+You can find results under `doc/code` directory
+
+```
+bundle exec rake gitlab:generate_docs
+```
@@ -27,10 +27,9 @@ The GitLab installation consists of setting up the following components:
 1. Packages / Dependencies
 2. Ruby
 3. System Users
-4. GitLab shell
-5. Database
-6. GitLab
-7. Nginx
+4. Database
+5. GitLab
+6. Nginx
 # 1. Packages / Dependencies
@@ -119,30 +118,7 @@ Create a `git` user for Gitlab:
     sudo adduser --disabled-login --gecos 'GitLab' git
-
-# 4. GitLab shell
-
-GitLab Shell is an ssh access and repository management software developed specially for GitLab.
-
-    # Go to home directory
-    cd /home/git
-
-    # Clone gitlab shell
-    sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-shell.git -b v1.9.3
-
-    cd gitlab-shell
-
-    sudo -u git -H cp config.yml.example config.yml
-
-    # Edit config and replace gitlab_url
-    # with something like 'http://domain.com/'
-    sudo -u git -H editor config.yml
-
-    # Do setup
-    sudo -u git -H ./bin/install
-
-
-# 5. Database
+# 4. Database
 We recommend using a PostgreSQL database. For MySQL check [MySQL setup guide](database_mysql.md).
@@ -165,7 +141,7 @@ We recommend using a PostgreSQL database. For MySQL check [MySQL setup guide](da
     sudo -u git -H psql -d gitlabhq_production
-# 6. GitLab
+# 5. GitLab
     # We'll install GitLab into home directory of the user "git"
     cd /home/git
@@ -276,6 +252,18 @@ that were [fixed](https://github.com/bundler/bundler/pull/2817) in 1.5.2.
     # When done you see 'Administrator account created:'
+## Install GitLab shell
+
+GitLab Shell is an ssh access and repository management software developed specially for GitLab.
+
+    # Go to the Gitlab installation folder:
+    cd /home/git/gitlab
+
+    # Run the installation task for gitlab-shell (replace `REDIS_URL` if needed):
+    sudo -u git -H bundle exec rake gitlab:shell:install[v1.9.3] REDIS_URL=redis://localhost:6379
+
+    # By default, the gitlab-shell config is generated from your main gitlab config. You can review (and modify) it as follows:
+    sudo -u git -H editor /home/git/gitlab-shell/config.yml
 ## Install Init Script
@@ -313,7 +301,13 @@ Check if GitLab and its environment are configured correctly:
     # or
     sudo /etc/init.d/gitlab restart
-# 7. Nginx
+
+## Compile assets
+
+    sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production
+
+
+# 6. Nginx
 **Note:**
 Nginx is the officially supported web server for GitLab. If you cannot or do not want to use Nginx as your web server, have a look at the
@@ -6,3 +6,4 @@ See the documentation below for details on how to configure these services.
 + [External issue tracker](external-issue-tracker.md) Redmine, JIRA, etc.
 + [LDAP](ldap.md) Set up sign in via LDAP
 + [OmniAuth](omniauth.md) Sign in via Twitter, GitHub, and Google via OAuth.
++ [Slack](slack.md) Integrate with the Slack chat service
@@ -27,7 +27,7 @@ If a user is a GitLab administrator they receive all permissions.
 |Remove protected branches| |||✓|✓|
 |Edit project| |||✓|✓|
 |Add Deploy Keys to project| |||✓|✓|
-|Confiure Project Hooks| |||✓|✓|
+|Configure Project Hooks| |||✓|✓|
 |Switch visibility level| ||||✓|
 |Transfer project to another namespace| ||||✓|
 |Remove project| ||||✓|
 + [Backup restore](backup_restore.md)
 + [Cleanup](cleanup.md)
 + [Features](features.md)
-+ [Maintenance](maintenance.md)
++ [Maintenance](maintenance.md) and self-checks
 + [User management](user_management.md)
 + [Web hooks](web_hooks.md)
++ [Import](import.md) of git repositories in bulk
@@ -0,0 +1,28 @@
+### Import bare repositories into GitLab project instance
+
+Notes:
+
+* project owner will be a first admin
+* groups will be created as needed
+* group owner will be the first admin
+* existing projects will be skipped
+
+How to use:
+
+1. copy your bare repos under git repos_path (see `config/gitlab.yml` gitlab_shell -> repos_path)
+2. run the command below
+
+```
+bundle exec rake gitlab:import:repos RAILS_ENV=production
+```
+
+Example output:
+
+```
+Processing abcd.git
+ * Created abcd (abcd.git)
+Processing group/xyz.git
+ * Created Group group (2)
+ * Created xyz (group/xyz.git)
+[...]
+```
@@ -110,32 +110,3 @@ If necessary, remove the `tmp/repo_satellites` directory and rerun the command b
 ```
 bundle exec rake gitlab:satellites:create RAILS_ENV=production
 ```
-
-### Import bare repositories into GitLab project instance
-
-Notes:
-
-* project owner will be a first admin
-* groups will be created as needed
-* group owner will be the first admin
-* existing projects will be skipped
-
-How to use:
-
-1. copy your bare repos under git repos_path (see `config/gitlab.yml` gitlab_shell -> repos_path)
-2. run the command below
-
-```
-bundle exec rake gitlab:import:repos RAILS_ENV=production
-```
-
-Example output:
-
-```
-Processing abcd.git
- * Created abcd (abcd.git)
-Processing group/xyz.git
- * Created Group group (2)
- * Created xyz (group/xyz.git)
-[...]
-```
@@ -122,7 +122,6 @@ It is important to do this as soon as possible, so we can catch any errors befor
 After making the release branch new commits are cherry-picked from master. When the release gets closer we get more selective what is cherry-picked. The days of the month are approximately as follows:
-
 ### **1. Create x-x-stable branch and push to the repositories**
 ```
@@ -1,148 +0,0 @@
-# From 6.0 to 6.7
-
-# In 6.1 we remove a lot of deprecated code.
-# You should update to 6.0 before installing 6.1 or higher so all the necessary conversions are run.
-
-### Deprecations
-
-#### Global issue numbers
-
-As of 6.1 issue numbers are project specific. This means all issues are renumbered and get a new number in their url. If you use an old issue number url and the issue number does not exist yet you are redirected to the new one. This conversion does not trigger if the old number already exists for this project, this is unlikely but will happen with old issues and large projects.
-
-### 0. Backup
-
-It's useful to make a backup just in case things go south:
-(With MySQL, this may require granting "LOCK TABLES" privileges to the GitLab user on the database version)
-
-```bash
-cd /home/git/gitlab
-sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production
-```
-
-### 1. Stop server
-
-    sudo service gitlab stop
-
-### 2. Get latest code
-
-```bash
-cd /home/git/gitlab
-sudo -u git -H git fetch --all
-```
-
-For Gitlab Community Edition:
-
-```bash
-sudo -u git -H git checkout 6-7-stable
-```
-
-OR
-
-For GitLab Enterprise Edition:
-
-```bash
-sudo -u git -H git checkout 6-7-stable-ee
-```
-
-
-### 3. Install additional packages
-
-```bash
-# Add support for lograte for better log file handling
-sudo apt-get install logrotate
-```
-
-### 4. Update gitlab-shell
-
-```bash
-cd /home/git/gitlab-shell
-sudo -u git -H git fetch
-sudo -u git -H git checkout v1.9.1 # Addresses multiple critical security vulnerabilities
-```
-
-### 5. Install libs, migrations, etc.
-
-```bash
-cd /home/git/gitlab
-
-# MySQL installations (note: the line below states '--without ... postgres')
-sudo -u git -H bundle install --without development test postgres --deployment
-
-# PostgreSQL installations (note: the line below states '--without ... mysql')
-sudo -u git -H bundle install --without development test mysql --deployment
-
-
-# Run database migrations
-sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production
-
-# Enable internal issue IDs (introduced in GitLab 6.1)
-sudo -u git -H bundle exec rake migrate_iids RAILS_ENV=production
-
-# Clean up assets and cache
-sudo -u git -H bundle exec rake assets:clean assets:precompile cache:clear RAILS_ENV=production
-
-# Close access to gitlab-satellites for others
-sudo chmod u+rwx,g+rx,o-rwx /home/git/gitlab-satellites
-```
-
-### 6. Update config files
-
-TIP: to see what changed in gitlab.yml.example in this release use next command: 
-
-```
-git diff 6-0-stable:config/gitlab.yml.example 6-7-stable:config/gitlab.yml.example
-```
-
-* Make `/home/git/gitlab/config/gitlab.yml` same as https://gitlab.com/gitlab-org/gitlab-ce/blob/6-7-stable/config/gitlab.yml.example but with your settings.
-* Make `/home/git/gitlab/config/unicorn.rb` same as https://gitlab.com/gitlab-org/gitlab-ce/blob/6-7-stable/config/unicorn.rb.example but with your settings.
-* Copy rack attack middleware config
-
-```bash
-sudo -u git -H cp config/initializers/rack_attack.rb.example config/initializers/rack_attack.rb
-```
-
-* Set up logrotate
-
-```bash
-sudo cp lib/support/logrotate/gitlab /etc/logrotate.d/gitlab
-```
-
-### 7. Update Init script
-
-```bash
-sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
-```
-
-### 8. Start application
-
-    sudo service gitlab start
-    sudo service nginx restart
-
-### 9. Check application status
-
-Check if GitLab and its environment are configured correctly:
-
-    cd /home/git/gitlab
-    sudo -u git -H bundle exec rake gitlab:env:info RAILS_ENV=production
-
-To make sure you didn't miss anything run a more thorough check with:
-
-    sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production
-
-If all items are green, then congratulations upgrade complete!
-
-## Things went south? Revert to previous version (6.0)
-
-### 1. Revert the code to the previous version
-Follow the [`upgrade guide from 5.4 to 6.0`](5.4-to-6.0.md), except for the database migration 
-(The backup is already migrated to the previous version)
-
-### 2. Restore from the backup:
-
-```bash
-cd /home/git/gitlab
-sudo -u git -H bundle exec rake gitlab:backup:restore RAILS_ENV=production
-```
-
-## Login issues after upgrade?
-If running in https mode, be sure to read [Can't Verify csrf token authenticity](https://github.com/gitlabhq/gitlab-public-wiki/wiki/Trouble-Shooting-Guide#cant-verify-csrf-token-authenticitycant-get-past-login-pageredirected-to-login-page) 
@@ -0,0 +1,149 @@
+# From 6.0 to 6.8
+
+# In 6.1 we remove a lot of deprecated code.
+# You should update to 6.0 before installing 6.1 or higher so all the necessary conversions are run.
+
+### Deprecations
+
+#### Global issue numbers
+
+As of 6.1 issue numbers are project specific. This means all issues are renumbered and get a new number in their url. If you use an old issue number url and the issue number does not exist yet you are redirected to the new one. This conversion does not trigger if the old number already exists for this project, this is unlikely but will happen with old issues and large projects.
+
+### 0. Backup
+
+It's useful to make a backup just in case things go south:
+(With MySQL, this may require granting "LOCK TABLES" privileges to the GitLab user on the database version)
+
+```bash
+cd /home/git/gitlab
+sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production
+```
+
+### 1. Stop server
+
+    sudo service gitlab stop
+
+### 2. Get latest code
+
+```bash
+cd /home/git/gitlab
+sudo -u git -H git fetch --all
+```
+
+For Gitlab Community Edition:
+
+```bash
+sudo -u git -H git checkout 6-8-stable
+```
+
+OR
+
+For GitLab Enterprise Edition:
+
+```bash
+sudo -u git -H git checkout 6-8-stable-ee
+```
+
+
+### 3. Install additional packages
+
+```bash
+# Add support for lograte for better log file handling
+sudo apt-get install logrotate
+```
+
+### 4. Update gitlab-shell
+
+```bash
+cd /home/git/gitlab-shell
+sudo -u git -H git fetch
+sudo -u git -H git checkout v1.9.3 # Addresses multiple critical security vulnerabilities
+```
+
+### 5. Install libs, migrations, etc.
+
+```bash
+cd /home/git/gitlab
+
+# MySQL installations (note: the line below states '--without ... postgres')
+sudo -u git -H bundle install --without development test postgres --deployment
+
+# PostgreSQL installations (note: the line below states '--without ... mysql')
+sudo -u git -H bundle install --without development test mysql --deployment
+
+
+# Run database migrations
+sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production
+
+# Enable internal issue IDs (introduced in GitLab 6.1)
+sudo -u git -H bundle exec rake migrate_iids RAILS_ENV=production
+
+# Clean up assets and cache
+sudo -u git -H bundle exec rake assets:clean assets:precompile cache:clear RAILS_ENV=production
+
+# Close access to gitlab-satellites for others
+sudo chmod u+rwx,g+rx,o-rwx /home/git/gitlab-satellites
+```
+
+### 6. Update config files
+
+TIP: to see what changed in gitlab.yml.example in this release use next command: 
+
+```
+git diff 6-0-stable:config/gitlab.yml.example 6-8-stable:config/gitlab.yml.example
+```
+
+* Make `/home/git/gitlab/config/gitlab.yml` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/6-8-stable/config/gitlab.yml.example but with your settings.
+* Make `/home/git/gitlab/config/unicorn.rb` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/6-8-stable/config/unicorn.rb.example but with your settings.
+* Make `/etc/nginx/sites-available/nginx` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/6-8-stable/lib/support/nginx/gitlab but with your settings.
+* Copy rack attack middleware config
+
+```bash
+sudo -u git -H cp config/initializers/rack_attack.rb.example config/initializers/rack_attack.rb
+```
+
+* Set up logrotate
+
+```bash
+sudo cp lib/support/logrotate/gitlab /etc/logrotate.d/gitlab
+```
+
+### 7. Update Init script
+
+```bash
+sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
+```
+
+### 8. Start application
+
+    sudo service gitlab start
+    sudo service nginx restart
+
+### 9. Check application status
+
+Check if GitLab and its environment are configured correctly:
+
+    cd /home/git/gitlab
+    sudo -u git -H bundle exec rake gitlab:env:info RAILS_ENV=production
+
+To make sure you didn't miss anything run a more thorough check with:
+
+    sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production
+
+If all items are green, then congratulations upgrade complete!
+
+## Things went south? Revert to previous version (6.0)
+
+### 1. Revert the code to the previous version
+Follow the [`upgrade guide from 5.4 to 6.0`](5.4-to-6.0.md), except for the database migration 
+(The backup is already migrated to the previous version)
+
+### 2. Restore from the backup:
+
+```bash
+cd /home/git/gitlab
+sudo -u git -H bundle exec rake gitlab:backup:restore RAILS_ENV=production
+```
+
+## Login issues after upgrade?
+If running in https mode, be sure to read [Can't Verify csrf token authenticity](https://github.com/gitlabhq/gitlab-public-wiki/wiki/Trouble-Shooting-Guide#cant-verify-csrf-token-authenticitycant-get-past-login-pageredirected-to-login-page) 
@@ -62,6 +62,7 @@ sudo -u git -H bundle exec rake assets:clean assets:precompile cache:clear RAILS
 # Update init.d script
 sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
+sudo chmod +x /etc/init.d/gitlab
 # Update the logrotate configuration (keep logs for 90 days instead of 52 weeks)
 sudo cp lib/support/logrotate/gitlab /etc/logrotate.d/gitlab
@@ -92,19 +93,12 @@ If you are using HTTPS, disable gzip as in [this commit](https://gitlab.com/gitl
 To improve performance, enable gzip asset compression as seen [in this commit](https://gitlab.com/gitlab-org/gitlab-ce/commit/8af94ed75505f0253823b9b2d44320fecea5b5fb).
-### 6. Update Init script
-
-```bash
-sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
-sudo chmod +x /etc/init.d/gitlab
-```
-
-### 7. Start application
+### 6. Start application
     sudo service gitlab start
     sudo service nginx restart
-### 8. Check application status
+### 7. Check application status
 Check if GitLab and its environment are configured correctly:
@@ -2,16 +2,16 @@ Project web hooks allow you to trigger an URL if new code is pushed or a new iss
 ---
-You can configure web hook to listen for specific events like pushes, issues, merge requests.
-GitLab will send POST request with data to web hook URL.
-Web Hooks can be used to update an external issue tracker, trigger CI builds, update a backup mirror, or even deploy to your production server.
+You can configure web hooks to listen for specific events like pushes, issues or merge requests.
+GitLab will send a POST request with data to the web hook URL.
+Web hooks can be used to update an external issue tracker, trigger CI builds, update a backup mirror, or even deploy to your production server.
 If you send a web hook to an SSL endpoint [the certificate will not be verified](https://gitlab.com/gitlab-org/gitlab-ce/blob/ccd617e58ea71c42b6b073e692447d0fe3c00be6/app/models/web_hook.rb#L35) since many people use self-signed certificates.
 ---
 #### Push events
-Triggered when you push to the repository except pushing tags.
+Triggered when you push to the repository except when pushing tags.
 **Request body:**
@@ -84,7 +84,7 @@ Triggered when a new issue is created or an existing issue was updated/closed/re
 #### Merge request events
-Triggered when a new merge request is created or an existing merge request was updated/merges/closed.
+Triggered when a new merge request is created or an existing merge request was updated/merged/closed.
 **Request body:**
@@ -29,3 +29,13 @@ Feature: Project Browse files
     Given I click on "Gemfile.lock" file in repo
     And I click button "edit"
     Then I can edit code
+
+  @javascript
+  Scenario: I can see editing preview
+    Given I click on "Gemfile.lock" file in repo
+    And I click button "edit"
+    And I edit code
+    And I click link "Diff"
+    Then I see diff
+
+
@@ -41,6 +41,18 @@ class ProjectBrowseFiles &lt; Spinach::FeatureSteps
     page.evaluate_script('editor.getValue()').should == "GitlabFileEditor"
   end
+  step 'I edit code' do
+    page.execute_script('editor.setValue("GitlabFileEditor")')
+  end
+
+  step 'I click link "Diff"' do
+    click_link 'Diff'
+  end
+
+  step 'I see diff' do
+    page.should have_css '.line_holder.new'
+  end
+
   step 'I click on "new file" link in repo' do
     click_link 'new-file-link'
   end
@@ -4,9 +4,9 @@ module Gitlab
     attr_reader :lines, :new_path
-    def initialize(diff)
-      @lines = diff.diff.lines.to_a
-      @new_path = diff.new_path
+    def initialize(lines, new_path = '')
+      @lines = lines
+      @new_path = new_path
     end
     def each
@@ -18,10 +18,7 @@ module Gitlab
       lines_arr.each do |line|
         raw_line = line.dup
-        next if line.match(/^\-\-\- \/dev\/null/)
-        next if line.match(/^\+\+\+ \/dev\/null/)
-        next if line.match(/^\-\-\- a/)
-        next if line.match(/^\+\+\+ b/)
+        next if filename?(line)
         full_line = html_escape(line.gsub(/\n/, ''))
         full_line = ::Gitlab::InlineDiff.replace_markers full_line
@@ -53,8 +50,17 @@ module Gitlab
       end
     end
+    def empty?
+      @lines.empty?
+    end
+
     private
+    def filename?(line)
+      line.start_with?('--- /dev/null', '+++ /dev/null', '--- a', '+++ b',
+                       '--- /tmp/diffy', '+++ /tmp/diffy')
+    end
+
     def identification_type(line)
       if line[0] == "+"
         "new"
@@ -44,7 +44,8 @@ module Gitlab
       def users(field, value)
         if field.to_sym == :dn
           options = {
-            base: value
+            base: value,
+            scope: Net::LDAP::SearchScope_BaseObject
           }
         else
           options = {
@@ -15,14 +15,7 @@ namespace :gitlab do
     end
     Rake::Task["db:setup"].invoke
-
-    config = YAML.load_file(File.join(Rails.root,'config','database.yml'))[Rails.env]
-    success = case config["adapter"]
-              when /^mysql/ then
-                Rake::Task["add_limits_mysql"].invoke
-              when "postgresql" then
-              end
-
+    Rake::Task["add_limits_mysql"].invoke
     Rake::Task["db:seed_fu"].invoke
   rescue Gitlab::TaskAbortedByUserError
     puts "Quitting...".red
 namespace :gitlab do
   namespace :shell do
+    desc "GITLAB | Install or upgrade gitlab-shell"
+    task :install, [:tag, :repo] => :environment do |t, args|
+      warn_user_is_not_gitlab
+
+      args.with_defaults(tag: "v1.9.3", repo: "https://gitlab.com/gitlab-org/gitlab-shell.git")
+
+      user = Settings.gitlab.user
+      home_dir = Settings.gitlab.user_home
+      gitlab_url = Settings.gitlab.url
+      # gitlab-shell requires a / at the end of the url
+      gitlab_url += "/" unless gitlab_url.match(/\/$/)
+      repos_path = Gitlab.config.gitlab_shell.repos_path
+      target_dir = Gitlab.config.gitlab_shell.path
+
+      # Clone if needed
+      unless File.directory?(target_dir)
+        sh "git clone '#{args.repo}' '#{target_dir}'"
+      end
+
+      # Make sure we're on the right tag
+      Dir.chdir(target_dir) do
+        sh "git fetch origin && git reset --hard $(git describe #{args.tag} || git describe origin/#{args.tag})"
+
+        redis_url = URI.parse(ENV['REDIS_URL'] || "redis://localhost:6379")
+
+        config = {
+          user: user,
+          gitlab_url: gitlab_url,
+          http_settings: {self_signed_cert: false}.stringify_keys,
+          repos_path: repos_path,
+          auth_file: File.join(home_dir, ".ssh", "authorized_keys"),
+          redis: {
+            bin: %x{which redis-cli}.chomp,
+            host: redis_url.host,
+            port: redis_url.port,
+            namespace: "resque:gitlab"
+          }.stringify_keys,
+          log_level: "INFO",
+          audit_usernames: false
+        }.stringify_keys
+
+        # Generate config.yml based on existing gitlab settings
+        File.open("config.yml", "w+") {|f| f.puts config.to_yaml}
+
+        # Launch installation process
+        sh "bin/install"
+      end
+
+      # Required for debian packaging with PKGR: Setup .ssh/environment with
+      # the current PATH, so that the correct ruby version gets loaded
+      # Requires to set "PermitUserEnvironment yes" in sshd config (should not
+      # be an issue since it is more than likely that there are no "normal"
+      # user accounts on a gitlab server). The alternative is for the admin to
+      # install a ruby (1.9.3+) in the global path.
+      File.open(File.join(home_dir, ".ssh", "environment"), "w+") do |f|
+        f.puts "PATH=#{ENV['PATH']}"
+      end
+    end
+
     desc "GITLAB | Setup gitlab-shell"
     task setup: :environment do
       setup
+require Rails.root.join('db/migrate/limits_to_mysql')
+
 desc "GITLAB | Add limits to strings in mysql database"
 task add_limits_mysql: :environment do
   puts "Adding limits to schema.rb for mysql"
   LimitsToMysql.new.up
 end
-
-class LimitsToMysql < ActiveRecord::Migration
-  def up
-    change_column :merge_request_diffs, :st_commits, :text, limit: 2147483647
-    change_column :merge_request_diffs, :st_diffs, :text, limit: 2147483647
-    change_column :snippets, :content, :text, limit: 2147483647
-    change_column :notes, :st_diff, :text, limit: 2147483647
-  end
-end
@@ -0,0 +1,4 @@
+desc "GITLAB | Setup gitlab db"
+task :setup do
+  Rake::Task["gitlab:setup"].invoke
+end
@@ -2,7 +2,6 @@ body {
   color: #666;
   text-align: center;
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  sans-serif;
   margin:0;
   width: 800px;
   margin: auto;
@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+describe NotesFinder do
+  let(:user) { create :user }
+  let(:project) { create :project }
+  let(:note1) { create :note_on_commit, project: project }
+  let(:note2) { create :note_on_commit, project: project }
+  let(:commit) { note1.noteable }
+
+  before do
+    project.team << [user, :master]
+  end
+
+  describe :execute do
+    let(:params)  { { target_id: commit.id, target_type: 'commit', last_fetched_at: 1.hour.ago.to_i } }
+
+    before do
+      note1
+      note2
+    end
+
+    it 'should find all notes' do
+      notes = NotesFinder.new.execute(project, user, params)
+      notes.size.should eq(2)
+    end
+
+    it 'should raise an exception for an invalid target_type' do
+      params.merge!(target_type: 'invalid')
+      expect { NotesFinder.new.execute(project, user, params) }.to raise_error('invalid target_type')
+    end
+
+    it 'filters out old notes' do
+      note2.update_attribute(:updated_at, 2.hours.ago)
+      notes = NotesFinder.new.execute(project, user, params)
+      notes.should eq([note1])
+    end
+  end
+end
@@ -46,7 +46,7 @@ describe ApplicationHelper do
       group = create(:group)
       group.avatar = File.open(avatar_file_path)
       group.save!
-      group_icon(group.path).to_s.should == "/uploads/group/avatar/#{ group.id }/gitlab_logo.png"
+      group_icon(group.path).to_s.should match("/uploads/group/avatar/#{ group.id }/gitlab_logo.png")
     end
     it "should give default avatar_icon when no avatar is present" do
@@ -63,7 +63,7 @@ describe ApplicationHelper do
       user = create(:user)
       user.avatar = File.open(avatar_file_path)
       user.save!
-      avatar_icon(user.email).to_s.should == "/uploads/user/avatar/#{ user.id }/gitlab_logo.png"
+      avatar_icon(user.email).to_s.should match("/uploads/user/avatar/#{ user.id }/gitlab_logo.png")
     end
     it "should call gravatar_icon when no avatar is present" do
		1	+v 6.9.0
		2	+ - Store Rails cache data in the Redis `cache:gitlab` namespace
		3	+ - Adjust MySQL limits for existing installations
		4	+ - Add db index on project_id+iid column. This prevents duplicate on iid (During migration duplicates will be removed)
		5	+ - Markdown preview or diff during editing via web editor (Evgeniy Sokovikov)
		6	+ - Give the Rails cache its own Redis namespace
		7	+ - Add ability to set different ssh host, if different from http/https
		8	+ - Fix syntax highlighting for code comments blocks
		9	+ - Improve comments loading logic
		10	+ - Stop refreshing comments when the tab is hidden
		11	+
1	v 6.8.0	12	v 6.8.0
2	- Ability to at mention users that are participating in issue and merge req. discussion	13	- Ability to at mention users that are participating in issue and merge req. discussion
3	- Enabled GZip Compression for assets in example Nginx, make sure that Nginx is compiled with --with-http_gzip_static_module flag (this is default in Ubuntu)	14	- Enabled GZip Compression for assets in example Nginx, make sure that Nginx is compiled with --with-http_gzip_static_module flag (this is default in Ubuntu)
	@@ -17,7 +28,6 @@ v 6.8.0		@@ -17,7 +28,6 @@ v 6.8.0
17	- Fix download link for huge MR diffs	28	- Fix download link for huge MR diffs
18	- Expose event and mergerequest timestamps in API	29	- Expose event and mergerequest timestamps in API
19	- Fix emails on push service when only one commit is pushed	30	- Fix emails on push service when only one commit is pushed
20	- - Store Rails cache data in the Redis `cache:gitlab` namespace
21		31
22	v 6.7.3	32	v 6.7.3
23	- Fix the merge notification email not being sent (Pierre de La Morinerie)	33	- Fix the merge notification email not being sent (Pierre de La Morinerie)
	@@ -71,6 +71,7 @@ gem "carrierwave"		@@ -71,6 +71,7 @@ gem "carrierwave"
71		71
72	# for aws storage	72	# for aws storage
73	gem "fog", "~> 1.14", group: :aws	73	gem "fog", "~> 1.14", group: :aws
		74	+gem "unf", group: :aws
74		75
75	# Authorization	76	# Authorization
76	gem "six"	77	gem "six"
	@@ -82,6 +83,9 @@ gem "seed-fu"		@@ -82,6 +83,9 @@ gem "seed-fu"
82	gem "redcarpet", "~> 2.2.2"	83	gem "redcarpet", "~> 2.2.2"
83	gem "github-markup"	84	gem "github-markup"
84		85
		86	+# Diffs
		87	+gem 'diffy', '~> 3.0.3'
		88	+
85	# Asciidoc to HTML	89	# Asciidoc to HTML
86	gem "asciidoctor"	90	gem "asciidoctor"
87		91
	@@ -157,8 +161,8 @@ gem 'jquery-turbolinks'		@@ -157,8 +161,8 @@ gem 'jquery-turbolinks'
157		161
158	gem 'select2-rails'	162	gem 'select2-rails'
159	gem 'jquery-atwho-rails', "~> 0.3.3"	163	gem 'jquery-atwho-rails', "~> 0.3.3"
160	-gem "jquery-rails", "2.1.3"
161	-gem "jquery-ui-rails", "2.0.2"	164	+gem "jquery-rails"
		165	+gem "jquery-ui-rails"
162	gem "raphael-rails", "~> 2.1.2"	166	gem "raphael-rails", "~> 2.1.2"
163	gem 'bootstrap-sass', '~> 3.0'	167	gem 'bootstrap-sass', '~> 3.0'
164	gem "font-awesome-rails", '~> 3.2'	168	gem "font-awesome-rails", '~> 3.2'
	@@ -232,4 +236,4 @@ end		@@ -232,4 +236,4 @@ end
232		236
233	group :production do	237	group :production do
234	gem "gitlab_meta", '6.0'	238	gem "gitlab_meta", '6.0'
235	-end
236	\ No newline at end of file	239	\ No newline at end of file
		240	+end
	@@ -34,7 +34,6 @@ GEM		@@ -34,7 +34,6 @@ GEM
34	rake (>= 0.8.7)	34	rake (>= 0.8.7)
35	arel (4.0.2)	35	arel (4.0.2)
36	asciidoctor (0.1.4)	36	asciidoctor (0.1.4)
37	- atomic (1.1.16)
38	awesome_print (1.2.0)	37	awesome_print (1.2.0)
39	axiom-types (0.0.5)	38	axiom-types (0.0.5)
40	descendants_tracker (~> 0.0.1)	39	descendants_tracker (~> 0.0.1)
	@@ -101,6 +100,7 @@ GEM		@@ -101,6 +100,7 @@ GEM
101	devise-async (0.8.0)	100	devise-async (0.8.0)
102	devise (>= 2.2, < 3.2)	101	devise (>= 2.2, < 3.2)
103	diff-lcs (1.2.5)	102	diff-lcs (1.2.5)
		103	+ diffy (3.0.3)
104	docile (1.1.1)	104	docile (1.1.1)
105	dotenv (0.9.0)	105	dotenv (0.9.0)
106	email_spec (1.5.0)	106	email_spec (1.5.0)
	@@ -247,15 +247,14 @@ GEM		@@ -247,15 +247,14 @@ GEM
247	rake	247	rake
248	jasmine-core (2.0.0.rc5)	248	jasmine-core (2.0.0.rc5)
249	jquery-atwho-rails (0.3.3)	249	jquery-atwho-rails (0.3.3)
250	- jquery-rails (2.1.3)
251	- railties (>= 3.1.0, < 5.0)
252	- thor (~> 0.14)	250	+ jquery-rails (3.1.0)
		251	+ railties (>= 3.0, < 5.0)
		252	+ thor (>= 0.14, < 2.0)
253	jquery-turbolinks (2.0.1)	253	jquery-turbolinks (2.0.1)
254	railties (>= 3.1.0)	254	railties (>= 3.1.0)
255	turbolinks	255	turbolinks
256	- jquery-ui-rails (2.0.2)
257	- jquery-rails
258	- railties (>= 3.1.0)	256	+ jquery-ui-rails (4.2.1)
		257	+ railties (>= 3.2.16)
259	json (1.8.1)	258	json (1.8.1)
260	jwt (0.1.8)	259	jwt (0.1.8)
261	multi_json (>= 1.5)	260	multi_json (>= 1.5)
	@@ -280,7 +279,7 @@ GEM		@@ -280,7 +279,7 @@ GEM
280	mime-types (1.25.1)	279	mime-types (1.25.1)
281	mini_portile (0.5.3)	280	mini_portile (0.5.3)
282	minitest (4.7.5)	281	minitest (4.7.5)
283	- multi_json (1.9.2)	282	+ multi_json (1.9.3)
284	multi_xml (0.5.5)	283	multi_xml (0.5.5)
285	multipart-post (1.2.0)	284	multipart-post (1.2.0)
286	mysql2 (0.3.11)	285	mysql2 (0.3.11)
	@@ -375,7 +374,7 @@ GEM		@@ -375,7 +374,7 @@ GEM
375	rake (>= 0.8.7)	374	rake (>= 0.8.7)
376	thor (>= 0.18.1, < 2.0)	375	thor (>= 0.18.1, < 2.0)
377	raindrops (0.12.0)	376	raindrops (0.12.0)
378	- rake (10.1.1)	377	+ rake (10.3.1)
379	raphael-rails (2.1.2)	378	raphael-rails (2.1.2)
380	rb-fsevent (0.9.3)	379	rb-fsevent (0.9.3)
381	rb-inotify (0.9.2)	380	rb-inotify (0.9.2)
	@@ -502,9 +501,8 @@ GEM		@@ -502,9 +501,8 @@ GEM
502	daemons (>= 1.0.9)	501	daemons (>= 1.0.9)
503	eventmachine (>= 1.0.0)	502	eventmachine (>= 1.0.0)
504	rack (>= 1.0.0)	503	rack (>= 1.0.0)
505	- thor (0.18.1)
506	- thread_safe (0.3.1)
507	- atomic (>= 1.1.7, < 2)	504	+ thor (0.19.1)
		505	+ thread_safe (0.3.3)
508	tilt (1.4.1)	506	tilt (1.4.1)
509	timers (1.1.0)	507	timers (1.1.0)
510	tinder (1.9.3)	508	tinder (1.9.3)
	@@ -531,6 +529,9 @@ GEM		@@ -531,6 +529,9 @@ GEM
531	execjs (>= 0.3.0)	529	execjs (>= 0.3.0)
532	json (>= 1.8.0)	530	json (>= 1.8.0)
533	underscore-rails (1.4.4)	531	underscore-rails (1.4.4)
		532	+ unf (0.1.4)
		533	+ unf_ext
		534	+ unf_ext (0.0.6)
534	unicorn (4.6.3)	535	unicorn (4.6.3)
535	kgio (~> 2.6)	536	kgio (~> 2.6)
536	rack	537	rack
	@@ -574,6 +575,7 @@ DEPENDENCIES		@@ -574,6 +575,7 @@ DEPENDENCIES
574	default_value_for (~> 3.0.0)	575	default_value_for (~> 3.0.0)
575	devise (= 3.0.4)	576	devise (= 3.0.4)
576	devise-async (= 0.8.0)	577	devise-async (= 0.8.0)
		578	+ diffy (~> 3.0.3)
577	email_spec	579	email_spec
578	email_validator (~> 1.4.0)	580	email_validator (~> 1.4.0)
579	enumerize	581	enumerize
	@@ -603,9 +605,9 @@ DEPENDENCIES		@@ -603,9 +605,9 @@ DEPENDENCIES
603	httparty	605	httparty
604	jasmine (= 2.0.0.rc5)	606	jasmine (= 2.0.0.rc5)
605	jquery-atwho-rails (~> 0.3.3)	607	jquery-atwho-rails (~> 0.3.3)
606	- jquery-rails (= 2.1.3)	608	+ jquery-rails
607	jquery-turbolinks	609	jquery-turbolinks
608	- jquery-ui-rails (= 2.0.2)	610	+ jquery-ui-rails
609	kaminari (~> 0.15.1)	611	kaminari (~> 0.15.1)
610	launchy	612	launchy
611	letter_opener	613	letter_opener
	@@ -659,6 +661,7 @@ DEPENDENCIES		@@ -659,6 +661,7 @@ DEPENDENCIES
659	turbolinks	661	turbolinks
660	uglifier	662	uglifier
661	underscore-rails (~> 1.4.4)	663	underscore-rails (~> 1.4.4)
		664	+ unf
662	unicorn (~> 4.6.3)	665	unicorn (~> 4.6.3)
663	unicorn-worker-killer	666	unicorn-worker-killer
664	version_sorter	667	version_sorter
	@@ -29,11 +29,11 @@		@@ -29,11 +29,11 @@
29		29
30	* [GitLab.com](https://www.gitlab.com/) includes information about [subscriptions](https://www.gitlab.com/subscription/), [consultancy](https://www.gitlab.com/consultancy/), the [community](https://www.gitlab.com/community/) and the [hosted GitLab Cloud](https://www.gitlab.com/cloud/).	30	* [GitLab.com](https://www.gitlab.com/) includes information about [subscriptions](https://www.gitlab.com/subscription/), [consultancy](https://www.gitlab.com/consultancy/), the [community](https://www.gitlab.com/community/) and the [hosted GitLab Cloud](https://www.gitlab.com/cloud/).
31		31
32	-* [GitLab Enterprise Edition](https://www.gitlab.com/gitlab-ce/) offers additional features that are useful for larger organizations (100+ users).	32	+* [GitLab Enterprise Edition](https://www.gitlab.com/gitlab-ee/) offers additional features aimed at larger organizations.
33		33
34	* [GitLab CI](https://www.gitlab.com/gitlab-ci/) is a continuous integration (CI) server that is easy to integrate with GitLab.	34	* [GitLab CI](https://www.gitlab.com/gitlab-ci/) is a continuous integration (CI) server that is easy to integrate with GitLab.
35		35
36	-* Unofficial third-party [iPhone app](http://gitlabcontrol.com/) and [Android app](https://play.google.com/store/apps/details?id=com.bd.gitlab&hl=en) for GitLab	36	+* Unofficial third-party [iPhone app](http://gitlabcontrol.com/)m [Android app](https://play.google.com/store/apps/details?id=com.bd.gitlab&hl=en) and [command line client](https://github.com/drewblessing/gitlab-cli) for GitLab.
37		37
38	### Requirements	38	### Requirements
39		39
	@@ -12,6 +12,7 @@ class Admin::ProjectsController < Admin::ApplicationController		@@ -12,6 +12,7 @@ class Admin::ProjectsController < Admin::ApplicationController
12	@projects = @projects.with_push if params[:with_push].present?	12	@projects = @projects.with_push if params[:with_push].present?
13	@projects = @projects.abandoned if params[:abandoned].present?	13	@projects = @projects.abandoned if params[:abandoned].present?
14	@projects = @projects.search(params[:name]) if params[:name].present?	14	@projects = @projects.search(params[:name]) if params[:name].present?
		15	+ @projects = @projects.sort(@sort = params[:sort])
15	@projects = @projects.includes(:namespace).order("namespaces.path, projects.name ASC").page(params[:page]).per(20)	16	@projects = @projects.includes(:namespace).order("namespaces.path, projects.name ASC").page(params[:page]).per(20)
16	end	17	end
17		18
	@@ -26,6 +26,18 @@ class Projects::EditTreeController < Projects::BaseTreeController		@@ -26,6 +26,18 @@ class Projects::EditTreeController < Projects::BaseTreeController
26	end	26	end
27	end	27	end
28		28
		29	+ def preview
		30	+ @content = params[:content]
		31	+ #FIXME workaround https://github.com/gitlabhq/gitlabhq/issues/5936
		32	+ @content += "\n" if @blob.data.end_with?("\n")
		33	+
		34	+ diffy = Diffy::Diff.new(@blob.data, @content, diff: '-U 3',
		35	+ include_diff_info: true)
		36	+ @diff = Gitlab::DiffParser.new(diffy.diff.scan(/.*\n/))
		37	+
		38	+ render layout: false
		39	+ end
		40	+
29	private	41	private
30		42
31	def blob	43	def blob
	@@ -163,7 +163,7 @@ module ProjectsHelper		@@ -163,7 +163,7 @@ module ProjectsHelper
163	end	163	end
164		164
165	def repository_size(project = nil)	165	def repository_size(project = nil)
166	- "#{(project \|\| @project).repository.size} MB"	166	+ "#{(project \|\| @project).repository_size} MB"
167	rescue	167	rescue
168	# In order to prevent 500 error	168	# In order to prevent 500 error
169	# when application cannot allocate memory	169	# when application cannot allocate memory
	@@ -91,4 +91,12 @@ module TreeHelper		@@ -91,4 +91,12 @@ module TreeHelper
91	def leave_edit_message	91	def leave_edit_message
92	"Leave edit mode?\nAll unsaved changes will be lost."	92	"Leave edit mode?\nAll unsaved changes will be lost."
93	end	93	end
		94	+
		95	+ def editing_preview_title(filename)
		96	+ if gitlab_markdown?(filename) \|\| markup?(filename)
		97	+ 'Preview'
		98	+ else
		99	+ 'Diff'
		100	+ end
		101	+ end
94	end	102	end
	@@ -25,6 +25,7 @@ class Milestone < ActiveRecord::Base		@@ -25,6 +25,7 @@ class Milestone < ActiveRecord::Base
25		25
26	scope :active, -> { with_state(:active) }	26	scope :active, -> { with_state(:active) }
27	scope :closed, -> { with_state(:closed) }	27	scope :closed, -> { with_state(:closed) }
		28	+ scope :of_projects, ->(ids) { where(project_id: ids) }
28		29
29	validates :title, presence: true	30	validates :title, presence: true
30	validates :project, presence: true	31	validates :project, presence: true
	@@ -25,6 +25,7 @@ class GitPushService		@@ -25,6 +25,7 @@ class GitPushService
25		25
26	project.ensure_satellite_exists	26	project.ensure_satellite_exists
27	project.repository.expire_cache	27	project.repository.expire_cache
		28	+ project.update_repository_size
28		29
29	if push_to_existing_branch?(ref, oldrev)	30	if push_to_existing_branch?(ref, oldrev)
30	project.update_merge_requests(oldrev, newrev, ref, @user)	31	project.update_merge_requests(oldrev, newrev, ref, @user)