summaryrefslogtreecommitdiff
path: root/app/models/concerns
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into prevent_authored_awardable_votesbarthc2016-08-302-2/+6
|\
| * Merge branch 'shorten-task-status-phrase' into 'master' Douwe Maan2016-08-301-2/+2
| |\
| | * Shorten task status phraseClement Ho2016-08-291-2/+2
| * | Move #to_discussion to NoteOnDiff21211-comment-on-diff-partially-broken-after-updating-to-8-11Sean McGivern2016-08-301-0/+4
| |/
* | prevent authored awardable thumbs votesbarthc2016-08-301-2/+5
* | prevent authored awardable thumbs votesbarthc2016-08-282-0/+13
|/
* rename Statuseable to HasStatusDe Wet Blomerus2016-08-251-1/+1
* Also check if Akismet is enabled, before showing the `Submit as spam` button.fix-spam-submit-buttonPatricio Cano2016-08-221-1/+1
* Revert the revert of Optimistic Lockingrevert_revert_issuable_lockValery Sizov2016-08-221-0/+6
* Merge branch 'issue_18135' into 'master' Douwe Maan2016-08-192-15/+18
|\
| * Todos sorting dropdownissue_18135Felipe Artur2016-08-192-15/+18
* | Merge branch 'fix-discussions-on-changed-lines' into 'master' Robert Speicher2016-08-191-0/+4
|\ \
| * | Fix bug where notes weren’t shown in discussion when the code had changed a...Douwe Maan2016-08-191-0/+4
| |/
* | Merge branch 'wall-clock-time-for-showing-pipeline' into 'master' Robert Speicher2016-08-191-5/+10
|\ \
| * | Use travel_to instead of dependency injection, feedback:Lin Jen-Shin2016-08-191-1/+1
| * | Merge remote-tracking branch 'upstream/master' into wall-clock-time-for-showi...Lin Jen-Shin2016-08-172-0/+59
| |\ \ | | |/
| * | Introduce Gitlab::Utils.now so that it's easier to stubLin Jen-Shin2016-08-151-1/+1
| * | Merge branch 'pipeline-hooks-without-slack' into wall-clock-time-for-showing-...Lin Jen-Shin2016-08-151-12/+19
| |\ \
| * | | Cleanup the use of duration and optimize some queriesLin Jen-Shin2016-08-101-5/+10
* | | | Allow project group links to be expiredSean McGivern2016-08-181-0/+15
| |_|/ |/| |
* | | Backport changes from gitlab-org/gitlab-ee!581 to CE.Timothy Andrew2016-08-161-0/+7
* | | Further refactor and syntax fixes.Patricio Cano2016-08-151-28/+14
* | | Refactored AkismetHelper into AkismetService and cleaned up `Spammable`Patricio Cano2016-08-151-40/+28
* | | Allow `Issue` to be submitted as spamPatricio Cano2016-08-151-3/+15
* | | Refactored spam related code even furtherPatricio Cano2016-08-151-16/+28
* | | Complete refactor of the `Spammable` concern and tests:Patricio Cano2016-08-152-17/+56
* | | Lay the ground works to submit information to AkismetPatricio Cano2016-08-151-0/+15
| |/ |/|
* | Pre-create all builds for Pipeline when a trigger is receivedKamil Trzcinski2016-08-111-12/+19
|/
* Added concern for a faster "cache_key" methodfaster-cache-keysYorick Peterse2016-08-081-0/+16
* Merge branch 'rubocop/enable-access-modifiers-cops' into 'master' Robert Speicher2016-07-291-15/+15
|\
| * Enable Rubocop cops for invalid access modifiersrubocop/enable-access-modifiers-copsGrzegorz Bizon2016-07-191-1/+1
| * Fix some useless access modifiers in the codeGrzegorz Bizon2016-07-191-14/+14
* | Reduce number of queries made for merge_requests/:id/diffsfix/use-fewer-queries-for-mr-notesAhmad Sherif2016-07-281-1/+1
* | Refactor spam validation to a concern that can be easily reused and improve l...akismet-ui-checkPatricio Cano2016-07-261-0/+16
* | Add Discussion model to represent MR/diff discussiondiscussion-modelDouwe Maan2016-07-201-25/+0
* | Mark builds with manual actions as skippedKamil Trzcinski2016-07-181-3/+3
|/
* Merge branch 'normalize_emoji_aliases_paths' into 'master' Rémy Coutable2016-07-181-2/+7
|\
| * Fix not normalized emoji pathsdixpac2016-07-141-2/+7
* | Merge branch 'fix-mentioned-users-on-diff-notes' into 'master' Douwe Maan2016-07-152-6/+9
|\ \
| * | Use cattr_accessor instead duplicating code on NoteOnDiff concernDouglas Barbosa Alexandre2016-07-153-9/+9
| * | Fix mentioned users list on diff notesDouglas Barbosa Alexandre2016-07-151-0/+3
| |/
* | Revert "Optimistic locking for Issue and Merge Requests"revert-lock-for-issuableStan Hu2016-07-131-6/+0
|/
* Optimistic locking for Issue and Merge RequestsValery Sizov2016-07-121-0/+6
* Remove duplication, unused methods, and some other style thingsDouwe Maan2016-07-061-2/+0
* Add some more code comments.Douwe Maan2016-07-061-0/+1
* Extract parts of LegacyDiffNote into DiffOnNote concern and move part of resp...Douwe Maan2016-07-061-0/+53
* Merge branch 'master' into dev-masterTomasz Maczukin2016-07-021-1/+0
|\
| * Enable Style/EmptyLines cop, remove redundant onesrubocop/enable-cops-for-empty-linesGrzegorz Bizon2016-07-011-1/+0
* | Ensure logged-out users can't see private refsSean McGivern2016-06-301-1/+1
|/
* Preload notes/discussions associations (award_emoji: :user)optimize-award-emojiPaco Guzman2016-06-232-10/+20