1. 02 Jun, 2016 17 commits
    • Alfredo Sumaran's avatar
      c966d55e
    • Stan Hu's avatar
      Merge branch 'fix-inline-filter-speed' into 'master' · 5accd87a
      Stan Hu authored
      Fix serious performance bug with rendering Markdown with InlineDiffFilter
      
      Nokogiri's `node.replace` was being unnecessarily called for every text node in
      the document due to a comparison bug. The code previously was comparing the
      HTML representation of the full document against the text node, which would
      always fail. Fix the comparison to just compare the modified text.
      
      Closes #18011 
      
      
      See merge request !4392
      5accd87a
    • Rémy Coutable's avatar
      Merge branch '14446-no_group_avatar-png-link' into 'master' · f828b744
      Rémy Coutable authored
      Fix link to blank group icon
      
      When the group is the default blank icon, this needs to use the
      `image_path` helper; otherwise, the link won't work if assets are
      precompiled. This still works fine for uploaded icons in either case.
      
      Closes #14446.
      
      See merge request !4375
      f828b744
    • Rémy Coutable's avatar
      Merge branch 'chujinjin/gitlab-ce-fix_wiki_project_clone_address_error' into 'master' · 8d23e872
      Rémy Coutable authored
      Fix wiki project clone address error
      
      _Note: Originally opened at !4407 by @chujinjin._
      
      ---
      
      fix wiki project clone address error in Wiki Git Access View, show as below:
      
      ![image](/uploads/5e3bf6d1418c42862a885319c31bc3cf/image.png)
      
      Fixes #17643.
      
      See merge request !4429
      8d23e872
    • Sean McGivern's avatar
      Fix link to blank group icon · 1521dc51
      Sean McGivern authored
      When the group is the default blank icon, this needs to use the
      `image_path` helper; otherwise, the link won't work if assets are
      precompiled. This still works fine for uploaded icons in either case.
      1521dc51
    • Achilleas Pipinellis's avatar
      Merge branch 'minor_doc_updates' into 'master' · acfbeced
      Achilleas Pipinellis authored
      Minor doc updates
      
      ## What does this MR do?
      
      Adds to and clarifies some documentation. Specifically, when using `gdb` to debug you need to detach and exit when done. Next, this clarifies the type of file locking that we require.
      
      Thanks to @northrup for the details about mandatory vs. advisory file locking.
      
      Note: These were two really small changes so I combined in to one merge request. However, I left the commits separate for clarity.
      
      See merge request !4421
      acfbeced
    • chujinjin's avatar
      Fix wiki project clone address error · c102b03e
      chujinjin authored
      c102b03e
    • Stan Hu's avatar
      Fix serious performance bug with rendering Markdown with InlineDiffFilter · ad3d0585
      Stan Hu authored
      Nokogiri's `node.replace` was being unnecessarily called for every text node in
      the document due to a comparison bug. The code previously was comparing the
      HTML representation of the full document against the text node, which would
      always fail. Fix the comparison to just compare the modified text.
      
      Closes #18011
      ad3d0585
    • Robert Speicher's avatar
      Merge branch 'cs-unnecessary-assets' into 'master' · 30524901
      Robert Speicher authored
      Load d3 only when necessary
      
      Now d3 is only loaded on the users' show page and the graphs pages, where it's necessary.
      
      Redo of !3993.
      
      This decreases page size from 4.6MB to 4.3MB for a given Activity page (before compression), or a savings of 300KB. This is essentially a proof of concept for removing larger dependencies such as the Ace Editor, Chart.js, and Raphael, which will likely provide another 1MB of savings on most pages (again, before compression).
      
      See merge request !4394
      30524901
    • Robert Speicher's avatar
      Merge branch 'cleanup-readme' into 'master' · 34861c5f
      Robert Speicher authored
      Remove Coveralls and Semaphore badges. [ci skip]
      
      Remove Coveralls and Semaphore badges from the README. They're outdated,
      unused, and not GitLab CI :)
      
      [ci skip]
      
      See merge request !4334
      34861c5f
    • Connor Shea's avatar
      Move JS graph specs to match assets tree. · 586d1a9b
      Connor Shea authored
      586d1a9b
    • Connor Shea's avatar
      Fix teaspoon · 81f46054
      Connor Shea authored
      81f46054
    • Connor Shea's avatar
      Fix indentation · 3eb683b6
      Connor Shea authored
      3eb683b6
    • Connor Shea's avatar
      Attempt to fix the user page. · 026b7abc
      Connor Shea authored
      026b7abc
    • Connor Shea's avatar
      0256e683
    • Robert Speicher's avatar
      Merge branch 'fix-dropdown-cutoff' into 'master' · 933a6e0d
      Robert Speicher authored
      Adds a `title` attribute to the branch dropdown for when the name has been cut off.
      
      Fixes #18056 
      
      See merge request !4395
      933a6e0d
    • Robert Speicher's avatar
      Merge branch 'upgrade-devise-two-factor' into 'master' · 7d33fba7
      Robert Speicher authored
      Upgrade devise, devise-two-factor, and attr_encrypted
      
      Devise 4 includes support for Rails 5, working towards #14286. devise-async doesn't support Devise 4.0 and in 4.1 the bug that was blocking using Devise's built-in ActiveJob integration was fixed. So devise-async is removed. devise-two-factor 3.0.0 is required for Devise 4 support.
      
      attr_encrypted and encryptor are optional but recommended upgrades for devise-two-factor 3.0.0. The mode and algorithm will need to be changed in order to update to attr_encrypted 4.x in the future.
      
      See merge request !4216
      7d33fba7
  2. 01 Jun, 2016 23 commits