summaryrefslogtreecommitdiff
path: root/spec/helpers
Commit message (Collapse)AuthorAgeFilesLines
...
* | | New implementation for highlighting diff files. #3945Rubén Dávila2015-12-301-11/+0
| | | | | | | | | | | | | | | | | | * It is more performant given now we process all the diff file instead of processing line by line. * Multiline comments are highlighted correctly.
* | | Add syntax highlighting to diff view. #3945Rubén Dávila2015-12-281-0/+11
| |/ |/|
* | Merge branch 'revert_votes_back' into 'master' Dmitriy Zaporozhets2015-12-251-0/+7
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | Revert vote buttons back to issue and MR pages https://gitlab.com/gitlab-org/gitlab-ce/issues/3672 /cc @dzaporozhets @JobV ![joxi_screenshot_1450809309400](/uploads/379a75505e0d5f24e743aa0a6a6684e2/joxi_screenshot_1450809309400.png) See merge request !2206
| * satisfy rubocoprevert_votes_backValery Sizov2015-12-251-1/+1
| |
| * add sorting of awardsValery Sizov2015-12-251-0/+7
| |
* | Add support for `twitter:label` meta tagsrs-opengraphRobert Speicher2015-12-241-0/+29
| |
* | Truncate page_description to 30 wordsRobert Speicher2015-12-241-0/+13
| |
* | Account for `@project.description` being nilRobert Speicher2015-12-231-0/+8
| |
* | Add page descriptions and imagesRobert Speicher2015-12-231-0/+79
|/ | | | | | | | | | A limited number of pages have defined their own descriptions, but otherwise we default to the Project's description (if `@project` is set), or the old `brand_title` fallback. The image will either be the uploaded project icon (never a generated one), the user's uploaded icon or Gravatar, or, finally, the GitLab logo.
* fix specsValery Sizov2015-12-221-6/+0
|
* base implementation of emoji picker [ci skip]Valery Sizov2015-12-221-6/+0
|
* Merge branch 'fix_leave_project_display' into 'master' Stan Hu2015-12-221-0/+10
|\ | | | | | | | | | | | | | | | | | | | | Fix and test leave project display The 'Leave this project' display on project page was broken. It was calling the method incorrectly, which returned `nil` and displayed nothing. This fixes the display and also adds 2 different tests for it. cc/ @jvanbaarsen @stanhu Please review and merge if you think it looks good. Thank you! See merge request !2166
| * Fix and test leave project displayDrew Blessing2015-12-211-0/+10
| |
* | Move `ci_build_details_path` helper spec to correct locationRobert Speicher2015-12-212-22/+20
| | | | | | | | Also, make it not fail.
* | removes api credentials from link to build_pageMarvin Frick2015-12-221-0/+22
|/ | | | | Also adds a spec for MergeRequestHelper to avoid having a regression later on.
* Backport JIRA serviceDrew Blessing2015-12-181-4/+17
|
* Merge remote-tracking branch 'origin/rs-simplify-status-icon'Dmitriy Zaporozhets2015-12-161-8/+3
|\ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Define CI status icon colors in SCSS instead of a helperrs-simplify-status-iconRobert Speicher2015-12-121-8/+3
| |
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-12-161-3/+4
|\ \
| * | Fix time_ago_with_tooltip for activity feedrs-timeagoRobert Speicher2015-12-111-3/+4
| |/ | | | | | | Closes #4002
* | Fixed Rubocop offensesGabriel Mazetto2015-12-151-1/+1
|/
* Improve text indication visibility on snippetsZeger-Jan van de Weg2015-12-081-51/+34
|
* Fix spec failure introduced by 9d03bc6fa31f123e070bab4a58b67dbb008e75e9Robert Speicher2015-12-071-1/+1
|
* Merge branch 'rails_update_to_4_2' into 'master' Valery Sizov2015-11-301-1/+1
|\ | | | | | | | | | | | | Rails update to 4.2.4 https://gitlab.com/gitlab-org/gitlab-ce/issues/2694 See merge request !1902
| * fix specsrails_update_to_4_2Valery Sizov2015-11-301-1/+1
| |
* | Merge pull request #9670 from janten/gravatar-retinaStan Hu2015-11-261-6/+10
|\ \ | |/ |/| Add support for HiDPI displays in gravatar service
| * Fix merge errorJan-Gerd Tenberge2015-10-229-31/+97
| |\
| * \ Merge remote-tracking branch 'origin/master' into gravatar-retinaJan-Gerd Tenberge2015-10-221-1/+1
| |\ \
| | * | Update specJan-Gerd Tenberge2015-10-191-2/+2
| | | |
| * | | Update specJan-Gerd Tenberge2015-10-191-1/+1
| | | |
| * | | Add support for HiDPI displays in gravatar serviceJan-Gerd Tenberge2015-09-261-4/+8
| |/ /
* | | added specsValery Sizov2015-11-191-0/+26
| | |
* | | Allow groups to appear in the search results if the group owner allows itValery Sizov2015-11-051-0/+5
| |/ |/|
* | Merge branch 'cross-reference-mr-on-issues' into 'master' Douwe Maan2015-10-181-0/+10
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show merge requests which close current issue Closes #2903 ### What does this MR do If an issue is to be closed by a merge request the current user has access to, this will be displayed when the user looks at the issue. ![Screenshot_from_2015-10-12_12-10-37](https://gitlab.com/zj/gitlab-ce/uploads/52e429704e73067b24b69801f13ad7bc/Screenshot_from_2015-10-12_12-10-37.png) /cc @DouweM See merge request !1569
| * | Only accept open issues and merge requestsZeger-Jan van de Weg2015-10-161-0/+10
| | |
* | | Merge branch 'rs-redactor-filter' into 'master' Douwe Maan2015-10-171-12/+15
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Separate rendering of Markdown reference links from redacting those the user doesn't have access to and extracting referenced objects Related: !1014 See merge request !1090
| * \ \ Merge branch 'master' into rs-redactor-filterrs-redactor-filterDouwe Maan2015-10-162-0/+23
| |\ \ \ | | |/ /
| * | | Merge branch 'master' into rs-redactor-filterDouwe Maan2015-10-152-1/+6
| |\ \ \
| * | | | Refactor reference gathering to use a dedicated filterDouwe Maan2015-10-071-1/+1
| | | | |
| * | | | Merge branch 'master' into rs-redactor-filterDouwe Maan2015-10-079-16/+166
| |\ \ \ \
| * | | | | Fix GitlabMarkdownHelper specRobert Speicher2015-09-011-11/+14
| | | | | |
* | | | | | Merge branch 'filter-label' into 'master' Robert Speicher2015-10-161-5/+0
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | Allow dashboard and group issues/MRs to be filtered by label See merge request !1591
| * | | | | Merge branch 'master' into filter-labelfilter-labelDouwe Maan2015-10-141-5/+0
| | | | | |
* | | | | | Re-use User for avatars in link_to_memberYorick Peterse2015-10-151-0/+14
| | | | | |
* | | | | | Allow avatar_icon to operate on a UserYorick Peterse2015-10-151-0/+9
| |_|_|/ / |/| | | | | | | | | | | | | | | | | | | If the User object is already known before calling this method being able to re-use said object can save us an extra SQL query.
* | | | | Fix specsKamil Trzcinski2015-10-141-1/+1
|/ / / /
* | | | Support filtering by "Any" milestone or issue and fix "No Milestone" and "No ↵Stan Hu2015-10-071-0/+5
| |/ / |/| | | | | | | | | | | | | | | | | | | | Label" filters Closes #2619 Closes https://github.com/gitlabhq/gitlabhq/issues/9631
* | | Update README cache key to use full project namespaceStan Hu2015-10-021-2/+2
| | |
* | | Merge pull request #9684 from NKMR6194/masterStan Hu2015-10-011-0/+6
|\ \ \ | | | | | | | | Fix link with emoji
| * | | Fix link with emojiSAKATA Sinji2015-10-021-0/+6
| | | |