1. 13 5月, 2016 4 次提交
  2. 12 5月, 2016 17 次提交
    • R
      Merge branch 'fix/reuse-runner-edit-form-in-admin-area' into 'master' · 66824e09
      Rémy Coutable 提交于
      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
      Merge branch 'total-method-time' into 'master' · 5298c3cc
      Rémy Coutable 提交于
      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
    • S
      Only show forks for users who can download code · 827fbc10
      Sean McGivern 提交于
      The ForksController enforces this, so don't show the link if it won't go
      anywhere.
      827fbc10
    • R
      Merge branch '3870-commit-sorting-issue' into 'master' · a9cc14e0
      Rémy Coutable 提交于
      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
    • K
      Fix specs · 5bd356eb
      Kamil Trzcinski 提交于
      5bd356eb
    • M
      Merge branch 'patch-2' into 'master' · 9393d6b6
      Marin Jankovski 提交于
      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
    • Y
      Removed tracking of total method execution times · 945c5b3f
      Yorick Peterse 提交于
      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
    • Y
      Merge branch 'update-8-8-guides' into 'master' · 624dc104
      Yorick Peterse 提交于
      Update 8.8 guides
      
      See merge request !4119
      624dc104
    • R
      Merge branch '16568-relative-links-wiki-regression' into 'master' · f4a1ac23
      Rémy Coutable 提交于
      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
    • T
      Add CHANGELOG entry. · 555610b6
      Timothy Andrew 提交于
      555610b6
    • T
      Implement @rymai's feedback after review. · a4ee7d25
      Timothy Andrew 提交于
      - Separate 'exercise' and 'verify' steps of tests.
      - Use `build_stubbed` instead of `build`
      a4ee7d25
    • T
      Add a spec for `WikiLinkFilter` · a59ad393
      Timothy Andrew 提交于
      - And fix behavior for non-file hierarchical links.
      a59ad393
    • D
      Merge branch 'issue_15572_snippets_tab_under_user_profile' into 'master' · f2251273
      Douwe Maan 提交于
      Add snippet tab under user profile
      
      Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15572
      
      See merge request !4001
      f2251273
    • D
      Merge branch 'rs-remove-icon_for_event' into 'master' · 44f6e34b
      Douwe Maan 提交于
      Remove unused `icon_for_event` helper
      
      Extracted from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4090
      
      See merge request !4120
      44f6e34b
    • R
      Remove unused `icon_for_event` helper · b523dec8
      Robert Speicher 提交于
      b523dec8
    • J
      Merge branch 'no-todo-badge-on-zero' into 'master' · 459af7ff
      Jacob Schatz 提交于
      Don't show the Todo count if there aren't any Todos.
      
      When there are 0 Todos, the Todos icon still had the blue badge with a "0" in it, which made me think I had a new Todo left. This makes it less annoying.
      
      Follow-up on !4077.
      
      **Before:**
      
      ![Screen_Shot_2016-05-10_at_9.36.57_PM](/uploads/e0dfafae01692286096606c3251f0997/Screen_Shot_2016-05-10_at_9.36.57_PM.png)
      
      **After:**
      
      ![Screen_Shot_2016-05-10_at_10.01.02_PM](/uploads/30a8bafe8f54862418eb4045e5777a9a/Screen_Shot_2016-05-10_at_10.01.02_PM.png)
      
      cc: @jschatz1 @rspeicher 
      
      See merge request !4113
      459af7ff
    • R
      Merge branch 'hook-docs-behavior' into 'master' · d8415389
      Robert Speicher 提交于
      Improve documentation and web test for web hooks
      
      Tips and documentation of actual hook behavior. Improved user feedback
      when testing hooks via the web UI.
      
      See merge request !4015
      d8415389
  3. 11 5月, 2016 19 次提交