summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix rubocop offenses in upload rewriter specsfix/issue-move-rewrite-uploadsGrzegorz Bizon2016-03-311-1/+1
* Add Changelog entry for uploads fix when moving issueGrzegorz Bizon2016-03-311-0/+3
* Merge branch 'master' into fix/issue-move-rewrite-uploadsGrzegorz Bizon2016-03-3147-194/+9317
|\
| * Merge branch 'fix-commit-comment' into 'master' Rémy Coutable2016-03-311-1/+1
| |\
| | * Fix commit comment alignmentStan Hu2016-03-301-1/+1
| * | Merge branch 'upgrade-coffee-rails' into 'master' Robert Speicher2016-03-311-2/+2
| |\ \
| | * | Upgrade coffee-rails from 4.1.0 to 4.1.1connorshea2016-03-251-2/+2
| * | | Merge branch 'reorder-project-expire-cache' into 'master' Yorick Peterse2016-03-302-1/+3
| |\ \ \
| | * | | Expire the exists cache before deletion to ensure project dir actually existsStan Hu2016-03-272-1/+3
| * | | | Merge branch 'check-project-repo-exists' into 'master' Yorick Peterse2016-03-302-0/+30
| |\ \ \ \
| | * | | | Check if repo exists before attempting to update cache infoStan Hu2016-03-272-0/+30
| | |/ / /
| * | | | Merge branch 'cleanup-system-hook-spec' into 'master' Robert Speicher2016-03-301-27/+27
| |\ \ \ \
| | * | | | minor cleanup in system_hook_specZeger-Jan van de Weg2016-03-301-27/+27
| * | | | | Merge branch '14547_todo-click' into 'master' Jacob Schatz2016-03-305-1/+25
| |\ \ \ \ \
| | * | | | | Clear .todo listener14547_todo-clickAnnabel Dunstone2016-03-302-1/+2
| | * | | | | Change window.location to use turbolinksAnnabel Dunstone2016-03-301-3/+2
| | * | | | | Make entire todo row clickableAnnabel Dunstone2016-03-305-1/+25
| | |/ / / /
| * | | | | Merge branch 'precompile-emoji-urls' into 'master' Dmitriy Zaporozhets2016-03-305-26/+8670
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Pre-calculate Emoji digestsprecompile-emoji-urlsYorick Peterse2016-03-305-26/+8670
| * | | | | Merge branch 'tests/isolate-carrierwave-uploads' into 'master' Robert Speicher2016-03-302-0/+11
| |\ \ \ \ \
| | * | | | | Ensure uploads dir exists when running backup specstests/isolate-carrierwave-uploadsGrzegorz Bizon2016-03-301-0/+4
| | * | | | | Move CarrierWave test env config to separate fileGrzegorz Bizon2016-03-302-5/+7
| | * | | | | Isolate CarrierWave uploads in test enviromentGrzegorz Bizon2016-03-291-0/+5
| * | | | | | Merge branch '2364-fallback-to-in-reply-to-header' into 'master' Douwe Maan2016-03-3014-97/+303
| |\ \ \ \ \ \
| | * | | | | | Improve and finish the fallback to the In-Reply-To and References header for ...2364-fallback-to-in-reply-to-headerRémy Coutable2016-03-2514-125/+248
| | * | | | | | Fix #2364. Fall back to In-Reply-To header when reply key not availableDavid Padilla2016-03-257-4/+87
| * | | | | | | Merge branch 'patch/fix-mergerequest-diff' into 'master' Robert Speicher2016-03-304-7/+8
| |\ \ \ \ \ \ \
| | * | | | | | | Fixed MergeRequestController specpatch/fix-mergerequest-diffGabriel Mazetto2016-03-302-2/+3
| | * | | | | | | We need `sha` reference from `diff_base_commit` to generate the diffGabriel Mazetto2016-03-291-2/+2
| | * | | | | | | Use `diff_base_commit` instead of `target_branch` to generate diffsGabriel Mazetto2016-03-292-6/+6
| * | | | | | | | Merge branch 'refactor/project-badges-interface' into 'master' Robert Speicher2016-03-303-2/+99
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | Extend specs for build badgerefactor/project-badges-interfaceGrzegorz Bizon2016-03-291-9/+48
| | * | | | | | | Refactor builds badge, encapsulate inside a classGrzegorz Bizon2016-03-293-2/+60
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Add 8.6.2 CHANGELOG itemsRémy Coutable2016-03-301-4/+22
| * | | | | | | Merge branch 'functional-closed-sidebar' into 'master' Dmitriy Zaporozhets2016-03-309-26/+116
| |\ \ \ \ \ \ \
| | * | | | | | | Remove console logsJacob Schatz2016-03-301-1/+0
| | * | | | | | | Off the event initiallyJacob Schatz2016-03-301-1/+2
| | * | | | | | | Collapsed sidebar opens over instead of pushing content.Jacob Schatz2016-03-302-1/+7
| | * | | | | | | Sidebar collapse update issueJacob Schatz2016-03-307-18/+71
| | * | | | | | | User selection from collapsed sidebarJacob Schatz2016-03-301-0/+17
| | * | | | | | | Add json response for user avatar in merge requestJacob Schatz2016-03-301-1/+1
| | * | | | | | | Make changed values visible in minimized sidebar.Jacob Schatz2016-03-303-25/+39
| |/ / / / / / /
* | | | | | | | Improve specs for issue move serviceGrzegorz Bizon2016-03-311-2/+2
* | | | | | | | Extend specs for GFM uploads rewriterGrzegorz Bizon2016-03-312-11/+32
* | | | | | | | Remove reduntant `move_to_store` overrideGrzegorz Bizon2016-03-303-16/+10
* | | | | | | | Add method that returns markdown in file uploaderGrzegorz Bizon2016-03-303-2/+6
* | | | | | | | Check if GFM rewriters need rewrite internallyGrzegorz Bizon2016-03-303-2/+4
* | | | | | | | Add support for not Active Record based factoriesGrzegorz Bizon2016-03-301-4/+12
* | | | | | | | Refactor uploads rewriter used when moving issueGrzegorz Bizon2016-03-305-39/+27
* | | | | | | | Get FileUploader into test harness using factoryGrzegorz Bizon2016-03-303-6/+22