delta/gitlab/gitlab-ce.git/app/controllers/concerns, branch fix/update-gitlab-git

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into pipeline-hooks-without-slack

2016-08-16T20:17:15+00:00

Further refactor and syntax fixes.

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

Refactored AkismetHelper into AkismetService and cleaned up `Spammable`

2016-08-15T18:18:15+00:00

- Refactored SpamCheckService into SpamService

Allow `Issue` to be submitted as spam

2016-08-15T18:18:15+00:00

- Added controller actions as reusable concerns
- Added controller tests

Merge remote-tracking branch 'upstream/master' into pipeline-hooks-without-slack

2016-08-11T05:35:35+00:00

* upstream/master: (233 commits)
  Fix awardable button mutuality loading spinners
  Update CHANGELOG for 8.10.5
  Clean up project destruction
  Small refactor of doc/development/README.md
  Avoid commit lookup on diff_helper
  Removed extra newline from redis_spec.rb
  Used cached value of project count to reduce DB load
  Remove duplicate link_to statements
  Mention add_column_with_default in downtime guide
  Add missing space to generic badge template
  Rename `run` task helper method to prevent conflict with StateMachine
  Add a method in Project to return a cached value of total count of projects
  spellcheck
  Add svg guidelines to ui guide
  Add Changelog entry for Grape upgrade [ci skip]
  Fix Grape tests.
  Retain old behavior
  Update Grape from 0.13.0 to 0.15.0.
  adds second batch of tests changed to active tense
  fixes part1 of files to start using active tense
  ...

More descriptive comments, feedback:

2016-08-03T09:33:34+00:00

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5620#note_13539571

Cache highlighted diff lines for merge requests

2016-08-03T05:00:19+00:00

Introducing the concept of SafeDiffs which relates 
diffs with UI highlighting.

Implement pipeline hooks, extracted from !5525

2016-08-02T10:22:24+00:00

Closes #20115

State specific default sort order for issuables

2016-08-01T09:28:56+00:00

Provide more sensible default sort order for issues and merge requests
based on the following table:

| type           | state  | default sort order |
|----------------|--------|--------------------|
| issues         | open   | last created       |
| issues         | closed | last updated       |
| issues         | all    | last created       |
| merge requests | open   | last created       |
| merge requests | merged | last updated       |
| merge requests | closed | last updated       |
| merge requests | all    | last created       |

Refactor service settings view

2016-07-20T15:11:37+00:00