summaryrefslogtreecommitdiff
path: root/app/helpers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into update-ruby-2.2.4James Lopez2016-01-272-2/+6
|\
| * Merge branch 'rs-issue-12677' into 'master' Douwe Maan2016-01-261-1/+5
| |\
| | * Update text_color_for_bg helper to support RGB triplet color codesrs-issue-12677Robert Speicher2016-01-241-1/+5
| * | Adds base64 background search icon.Jacob Schatz2016-01-241-1/+1
| |/
* | fix rubocop new 2.2 syntax issuesJames Lopez2016-01-252-2/+2
|/
* Backport some changes from EEes_backportValery Sizov2016-01-221-0/+75
* Fix MR diff 'Edit' buttonfix-mr-diff-edit-buttonDouwe Maan2016-01-212-7/+7
* Save and use actual diff base commit for MR diff highlightingDouwe Maan2016-01-201-2/+1
* Restore helperDouwe Maan2016-01-201-0/+4
* Move parallel diff logic to separate classDouwe Maan2016-01-201-104/+0
* Refactor Gitlab::Highlight and fix testsDouwe Maan2016-01-191-2/+6
* Merge branch 'master' into issue_3945Rubén Dávila2016-01-1411-51/+55
|\
| * Merge branch 'import-gh-wiki' into 'master' Douwe Maan2016-01-141-1/+1
| |\
| | * Use the WikiPipeline when rendering the wiki markdown contentDouglas Barbosa Alexandre2016-01-141-1/+1
| * | Merge branch 'new-buttons-everywhere' into 'master' Dmitriy Zaporozhets2016-01-141-1/+1
| |\ \ | | |/ | |/|
| | * Standartize buttons and fields sizeDmitriy Zaporozhets2016-01-141-1/+1
| * | Merge branch 'remove-gray-bg'Dmitriy Zaporozhets2016-01-141-3/+5
| |\ \ | | |/
| | * New layout without background colorDmitriy Zaporozhets2016-01-131-3/+5
| * | Move `BroadcastMessage#status` to a helper since it's presentationalRobert Speicher2016-01-131-0/+10
| * | Update broadcast_message helperRobert Speicher2016-01-132-10/+14
| * | Merge branch 'maintain-milestone-filter' into 'master' Douwe Maan2016-01-131-1/+1
| |\ \ | | |/ | |/|
| | * enable milestone filter to stickGreg Smethells2016-01-121-1/+1
| * | Make sure time_ago_with_tooltip is using a Time objectrs-time_ago_with_tooltip-conversionRobert Speicher2016-01-121-1/+1
| |/
| * Merge branch 'improve_button_styles' into 'master' Dmitriy Zaporozhets2016-01-121-1/+1
| |\
| | * Improve button stylesDrew Blessing2016-01-081-1/+1
| * | Add title attribute to Emojis in award pickerrs-add-title-to-emojiRobert Speicher2016-01-111-3/+6
| * | Merge branch 'group-issues-sorting' into 'master' Dmitriy Zaporozhets2016-01-111-2/+2
| |\ \ | | |/ | |/|
| | * Sort by ID when sorting using "Recently created"Yorick Peterse2016-01-071-2/+2
| * | Merge branch 'sorting-dropdown-order' into 'master' Dmitriy Zaporozhets2016-01-081-2/+2
| |\ \
| | * | changes titlessorting-dropdown-orderJacob Schatz2016-01-071-2/+2
| | |/
| * | Use `xmlschema` where even more appropriate!Robert Speicher2016-01-071-1/+1
| * | Use `to_s(:iso8601)` where appropriateRobert Speicher2016-01-071-1/+1
| * | Add two custom Date/Time conversion formatsRobert Speicher2016-01-071-1/+1
| * | Remove stamp gemRobert Speicher2016-01-071-1/+1
| |/
| * Merge branch 'more-opengraph' into 'master' Robert Speicher2016-01-061-20/+5
| |\
| | * Don't override issue page description in project layout.Douwe Maan2016-01-061-8/+3
| | * Make `page_description` less magical :sparkles:Robert Speicher2016-01-051-11/+1
| | * Use `User#avatar_url` instead of `avatar_icon` helperRobert Speicher2016-01-051-6/+4
| | * Merge branch 'master' into more-opengraphDouwe Maan2016-01-053-3/+19
| | |\
| | * | Add Open Graph data for group, project and commit.Douwe Maan2015-12-251-0/+2
| * | | Enable Microsoft Azure OAuth2 supportJanis Meybohm2016-01-061-1/+1
| | |/ | |/|
| * | remove public field from namespace and refactoringnamespace-clean_upValery Sizov2016-01-041-1/+1
| * | catch Emoji encode errorValery Sizov2016-01-041-1/+1
| * | Downcased user or email search for avatar_icon.issue_3780Stefan Kahlhöfer2015-12-281-1/+1
* | | More refactoring from last code review. #3945Rubén Dávila2016-01-141-2/+2
* | | Remove duplication around highlighting.Douwe Maan2016-01-141-15/+1
* | | Refactor parallel_diff generation a bit.Douwe Maan2016-01-142-32/+65
* | | 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
View Lorry Controller Status