1. 02 Jun, 2016 17 commits
    • Kamil Trzcinski's avatar
    • Stan Hu's avatar
      Merge branch 'fix-inline-filter-speed' into 'master' · acf653e416fe
      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
      acf653e416fe
    • Rémy Coutable's avatar
      Merge branch '14446-no_group_avatar-png-link' into 'master' · 9b0b49dcfd08
      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
      9b0b49dcfd08
    • Rémy Coutable's avatar
      Merge branch 'chujinjin/gitlab-ce-fix_wiki_project_clone_address_error' into 'master' · e6052e5971dc
      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
      e6052e5971dc
    • Sean McGivern's avatar
      Fix link to blank group icon · 06feae77e8ce
      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.
      06feae77e8ce
    • Achilleas Pipinellis's avatar
      Merge branch 'minor_doc_updates' into 'master' · 0b7118aefbab
      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
      0b7118aefbab
    • chujinjin's avatar
      Fix wiki project clone address error · 613c573824f6
      chujinjin authored
      613c573824f6
    • Stan Hu's avatar
      Fix serious performance bug with rendering Markdown with InlineDiffFilter · 78b280a69c93
      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
      78b280a69c93
    • Robert Speicher's avatar
      Merge branch 'cs-unnecessary-assets' into 'master' · 6d995c08ac23
      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
      6d995c08ac23
    • Robert Speicher's avatar
      Merge branch 'cleanup-readme' into 'master' · 2579f7d2774f
      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
      2579f7d2774f
    • Connor Shea's avatar
      Move JS graph specs to match assets tree. · 899385e117c9
      Connor Shea authored
      899385e117c9
    • Connor Shea's avatar
      Fix teaspoon · cbd1d3a2d290
      Connor Shea authored
      cbd1d3a2d290
    • Connor Shea's avatar
      Fix indentation · 5298e30b4c66
      Connor Shea authored
      5298e30b4c66
    • Connor Shea's avatar
      Attempt to fix the user page. · 5f17dc1285b1
      Connor Shea authored
      5f17dc1285b1
    • Connor Shea's avatar
      de7fd7738b24
    • Robert Speicher's avatar
      Merge branch 'fix-dropdown-cutoff' into 'master' · 964ea06424d2
      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
      964ea06424d2
    • Robert Speicher's avatar
      Merge branch 'upgrade-devise-two-factor' into 'master' · 8a7e4404be15
      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
      8a7e4404be15
  2. 01 Jun, 2016 23 commits
    • Stan Hu's avatar
      Merge branch 'downcase-registry-repository' into 'master' · 0325c81fda19
      Stan Hu authored
      Use downcased path to container repository as this is expected path by Docker
      
      ## What does this MR do?
      
      Docker Engine requires path to be lowercase. This makes all container registry paths to be show and used downcased instead of mixed case.
      
      Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17959
      
      
      See merge request !4420
      0325c81fda19
    • Jacob Schatz's avatar
      Merge branch '17187-hover-row' into 'master' · 3bdc408bc54f
      Jacob Schatz authored
      Implement new row hover style
      
      ## What does this MR do?
      Implement new row hover style
      
      ## What are the relevant issue numbers?
      Closes #17187 
      
      ## Screenshots (if relevant)
      ![Screen_Shot_2016-06-01_at_1.40.04_PM](/uploads/62db01f405db50531fb648e46dc9598a/Screen_Shot_2016-06-01_at_1.40.04_PM.png)   
      
      cc @dzaporozhets 
      
      See merge request !4422
      3bdc408bc54f
    • Kamil Trzcinski's avatar
      040485492a78
    • Kamil Trzcinski's avatar
    • Annabel Dunstone's avatar
      Implement new row hover style · fa74dcb3b987
      Annabel Dunstone authored
      fa74dcb3b987
    • Drew Blessing's avatar
      Explicitly mention advisory file locking · 62a54600e58f
      Drew Blessing authored
      62a54600e58f
    • Drew Blessing's avatar
      Add gdb detach instructions · 413f3b89e9a5
      Drew Blessing authored
      413f3b89e9a5
    • Jacob Schatz's avatar
      Merge branch '17676-merge-request-widget-alignment' into 'master' · ea34d5739935
      Jacob Schatz authored
      MR widget mobile styling
      
      ## What does this MR do?
      
      Corrects MR widget styling for mobile viewing.
      
      ## Are there points in the code the reviewer needs to double check?
      
      I have tested all MR states.
      
      ## Why was this MR needed?
      
      UX.
      
      ## What are the relevant issue numbers?
      
      Closes #17676.
      
      ## Screenshots (if relevant)
      
      ![Screen_Shot_2016-05-31_at_20.04.02](/uploads/b1bc67b1015b2e771ae1b1364b225618/Screen_Shot_2016-05-31_at_20.04.02.png)![Screen_Shot_2016-05-31_at_20.03.50](/uploads/86a552c0d27d6f53cdf1b94631b26449/Screen_Shot_2016-05-31_at_20.03.50.png)![Screen_Shot_2016-05-31_at_20.03.34](/uploads/a5b9e7b634e974095922df9194d493b5/Screen_Shot_2016-05-31_at_20.03.34.png)![Screen_Shot_2016-05-31_at_20.01.35](/uploads/2fc5d49e3c1f2ff2cb324e9527179066/Screen_Shot_2016-05-31_at_20.01.35.png)![Screen_Shot_2016-05-31_at_20.00.25](/uploads/23af913891ff941dc5231872b3c6f177/Screen_Shot_2016-05-31_at_20.00.25.png)![Screen_Shot_2016-05-31_at_19.59.53](/uploads/8abb72609409ba7ca02ad6b35787c15c/Screen_Shot_2016-05-31_at_19.59.53.png)![Screen_Shot_2016-05-31_at_19.58.31](/uploads/fabf1c6c135f5e736614e568fc4cfb53/Screen_Shot_2016-05-31_at_19.58.31.png)![Screen_Shot_2016-05-31_at_19.58.51](/uploads/967a578a34cb3a9dd3723c2f22ce89c4/Screen_Shot_2016-05-31_at_19.58.51.png)![Screen_Shot_2016-05-31_at_23.33.19](/uploads/841af7a90bb3fc3c74a2e51b64fc444f/Screen_Shot_2016-05-31_at_23.33.19.png)![Screen_Shot_2016-05-31_at_23.33.23](/uploads/183fb8407c271d9aa3fefea5d8201238/Screen_Shot_2016-05-31_at_23.33.23.png)
      
      See merge request !4386
      ea34d5739935
    • Stan Hu's avatar
      Merge branch 'fix-note-validation-failure' into 'master' · b028e2a8a624
      Stan Hu authored
      Fix note validation spec failure
      
      Fix failing build due to project of note not matching issue project.
      
      See merge request !4415
      b028e2a8a624
    • Kamil Trzcinski's avatar
    • Jacob Schatz's avatar
      Merge branch 'add-edge-support' into 'master' · 1879a919309c
      Jacob Schatz authored
      Add Edge to supported browsers list.
      
      Add Microsoft's Edge browser to the list of supported browsers. We support the latest stable version.
      
      See merge request !4416
      1879a919309c
    • Connor Shea's avatar
      Add Edge to supported browsers list. [ci skip] · c909ceea70d7
      Connor Shea authored
      c909ceea70d7
    • Robert Speicher's avatar
      Merge branch 'dont-advertise-ci-skip' into 'master' · bc8edd631f3e
      Robert Speicher authored
      Don't advertise the use of "ci skip" in the CONTRIBUTING guide
      
      [ci skip]
      
      See merge request !4406
      bc8edd631f3e
    • Robert Speicher's avatar
      Merge branch 'style/enable-semicolon-rubocop-cop' into 'master' · 4728285271be
      Robert Speicher authored
      Enable Style/Semicolon rubocop style cop
      
      Don't use semicolons to terminate expressions.
      
      See #17478.
      
      See merge request !4351
      4728285271be
    • Robert Speicher's avatar
      Merge branch 'rubocop/enable-style-for-cop' into 'master' · d2ea5c5b0549
      Robert Speicher authored
      Enable Style/For rubocop cop
      
      > Do not use `for`, unless you know exactly why. Most of the time iterators should be used instead. `for` is implemented in terms of `each` (so you're adding a level of indirection), but with a twist - `for` doesn't introduce a new scope (unlike `each`) and variables defined in its block will be visible outside it.
      
      See #17478
      
      See merge request !4397
      d2ea5c5b0549
    • Stan Hu's avatar
      Fix note validation spec failures · 57409e071a00
      Stan Hu authored
      57409e071a00
    • Dmitriy Zaporozhets's avatar
      Merge branch 'dz-one-ci-cd-tab' into 'master' · 443b08276fa0
      Dmitriy Zaporozhets authored
      Merge Builds and Pipelines tab into one
      
      Based on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4053#note_12064642. Main idea is to keep all CI-related pages under one tab. So we can keep top navigation clean. 
      
      First I tried `CI/CD` naming but it looked weird so I just used Pipelines as tab name. I did not change project settings naming. 
      
      cc @ayufan @markpundsack @jschatz1 
      
      See merge request !4340
      443b08276fa0
    • Douwe Maan's avatar
      Merge branch 'separate-banzai-references' into 'master' · 730cc7eee54d
      Douwe Maan authored
      Separate reference gathering from rendering
      
      This is a required step to allow batch processing when gathering references. This in turn would allow grabbing (for example) all mentioned users of an issue/merge request using a single query.
      
      cc @rspeicher @DouweM 
      
      See merge request !3969
      730cc7eee54d
    • Yorick Peterse's avatar
      Refactor Participable · 8f2d80473517
      Yorick Peterse authored
      There are several changes to this module:
      
      1. The use of an explicit stack in Participable#participants
      2. Proc behaviour has been changed
      3. Batch permissions checking
      
      == Explicit Stack
      
      Participable#participants no longer uses recursion to process "self" and
      all child objects, instead it uses an Array and processes objects in
      breadth-first order. This allows us to for example create a single
      Gitlab::ReferenceExtractor instance and pass this to any Procs. Re-using
      a ReferenceExtractor removes the need for running potentially many SQL
      queries every time a Proc is called on a new object.
      
      == Proc Behaviour Changed
      
      Previously a Proc in Participable was expected to return an Array of
      User instances. This has been changed and instead it's now expected that
      a Proc modifies the Gitlab::ReferenceExtractor passed to it. The return
      value of the Proc is ignored.
      
      == Permissions Checking
      
      The method Participable#participants uses
      Ability.users_that_can_read_project to check if the returned users have
      access to the project of "self" _without_ running multiple SQL queries
      for every user.
      8f2d80473517
    • Douwe Maan's avatar
      Merge branch 'fix-cancelable-retryable' into 'master' · 5756d16be013
      Douwe Maan authored
      Fix cancelability and retriablity of pipeline with generic statuses
      
      Currently it's not possible to cancel or retry generic status since this is external thing to GitLab.
      
      This fixes shown actions of pipelines containing only these actions.
      
      
      See merge request !4380
      5756d16be013
    • Rémy Coutable's avatar
      Merge branch 'fix/error-500-in-pipeline-when-fork' into 'master' · 667cd66c7a6e
      Rémy Coutable authored
      Use project that belongs to pipeline in view
      
      ## What does this MR do?
      
      This MR makes project in pipelines view match the one that pipeline has been created for.
      
      Closes #17943 
      
      See merge request !4376
      667cd66c7a6e
    • Rémy Coutable's avatar
      Don't advertise the use of "ci skip" in the CONTRIBUTING guide · d9fbf706ba4b
      Rémy Coutable authored
      
      
      Now that we autoscale runner, we don't need to optimize for their usage
      anymore. Abusing of "ci skip", for instance for view changes can lead to
      broken specs, so let's just not use it!
      Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
      d9fbf706ba4b
    • Douwe Maan's avatar