1. 03 Dec, 2014 2 commits
  2. 02 Dec, 2014 18 commits
  3. 01 Dec, 2014 15 commits
  4. 30 Nov, 2014 5 commits
    • Dmitriy Zaporozhets's avatar
      Merge branch 'backup_restore' into 'master' · 3dc986cf
      Dmitriy Zaporozhets authored
      Properly fix wiki restore
      
      My previous patch didn't fix the restore issue (!247).
      
      ProjectWiki.new() creates a new wiki git repository, so any tries to bare clone a bundle fail. With this patch we remove the newly created wiki.git before restoring from the backup bundle.
      
      \cc @jacobvosmaer @dzaporozhets are you ok with this solution/hack?
      
      Relevant issues: #845
      
      See merge request !248
      3dc986cf
    • Achilleas Pipinellis's avatar
      Properly fix wiki restore. · 191aa971
      Achilleas Pipinellis authored
      ProjectWiki.new() creates a new wiki git repository, so any tries
      to bare clone a bundle fail. With this patch we remove the newly
      created wiki.git before restoring from the backup bundle.
      191aa971
    • Dmitriy Zaporozhets's avatar
      Merge branch 'definition-of-done' · 05f40bbf
      Dmitriy Zaporozhets authored
      Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
      
      Conflicts:
      	CONTRIBUTING.md
      05f40bbf
    • Dmitriy Zaporozhets's avatar
      Update CHANGELOG · 31f75603
      Dmitriy Zaporozhets authored
      Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
      31f75603
    • Dmitriy Zaporozhets's avatar
      Merge branch 'reactivate-hljs-autodetection' into 'master' · f4b9a65c
      Dmitriy Zaporozhets authored
      Reactivate highlight.js language autodetection
      
      ### What does this MR do?
      
      This commit partly reverts commit 0d13abb1 to reactivate highlight.js language autodetection.
      
      It does NOT revert the part that adds the `nohighlight` CSS-class for a predefined set of filenames (which was indeed the intended purpose of commit 0d13abb1).
      
      ### Are there points in the code the reviewer needs to double check?
      
      Not particularly, the only effect of this blob_helper is to add a CSS class to the `<pre>` container of the blob, to control the way highlight.js performs its syntax highlighting. (see where this helper is called at https://gitlab.com/gitlab-org/gitlab-ce/blob/master/app/views/shared/_file_hljs.html.haml#L12).
      
      However this merge request DOES change the way the syntax highlighting is done (by bringing it back to the situation before commit 0d13abb1 where highlight.js autodetected the language itself). So we can expect some new kind of syntax highlighting problems. However in this case, the issues should be forwarded to the upstream project (https://github.com/isagalaev/highlight.js).
      
      ### Why was this MR needed?
      
      The main motivation behind this partial revert is that there is no point (IMHO) in using an "intelligent" syntax highlighter which is specifically designed to autodetect languages if it is to dictate (via the CSS class) the language to use solely based on the filename extension.
      
      ### What are the relevant issue numbers / Feature requests?
      
      Issue #665 "HLJS language autodetection / syntax highlighting fails "
      
      ### Screenshots (If appropriate)
      
      See screenshots in issue #665
      
      See merge request !232
      f4b9a65c