summaryrefslogtreecommitdiff
path: root/app/models/concerns
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'unsubscribe-from-thread-from-email-footer' into 'master' Douwe Maan2016-01-141-0/+6
|\
| * Unsubscribe from thread through link in email footerZeger-Jan van de Weg2016-01-091-0/+6
* | Sort by ID when sorting using "Recently created"Yorick Peterse2016-01-071-0/+3
|/
* Fix mentionable reference extraction caching.Douwe Maan2016-01-061-2/+5
* Merge branch 'upvote_count_to_api' into 'master' Valery Sizov2015-12-291-4/+2
|\
| * Revert upvotes and downvotes params to MR APIValery Sizov2015-12-281-4/+2
* | Merge branch 'mention-all' into 'master' Robert Speicher2015-12-271-1/+1
|\ \ | |/ |/|
| * Only allow group/project members to mention `@all`Douwe Maan2015-12-241-1/+1
* | Add support for `twitter:label` meta tagsrs-opengraphRobert Speicher2015-12-241-0/+8
|/
* Use method that creates runners registration tokenGrzegorz Bizon2015-12-231-1/+0
* Add method that persist ensured token in `TokenAuthenticatable`Grzegorz Bizon2015-12-231-2/+13
* Fix method that ensures authentication tokenGrzegorz Bizon2015-12-231-6/+2
* Fix issue related cross-project MRsfix-issue-related-mrsDouwe Maan2015-12-211-1/+1
* Only cache markdown when object has been saved and has a proper cache_key.Douwe Maan2015-12-161-1/+1
* Merge remote-tracking branch 'origin/feature/update-rubocop'Dmitriy Zaporozhets2015-12-161-2/+2
|\
| * Fixed Rubocop offensesGabriel Mazetto2015-12-151-2/+2
* | Move Markdown/reference logic from Gitlab::Markdown to BanzaiDouwe Maan2015-12-152-22/+23
|/
* Make sure that token `ensure_*` method always returns a tokenGrzegorz Bizon2015-12-111-2/+6
* Use `save!` when generating new token in `TokenAuthenticatable`Grzegorz Bizon2015-12-111-1/+1
* Refactor `TokenAuthenticatable` to improve reusabilityGrzegorz Bizon2015-12-111-16/+24
* Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-12-072-3/+31
|\
| * Fix referenced_mentionables method.Douwe Maan2015-12-011-1/+1
| * Render commit reference using short sha, but include full sha in comment.Douwe Maan2015-12-011-0/+4
| * Fix specsDouwe Maan2015-11-301-3/+8
| * Recognize issue/MR/snippet/commit links as references.Douwe Maan2015-11-301-0/+19
* | Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-12-023-45/+75
|\ \ | |/
| * Strip attributes for Milestone and Issuable. #3428Jose Corcuera2015-11-262-0/+36
| * Merge branch 'issue_2296' into 'master' Douwe Maan2015-11-232-4/+34
| |\
| | * Fix bug that happened when replacing the Task list. #2296Rubén Dávila2015-11-201-1/+1
| | * Monkey patching TaskList::Item is no longer required. #2296Rubén Dávila2015-11-201-0/+2
| | * Generate system note after Task item has been updated on Issue or Merge Reque...Ruben Davila2015-11-192-4/+32
| * | Add upvote/downvote fields to merge request and note API to preserve compatib...fix-award-emoji-apiRobert Schilling2015-11-211-0/+10
| |/
| * Merge branch 'emoji_votes' into 'master' Dmitriy Zaporozhets2015-11-191-49/+0
| |\
| | * award emojiValery Sizov2015-11-191-49/+0
| * | Use a JOIN in IssuableFinder#by_projectYorick Peterse2015-11-191-0/+3
* | | Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-11-192-6/+7
|\ \ \ | |/ /
| * | Make it easier to re-apply default sort ordersYorick Peterse2015-11-181-1/+2
| |/
| * Change "recent" scopes to sort by "id"Yorick Peterse2015-11-111-1/+1
| * Only sort by IDs by defaultYorick Peterse2015-11-031-5/+5
* | Use faster, more appropriate pipeline for mentionable attributesDouwe Maan2015-10-221-1/+1
* | Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-10-212-4/+12
|\ \ | |/
| * Merge branch 'cross-reference-mr-on-issues' into 'master' Douwe Maan2015-10-181-0/+4
| |\
| | * Only accept open issues and merge requestsZeger-Jan van de Weg2015-10-161-0/+4
| * | Merge branch 'master' into rs-redactor-filterrs-redactor-filterDouwe Maan2015-10-161-1/+5
| |\ \ | | |/
| | * Eager load various issue/note associationsYorick Peterse2015-10-151-1/+6
| * | Merge branch 'master' into rs-redactor-filterDouwe Maan2015-10-153-30/+57
| |\ \ | | |/
* | | Remove stray conflict markerDouwe Maan2015-10-151-1/+0
* | | Merge branch 'master' into rs-redactor-filterDouwe Maan2015-10-142-42/+37
|\ \ \ | | |/ | |/|
| * | Make Mentionable#cross_reference_exists? private.simplify-cross-referencesDouwe Maan2015-10-141-6/+6
| * | Remove useless assignmentDouwe Maan2015-10-121-1/+1
View Lorry Controller Status