1. 23 3月, 2015 1 次提交
  2. 18 3月, 2015 28 次提交
  3. 17 3月, 2015 11 次提交
    • D
      Update Grack. · b27622a1
      Douwe Maan 提交于
      b27622a1
    • V
      improve UI · 22fcb2f4
      Valery Sizov 提交于
      22fcb2f4
    • D
      Satisfy Rubocop. · 7d2b34bd
      Douwe Maan 提交于
      7d2b34bd
    • D
      9c7fffb6
    • D
      Fix changelog. · df91781a
      Douwe Maan 提交于
      df91781a
    • D
      Merge branch 'atom-xhtml-squashed' into 'master' · e4ac6bbf
      Douwe Maan 提交于
      Fix invalid Atom feeds when using emoji, horizontal rules, or images
      
      This is a fix for issues #880, #723, #1113.
      
      Markdown must be rendered to XHTML, not HTML, when generating summary content for Atom feeds. Otherwise, content-less tags like *img* and *hr* are not terminated and make the Atom XML invalid. Such tags are generated when issue descriptions, merge request descriptions, comments, or commit messages use emoji, horizontal rules, or images.
      
      To pass this option through from the relevant Haml templates to the proper place in the `gfm()` method, a new method `gfm_with_options()` is introduced. It reuses the options dictionary passed to `markdown()` and interprets options `xhtml` and `parse_tasks` from it (the latter was a convenient replacement for `gfm_with_tasks()`). `xhtml` is already interpreted by Redcarpet::Render::HTML, but that alone was not sufficient, because the post-processing in `gfm()` would convert its XHTML tags back to HTML.
      
      I found no way of passing additional optional options to the existing `gfm()` method without requiring updates to existing callers and without getting in the way of the existing optional arguments, but maybe someone who knows more about Ruby than I can think of one.
      
      Thorough review appreciated since this is the first time I have used Ruby.
      
      See merge request !344
      e4ac6bbf
    • D
      Properly align save user profile button · 409097bd
      Dmitriy Zaporozhets 提交于
      409097bd
    • D
      Revert "Merge branch 'backup-permissions' into 'master'" · 3a324d9c
      Dmitriy Zaporozhets 提交于
      This reverts commit c42262b4, reversing
      changes made to c6586b12.
      3a324d9c
    • D
      Fix button color inside alert · 84edc020
      Dmitriy Zaporozhets 提交于
      84edc020
    • D
      89ef79f8
    • D
      Merge branch 'backup-permissions' into 'master' · c42262b4
      Dmitriy Zaporozhets 提交于
      Change permissions on backup files
      
      Use more restrictive permissions for backup tar files and for the db, uploads, and repositories directories inside the tar files.  See #1894.  Now the backup task recursively `chmod`s the `db/`, `uploads/`, and `repositories/` folders with 0700 permissions, and the tar file is created as 0600.
      
      cc @sytse
      
      See merge request !1703
      c42262b4