summaryrefslogtreecommitdiff
path: root/app/helpers
Commit message (Expand)AuthorAgeFilesLines
* Little refactor for usage of html_safe. #3945Rubén Dávila2016-01-131-4/+5
* Fix broken spec. #3945Rubén Dávila2016-01-121-1/+2
* Small fixes from code review. #3945Rubén Dávila2016-01-121-3/+3
* Make diff_line_content helper return a safe String. #3945Rubén Dávila2016-01-121-2/+2
* Change strategy to highlight diffs. #3945Rubén Dávila2016-01-071-2/+2
* Fix broken spec and small refactor. #3945Rubén Dávila2015-12-301-2/+2
* New implementation for highlighting diff files. #3945Rubén Dávila2015-12-303-24/+3
* Add syntax highlighting to diff view. #3945Rubén Dávila2015-12-282-4/+31
* Merge branch 'close-open-ajax-issue' into 'master' Robert Speicher2015-12-251-0/+4
|\
| * resolves conflicts with new buttonsJacob Schatz2015-12-233-18/+25
| |\
| * | open and close issue via ajax request. With testsJacob Schatz2015-12-211-0/+4
* | | Merge branch 'revert_votes_back' into 'master' Dmitriy Zaporozhets2015-12-251-0/+12
|\ \ \
| * | | add sorting of awardsValery Sizov2015-12-251-0/+12
* | | | Merge branch 'rs-opengraph' into 'master' Douwe Maan2015-12-251-0/+74
|\ \ \ \ | |/ / / |/| | |
| * | | Add support for `twitter:label` meta tagsrs-opengraphRobert Speicher2015-12-241-0/+24
| * | | Truncate page_description to 30 wordsRobert Speicher2015-12-241-2/+2
| * | | Account for `@project.description` being nilRobert Speicher2015-12-231-1/+1
| * | | Add page descriptions and imagesRobert Speicher2015-12-231-0/+50
| | |/ | |/|
* | | Grace period support for TFAGabriel Mazetto2015-12-241-0/+12
* | | Merge branch 'edit-on-fork' into 'master' Dmitriy Zaporozhets2015-12-242-30/+113
|\ \ \
| * | | Fix specs and behavior for LFS filesDouwe Maan2015-12-181-6/+4
| * | | Satisfy RubocopDouwe Maan2015-12-181-2/+2
| * | | Automatically fork a project when not allowed to edit a file.Douwe Maan2015-12-182-29/+114
| | |/ | |/|
* | | Merge branch 'fix/visibility-level-setting-in-forked-projects' into 'master' Douwe Maan2015-12-241-2/+1
|\ \ \
| * \ \ Merge branch 'master' into fix/visibility-level-setting-in-forked-projectsTomasz Maczukin2015-12-2130-247/+324
| |\ \ \ | | |/ /
| * | | Merge branch 'master' into fix/visibility-level-setting-in-forked-projectsTomasz Maczukin2015-11-2011-113/+117
| |\ \ \
| * \ \ \ Merge branch 'master' into fix/visibility-level-setting-in-forked-projectsTomasz Maczukin2015-11-064-34/+2
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into fix/visibility-level-setting-in-forked-projectsTomasz Maczukin2015-11-041-1/+1
| |\ \ \ \ \
| * | | | | | Move visibility_level check for forked projects to Project modelTomasz Maczukin2015-11-031-2/+1
* | | | | | | Emoji picker: better alias handlingValery Sizov2015-12-241-1/+2
| |_|_|_|_|/ |/| | | | |
* | | | | | fix specsValery Sizov2015-12-221-2/+4
* | | | | | base implementation of emoji picker [ci skip]Valery Sizov2015-12-221-9/+5
* | | | | | Merge branch 'fix_leave_project_display' into 'master' Stan Hu2015-12-221-8/+8
|\ \ \ \ \ \
| * | | | | | Fix and test leave project displayDrew Blessing2015-12-211-8/+8
| | |_|_|_|/ | |/| | | |
* | | | | | ci_build_details_path should return nil if builds_page result is nilKamil Trzcinski2015-12-221-0/+2
* | | | | | removes api credentials from link to build_pageMarvin Frick2015-12-221-1/+8
|/ / / / /
* | | | | Merge remote-tracking branch 'origin/rs-simplify-status-icon'Dmitriy Zaporozhets2015-12-161-18/+4
|\ \ \ \ \
| * | | | | Define CI status icon colors in SCSS instead of a helperrs-simplify-status-iconRobert Speicher2015-12-121-18/+4
* | | | | | Rename .issuable-details to .detail-page (and -header and -description)Douwe Maan2015-12-161-5/+5
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-12-161-2/+2
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'rs-clipboard-fixes' into 'master' Douwe Maan2015-12-161-2/+2
| |\ \ \ \ \ \
| | * | | | | | Fix clipboard buttons on MR instructions and Commit#showrs-clipboard-fixesRobert Speicher2015-12-151-2/+2
* | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-12-161-2/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'rs-timeago' into 'master' Douwe Maan2015-12-161-2/+6
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Fix time_ago_with_tooltip for activity feedrs-timeagoRobert Speicher2015-12-111-2/+6
| | |/ / / / /
* | | | | | | Merge remote-tracking branch 'origin/feature/update-rubocop'Dmitriy Zaporozhets2015-12-165-8/+8
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fixed Rubocop offensesGabriel Mazetto2015-12-155-8/+8
* | | | | | | Banzai::XFilter -> Banzai::Filter::XFilterDouwe Maan2015-12-152-2/+2
* | | | | | | Move Markdown/reference logic from Gitlab::Markdown to BanzaiDouwe Maan2015-12-153-5/+5
|/ / / / / /
* | | | | | Merge branch 'master' into ux/suppress-ci-yml-warningGrzegorz Bizon2015-12-147-57/+32
|\ \ \ \ \ \