Skip to content
Snippets Groups Projects
  1. Mar 27, 2018
  2. Mar 23, 2018
    • Sean McGivern's avatar
      Fix 500 error when trying to resolve non-ASCII conflicts in editor · 70af1e2e
      Sean McGivern authored
      When we added caching, this meant that calling `can_be_resolved_in_ui?` didn't
      always call `lines`, which meant that we didn't get the benefit of the
      side-effect from that, where it forced the conflict data itself to UTF-8.
      
      To fix that, make this explicit by separating the `raw_content` (any encoding)
      from the `content` (which is either UTF-8, or an exception is raised).
      70af1e2e
  3. Mar 14, 2018
    • Zeger-Jan van de Weg's avatar
      Change Gitlab::Shell#add_namespace to #create_namespace · 77f0906e
      Zeger-Jan van de Weg authored
      Prior to this change, this method was called add_namespace, which broke
      the CRUD convention and made it harder to grep for what I was looking
      for. Given the change was a find and replace kind of fix, this was
      changed without opening an issue and on another feature branch.
      
      If more dynamic calls are made to add_namespace, these could've been
      missed which might lead to incorrect bahaviour. However, going through
      the commit log it seems thats not the case.
      Unverified
      77f0906e
  4. Mar 12, 2018
  5. Mar 06, 2018
  6. Mar 05, 2018
  7. Mar 02, 2018
  8. Mar 01, 2018
  9. Feb 26, 2018
  10. Feb 21, 2018
    • Zeger-Jan van de Weg's avatar
      Handle branch and tag names which are commit ids · e70fe782
      Zeger-Jan van de Weg authored
      Adds a test where a branch name is also a valid commit id. Git, the
      binary should create an error message which is difficult to parse and
      leading to errors later, as seen in: gitlab-org/gitlab-ce#43222
      
      To catch these cases in the future,
      gitlab-test@1942eed5cc108b19c7405106e81fa96125d0be22 was created. Which
      a branch name matching the commit
      Unverified
      e70fe782
  11. Feb 20, 2018
  12. Feb 19, 2018
    • Sean McGivern's avatar
      Fix squash with renamed files · 01f5035b
      Sean McGivern authored
      We need to ignore the names for renamed files when configuring with sparse
      checkout.
      01f5035b
    • Stan Hu's avatar
      Fix squash rebase not working when diff contained encoded data · 8d32dfef
      Stan Hu authored
      When the applied diff contains UTF-8 or some other encoded data, the diff
      returned back from the git process may be in ASCII-8BIT format. Writing this
      data to stdin may fail if the data because stdin expects this data to be in
      UTF-8. By switching the output to binmode, we ensure that the diff will
      always be written as-is.
      
      Closes gitlab-org/gitlab-ee#4960
      8d32dfef
  13. Feb 07, 2018
    • Ahmad Sherif's avatar
      Migrate Git::Blob.batch to Gitaly · dabc703a
      Ahmad Sherif authored
      Closes gitaly#985
      dabc703a
    • Francisco Javier López's avatar
      Removing gitaly flags · d40912bb
      Francisco Javier López authored
      d40912bb
    • Zeger-Jan van de Weg's avatar
      Don't use rugged in Repository#refs_hash · 73e78c4e
      Zeger-Jan van de Weg authored
      The refs hash is used to determine what branches and tags have a commit
      as head in the network graph. The previous implementation depended on
      Rugged#references. The problem with this implementation was that it
      depended on rugged, but also that it iterated over all references and
      thus loading more data than needed if for example the project uses CI/CD
      environments, Pipelines, or Merge Requests.
      
      Given only refs are checked the network cares about the GraphHelper#refs
      method has no need to reject those, simplifying the method.
      
      Closes gitlab-org/gitaly#880
      Unverified
      73e78c4e
  14. Feb 06, 2018
    • James Edwards-Jones's avatar
      File upload UI obeys LFS filters · d2a77094
      James Edwards-Jones authored
      Uses Lfs::FileModificationHandler to coordinate LFS detection, creation of LfsObject, etc
      
      Caveats:
       1. This isn't used by the multi-file editor / Web IDE
       2. This isn't used on rename. We'd need to be able to download LFS files
          and add them to the commit if they no longer match so not as simple.
       3. We only check the root .gitattributes file, so this should be improved
          to correctly check for nested .gitattributes files in subfolders.
      d2a77094
  15. Feb 05, 2018
  16. Feb 02, 2018
  17. Feb 01, 2018
  18. Jan 31, 2018
  19. Jan 30, 2018
  20. Jan 29, 2018
  21. Jan 25, 2018
  22. Jan 24, 2018
Loading