1. 12 May, 2016 16 commits
    • Jacob Schatz's avatar
      Merge branch 'send-incremental-build-log' into 'master' · f2303f9d
      Jacob Schatz authored
      Update build log incrementally
      
      Proof of concept implementation of incremental sending of build log to browser.
      
      cc @jschatz1 @vsizov @grzesiek @tmaczukin 
      
      
      See merge request !3737
      f2303f9d
    • Yorick Peterse's avatar
      Merge branch 'update-changelog-875' into 'master' · 95163307
      Yorick Peterse authored
      Updated CHANGELOG for 8.7.5
      
      See merge request !4129
      95163307
    • Rémy Coutable's avatar
      Merge branch '14272-forks-listed-when-permission-is-missing' into 'master' · 7a5fbb49
      Rémy Coutable authored
      Only show forks for users who can download code
      
      The ForksController enforces this, so don't show the link if it won't go anywhere.
      
      Closes #14272.
      
      See merge request !4017
      7a5fbb49
    • Yorick Peterse's avatar
      Updated CHANGELOG for 8.7.5 · 0641fe6f
      Yorick Peterse authored
      [ci skip]
      0641fe6f
    • Rémy Coutable's avatar
      Merge branch 'fix/reuse-runner-edit-form-in-admin-area' into 'master' · 66824e09
      Rémy Coutable authored
      Reuse runners edit form in admin and project area
      
      Reuse runners edit form in admin and project area.
      
      ![reuse_runner_form](/uploads/d16e3ee196151b68f584d947f38a7c29/reuse_runner_form.png)
      
      See merge request !4094
      66824e09
    • Rémy Coutable's avatar
      Merge branch 'total-method-time' into 'master' · 5298c3cc
      Rémy Coutable authored
      Removed tracking of total method execution times
      
      See #17239 and 945c5b3f for more details. The Grafana dashboards used to visualize performance data were updated a while ago to no longer display this data.
      
      See merge request !4124
      5298c3cc
    • Sean McGivern's avatar
      Only show forks for users who can download code · 827fbc10
      Sean McGivern authored
      The ForksController enforces this, so don't show the link if it won't go
      anywhere.
      827fbc10
    • Rémy Coutable's avatar
      Merge branch '3870-commit-sorting-issue' into 'master' · a9cc14e0
      Rémy Coutable authored
      Group commits by date in server timezone
      
      `Time#to_date` just takes the (timezone-less) year, date, and month, and
      creates a new date from that. Because the commits in the list are
      grouped by date, rather than chunked when the date changes, a commit can
      be shown in the wrong order if its CommitDate has a timezone-less date
      that's different to other commits around it.
      
      Convert all CommitDates to the server timezone before grouping, as that
      will at least produce consistent results. Users can still see a
      timestamp on the commit that doesn't match the date it's grouped under,
      because the timestamp shown uses the user's local timezone, and the
      grouping uses the server's timezone, but that was an issue anyway.
      
      ### Before
      ![image](/uploads/1ffe0e2f86e03590cb96126d4f340436/image.png)
      
      ### After
      ![image](/uploads/b1be1b08782385d13c56528242a5829b/image.png)
      
      Closes #3870 and closes #17300.
      
      See merge request !4052
      a9cc14e0
    • Kamil Trzcinski's avatar
      Fix specs · 5bd356eb
      Kamil Trzcinski authored
      5bd356eb
    • Marin Jankovski's avatar
      Merge branch 'patch-2' into 'master' · 9393d6b6
      Marin Jankovski authored
      Update cas.md to reflect the current syntax, and added that gitlab-ctl reconfigure should be run.
      
      I spent a while trying to figure our why the cas wasn't working!
      
      Someone may need to update the source code section of the wiki
      
      See merge request !3850
      9393d6b6
    • Yorick Peterse's avatar
      Removed tracking of total method execution times · 945c5b3f
      Yorick Peterse authored
      Because method call timings are inclusive (that is, they include the
      time of any sub method calls) this would lead to the total method
      execution time often being far greater than the total transaction time.
      Because this is incredibly confusing it's best to simply _not_ track the
      total method execution time, after all it's not that useful to begin
      with.
      
      Fixes gitlab-org/gitlab-ce#17239
      945c5b3f
    • Yorick Peterse's avatar
      Merge branch 'update-8-8-guides' into 'master' · 624dc104
      Yorick Peterse authored
      Update 8.8 guides
      
      See merge request !4119
      624dc104
    • Rémy Coutable's avatar
      Merge branch '16568-relative-links-wiki-regression' into 'master' · f4a1ac23
      Rémy Coutable authored
      Relative Links in the Wiki Are Broken
      
      - [ ] #16568 (!4050) Relative links in wiki are broken
          - [x] Investigate issue
      
        
          - [x] Implementation / Fix
      
              - [x] Write (failing) tests for `WikiLinkFilter`
              - [x] Link to `./bar` should either get rewritten correctly or left alone
              - [x] Link to `./bar.md` should maybe get rewritten correctly (is left alone currently)
              - [x] Link to `bar.md` should get rewritten correctly
      
      
                  - [x] Check if this indeed a bug
      
          - [x] Make sure CI is green
          - [x] Assign to endboss
      
          - [x] Wait for review
      
          - [x] Implement review feedback
          - [ ] Wait for merge
      
      
      See merge request !4050
      f4a1ac23
    • Timothy Andrew's avatar
      Add CHANGELOG entry. · 555610b6
      Timothy Andrew authored
      555610b6
    • Timothy Andrew's avatar
      Implement @rymai's feedback after review. · a4ee7d25
      Timothy Andrew authored
      - Separate 'exercise' and 'verify' steps of tests.
      - Use `build_stubbed` instead of `build`
      a4ee7d25
    • Timothy Andrew's avatar
      Add a spec for `WikiLinkFilter` · a59ad393
      Timothy Andrew authored
      - And fix behavior for non-file hierarchical links.
      a59ad393
  2. 11 May, 2016 24 commits