1. 14 Dec, 2016 1 commit
  2. 13 Dec, 2016 5 commits
  3. 08 Dec, 2016 5 commits
  4. 07 Dec, 2016 12 commits
  5. 02 Dec, 2016 11 commits
  6. 01 Dec, 2016 6 commits
    • Alejandro Rodríguez's avatar
      Update VERSION to 8.14.2 · b9442a5e
      Alejandro Rodríguez authored
      b9442a5e
    • Alejandro Rodríguez's avatar
      Update CHANGELOG.md for 8.14.2 · 4b6bf133
      Alejandro Rodríguez authored
      [ci skip]
      4b6bf133
    • Stan Hu's avatar
      Merge branch 'fix-optimistic-locking-for-destroy' into 'master' · c1b27a5f
      Stan Hu authored
      Make deleting with optimistic locking respect NULL
      
      Make deleting with optimistic locking respect NULL
      
      For now deleting with optimistic locking is broken when
      lock_version is still NULL, because Rails would try to
      delete with `lock_version = 0` while in the database
      the column is still `NULL`.
      
      The monkey patches would force Rails just pass whatever
      in the column, and stop Rails from casting `NULL` into `0`
      when the value is read from database.
      
      Closes #24766
      
      See merge request !7867
      c1b27a5f
    • Stan Hu's avatar
      Merge branch 'rescue-from-redis-init-errors' into 'master' · 01d77f62
      Stan Hu authored
      Gracefully recover from Redis connection failures in Sidekiq initializer
      
      Precompiling assets and other Rake tasks would fail if Redis were not available in certain cases.
      
      * Closes gitlab-org/gitlab-ce#25143
      * Closes gitlab-org/omnibus-gitlab#1743
      
      See merge request !7835
      01d77f62
    • Fatih Acet's avatar
      Merge branch '24836-tyeerror-e-is-null-when-clicking-plan-tab-in-cycle-analytics' into 'master' · deeae060
      Fatih Acet authored
      Pick valid event objects for the events list
      
      ## What does this MR do?
      Fixes JS error when loading events with possible `null` objects
      
      ## What are the relevant issue numbers?
      Closes #24836
      
      See merge request !7689
      deeae060
    • Fatih Acet's avatar
      Merge branch 'resolve-discussions-timeago' into 'master' · f187ecbd
      Fatih Acet authored
      Fixed resolved discussion timeago not rendering
      
      ## What does this MR do?
      
      Initialises the timeago element when a discussion is updated or resolved.
      
      ## Screenshots (if relevant)
      
      ![Screen_Shot_2016-11-22_at_11.49.22](/uploads/02900cc4de019ac33cd4d59d586629aa/Screen_Shot_2016-11-22_at_11.49.22.png)
      
      ## What are the relevant issue numbers?
      
      Closes #24787
      
      See merge request !7656
      f187ecbd