delta/gitlab/gitlab-ce.git/app/models/concerns, branch tests-for-diff-notes

Merge branch 'issue_18135' into 'master'

2016-08-19T23:06:30+00:00


Todos sorting dropdown

Implements #18135 

![todos_sorting](/uploads/bff76827c421628134dfb8b864e47c74/todos_sorting.png)  


- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
  - [x] Added for this feature/bug
  - [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !5691

Todos sorting dropdown

2016-08-19T19:14:20+00:00

Merge branch 'fix-discussions-on-changed-lines' into 'master'

2016-08-19T18:15:47+00:00


Fix bug where notes weren’t shown in discussion when the code had changed after creation

See merge request !5908

Merge branch 'wall-clock-time-for-showing-pipeline' into 'master'

2016-08-19T17:42:26+00:00


Show wall-clock time when showing pipeline

## What does this MR do?

Show wall-clock time when showing pipeline instead of cumulative builds time.

Closes #17007

See merge request !5734

Fix bug where notes weren’t shown in discussion when the code had changed after creation

2016-08-19T17:38:40+00:00

Use travel_to instead of dependency injection, feedback:

2016-08-19T08:57:25+00:00

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5734#note_14056642

Allow project group links to be expired

2016-08-18T21:45:41+00:00

Merge remote-tracking branch 'upstream/master' into wall-clock-time-for-showing-pipeline

2016-08-17T05:30:12+00:00

* upstream/master: (99 commits)
  Update CHANGELOG for 8.10.6, 8.9.7, and 8.8.8
  Updated Akismet documentation
  Add hover state to todos (!5361)
  Load issues and merge requests templates from repository
  Backport EE assertions in protected branch related specs.
  Revert "Merge branch '19957-write-tests-for-adding-comments-for-different-line-types-in-diff' into 'master'"
  Fix a missed `before_action` for `AutocompleteController`.
  Backport `AutocompleteController#load_project` from EE!581.
  Fix API::BranchesSpec.
  Fix failing tests relating to backporting ee!581.
  Revert unrelevant changes
  Fix the protected branches factory.
  Improve EE compatibility with protected branch access levels.
  Move the "update" portion of the protected branch view into a partial.
  Don't select an access level if already selected.
  Backport changes from gitlab-org/gitlab-ee!581 to CE.
  Further refactor and syntax fixes.
  Upgrade httpclient gem from 2.7.0.1 to 2.8.2.
  Make rubocop happy
  Make rubocop happy
  ...

Backport changes from gitlab-org/gitlab-ee!581 to CE.

2016-08-16T05:35:14+00:00

!581 has a lot of changes that would cause merge conflicts if not
properly backported to CE. This commit/MR serves as a better
foundation for gitlab-org/gitlab-ee!581.

= Changes =

1. Move from `has_one {merge,push}_access_level` to `has_many`, with the
   `length` of the association limited to `1`. This is _effectively_ a
   `has_one` association, but should cause less conflicts with EE, which
   is set to `has_many`. This has a number of related changes in the
   views, specs, and factories.

2. Make `gon` variable loading more consistent (with EE!581) in the
   `ProtectedBranchesController`. Also use `::` to prefix the
   `ProtectedBranches` services, because this is required in EE.

3. Extract a `ProtectedBranchAccess` concern from the two access level
   models. This concern only has a single `humanize` method here, but
   will have more methods in EE.

4. Add `form_errors` to the protected branches creation form. This is
   not strictly required for EE compatibility, but was an oversight
   nonetheless.

Further refactor and syntax fixes.

2016-08-15T22:20:57+00:00