1. 23 7月, 2015 5 次提交
  2. 22 7月, 2015 24 次提交
  3. 21 7月, 2015 11 次提交
    • V
      Merge branch 'document-2fa-backup' into 'master' · 8ba1a7a0
      Valery Sizov 提交于
      You need to store your DB encryption key
      
      You can break two-factor authentication for existing users when
      restoring a backup if you lost your DB encryption key.
      
      See merge request !1015
      8ba1a7a0
    • J
      You need to store your DB encryption key · 96819d2f
      Jacob Vosmaer 提交于
      96819d2f
    • H
      revert caching of note text · bf3b318e
      Hannes Rosenögger 提交于
      bf3b318e
    • V
      Merge branch 'changelog_update' into 'master' · 74778d70
      Valery Sizov 提交于
      Update changelog
      
      
      
      See merge request !1013
      74778d70
    • V
      Update changelog · 280576a2
      Valery Sizov 提交于
      280576a2
    • V
      Merge branch 'overwrite-during-backup' into 'master' · 2c4210f5
      Valery Sizov 提交于
      Don't stop if database.sql.gz already exists
      
      The existing behavior of the backups is to overwrite whatever data
      was still there in the scratch directories. This broke when we added
      a 'gzip' step because 'gzip database.sql' will fail if 'database.sql.gz'
      already exists. Doing 'rm -f database.sql.gz' before the 'gzip'
      avoids this failure.
      
      See merge request !1011
      2c4210f5
    • J
      Don't stop if database.sql.gz already exists · 346b0749
      Jacob Vosmaer 提交于
      The existing behavior of the backups is to overwrite whatever data
      was still there in the scratch directories. This broke when we added
      a 'gzip' step because 'gzip database.sql' will fail if 'database.sql.gz'
      already exists. Doing 'rm -f database.sql.gz' before the 'gzip'
      avoids this failure.
      346b0749
    • R
      Merge branch 'fix-changelog-7.11-7.12' into 'master' · 57f9a1cc
      Robert Schilling 提交于
      Fix change log for 7.11 and move entry to 7.12
      
      The change log for 7.11 was accidentally split in
      3865a1d9. Additionally, the change added
      with this commit did not make it into 7.11 according to
      `git branch --contains` and it has not been cherry picked to 7-11-stable
      so the entry is moved to 7.12.
      
      Refs GH-5625, GH-9318.
      
      See merge request !1009
      57f9a1cc
    • D
      Fix change log for 7.11 and move entry to 7.12 · e2524100
      Daniel Gerhardt 提交于
      The change log for 7.11 was accidentally split in
      3865a1d9. Additionally, the change added
      with this commit did not make it into 7.11 according to
      `git branch --contains` and it has not been cherry picked to 7-11-stable
      so the entry is moved to 7.12.
      
      Refs GH-5625, GH-9318.
      
      [ci skip]
      e2524100
    • S
      Merge branch 'gc-images-no-casing' into 'master' · e8c14790
      Stan Hu 提交于
      GoogleCode importer: Do not care about casing of image file extensions
      
      When a GoogleCode repository contains an attached image with an UPPERCASE file extension, it's not inlined.
      
      /CC @DouweM
      
      See merge request !1003
      e8c14790
    • S
      Merge branch 'fix-disabled-feature-access' into 'master' · 996ad35b
      Stan Hu 提交于
      Fix (i.e. prevent) access to disabled features for unauthenticated users
      
      Unauthenticated users had access to disabled features of public
      projects. The code has been slightly refactored so that feature checks
      are done in a separate method and can also be applied for public access.
      
      See merge request !1006
      996ad35b