summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'link-refs' into 'master' Robert Speicher2015-12-047-43/+131
|\
| * Merge branch 'master' into link-refsDouwe Maan2015-12-033-3/+8
| |\
| * \ Merge branch 'master' into link-refsDouwe Maan2015-12-024-10/+13
| |\ \
| * | | Satisfy RubocopDouwe Maan2015-12-021-1/+1
| * | | Fix referenced_mentionables method.Douwe Maan2015-12-011-1/+1
| * | | Autolink first so we don't pick up numeric anchors as issue references.Douwe Maan2015-12-015-25/+10
| * | | Render commit reference using short sha, but include full sha in comment.Douwe Maan2015-12-013-0/+20
| * | | Fix code docsDouwe Maan2015-12-011-5/+2
| * | | Fix specsDouwe Maan2015-11-301-3/+8
| * | | Recognize commit range with named refs in compare URLs.Douwe Maan2015-11-301-12/+19
| * | | Recognize issue/MR/snippet/commit links as references.Douwe Maan2015-11-306-12/+66
| * | | Render commit range reference with short shas, link to full shas.Douwe Maan2015-11-301-25/+45
| * | | Show local issues and MRs in "This X closes... / closed by..." sentenceDouwe Maan2015-11-301-1/+1
* | | | Fix application settings cache not expiring after changesStan Hu2015-12-042-14/+9
* | | | Merge branch 'fork-event' into 'master' Robert Speicher2015-12-031-1/+1
|\ \ \ \
| * \ \ \ Merge branch 'master' into fork-eventfork-eventDouwe Maan2015-12-033-3/+8
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Don't show project fork event as importedDouwe Maan2015-12-021-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'ui/issuable-filter' into 'master' Dmitriy Zaporozhets2015-12-032-4/+4
|\ \ \ \
| * \ \ \ Merge branch 'master' into ui/issuable-filterDouwe Maan2015-12-033-3/+8
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Use "Any Label" and "Any Milestone" in selects rather than the ambiguous "Any...Douwe Maan2015-12-022-4/+4
| | |/ / | |/| |
* | | | Touch project when toggling stars to update cacheGabriel Mazetto2015-12-031-1/+1
| |/ / |/| |
* | | fix deprecation messages in testsValery Sizov2015-12-033-3/+3
* | | git rid of deprecated warningsdeprecated_warningsValery Sizov2015-12-021-0/+5
|/ /
* | Merge branch 'upload_hook' into 'master' Valery Sizov2015-11-301-3/+7
|\ \
| * | Fire update hook from GitLabValery Sizov2015-11-301-3/+7
| |/
* | Merge branch 'rails_update_to_4_2' into 'master' Valery Sizov2015-11-303-7/+6
|\ \ | |/ |/|
| * test fixValery Sizov2015-11-301-1/+1
| * fix specsrails_update_to_4_2Valery Sizov2015-11-301-3/+3
| * Migrate mailers to ActiveJobValery Sizov2015-11-261-1/+1
| * Merge remote-tracking branch 'origin/master' into rails_update_to_4_2Valery Sizov2015-11-261-2/+1
| |\
| * | Rails update to 4.2.4Valery Sizov2015-11-251-3/+2
* | | Merge branch 'expire-application-settings-startup' of https://gitlab.com/stan...Dmitriy Zaporozhets2015-11-302-4/+20
|\ \ \
| * | | Expire application settings from cache at startupStan Hu2015-11-252-4/+20
| |/ /
* | | Merge branch 'jcorcuera/gitlab-ce-issue_3428'Douwe Maan2015-11-273-0/+39
|\ \ \
| * | | Strip attributes for Milestone and Issuable. #3428Jose Corcuera2015-11-263-0/+39
| | |/ | |/|
* | | Merge pull request #9670 from janten/gravatar-retinaStan Hu2015-11-261-2/+2
|\ \ \ | |/ / |/| |
| * | Fix merge errorJan-Gerd Tenberge2015-10-2239-475/+758
| |\ \
| * | | Add scale argument in user classJan-Gerd Tenberge2015-09-261-2/+2
* | | | Remove enumerize gemrs-remove-enumerizeRobert Speicher2015-11-251-2/+1
| |_|/ |/| |
* | | Merge branch 'ci-artifacts-path' into 'master' Robert Speicher2015-11-231-1/+1
|\ \ \
| * | | Expose artifacts pathci-artifacts-pathKamil Trzcinski2015-11-231-1/+1
* | | | Merge branch 'ci-fix-500' into 'master' Robert Speicher2015-11-232-0/+3
|\ \ \ \
| * | | | Fix 500 when using CIci-fix-500Kamil Trzcinski2015-11-232-0/+3
| |/ / /
* | | | 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-212-0/+20
* | | | Handle removed source projects in MR CI commitsfix-merge-requests-without-source-projectsYorick Peterse2015-11-201-1/+1
* | | | Fix Drone web hook URL not being updatedStan Hu2015-11-201-0/+2
|/ / /