Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-02-24Add `:with_avatar` trait to User factoryRobert Speicher
2016-02-19Merge branch 'rs-emoji' into 'master' Douwe Maan
Update Gemojione for new hotness :sparkles: Before | After ------ | ----- ![Screen_Shot_2016-02-12_at_3.38.43_PM](/uploads/299e5ffe38c91657085741261a678f81/Screen_Shot_2016-02-12_at_3.38.43_PM.png) | ![Screen_Shot_2016-02-12_at_3.38.09_PM](/uploads/ccee29719a6445a9efd2498391a7eea0/Screen_Shot_2016-02-12_at_3.38.09_PM.png) See merge request !2800
2016-02-13Fix specs expecting `emoji/` in image pathRobert Speicher
2016-02-12Fix relative links in other markup formatsBen Boeckel
- Apply the RelativeLinkFilter filter to other formats, e.g., reStructuredText so links from the Files view or the Project view work - Remove the AsciidocPipeline pipeline Fixes #3533.
2016-02-04Allow link_to_label to take an optional type argRémy Coutable
You can set type: :merge_request to create a link to merge request lists instead of issues list. Accept both Symbol & String as type argument for the link_to_label helper
2016-02-04Fix broken testsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-01-30Fix specs and add a new oneDouwe Maan
2016-01-25Update text_color_for_bg helper to support RGB triplet color codesRobert Speicher
Closes #12677
2016-01-20Move parallel diff logic to separate classDouwe Maan
2016-01-19Refactor Gitlab::Highlight and fix testsDouwe Maan
2016-01-15Merge branch 'master' into issue_3945Rubén Dávila
2016-01-15More refactoring from last code review. #3945Rubén Dávila
* Use commit objects instead of IDs when generating diffs * Use proper references when generating MR's source and target * Update broken specs
2016-01-14Use the WikiPipeline when rendering the wiki markdown contentDouglas Barbosa Alexandre
2016-01-13Move `BroadcastMessage#status` to a helper since it's presentationalRobert Speicher
2016-01-13Update broadcast_message helperRobert Speicher
Now it returns the fully-formatted message so we can be consistent about how it's shown.
2016-01-12Make sure time_ago_with_tooltip is using a Time objectRobert Speicher
Somehow this test existed on EE but not in CE, so it started failing after a bad CE-to-EE merge.
2016-01-09Fix broken specs. #3945Rubén Dávila
2016-01-09Fix broken specs. #3945Rubén Dávila
2016-01-08Add two custom Date/Time conversion formatsRobert Speicher
2016-01-06Don't override issue page description in project layout.Douwe Maan
2016-01-05Make `page_description` less magical :sparkles:Robert Speicher
2016-01-05Use `User#avatar_url` instead of `avatar_icon` helperRobert Speicher
2016-01-05Merge branch 'master' into more-opengraphDouwe Maan
# Conflicts: # app/views/layouts/_head.html.haml
2016-01-04remove public field from namespace and refactoringValery Sizov
2015-12-31Fix broken spec and small refactor. #3945Rubén Dávila
2015-12-30New implementation for highlighting diff files. #3945Rubén Dávila
* It is more performant given now we process all the diff file instead of processing line by line. * Multiline comments are highlighted correctly.
2015-12-29Add syntax highlighting to diff view. #3945Rubén Dávila
2015-12-28Use `assign` instead of `instance_variable_set`Robert Speicher
2015-12-28Add specs for page_image using a Group's avatarRobert Speicher
2015-12-25Merge branch 'revert_votes_back' into 'master' Dmitriy Zaporozhets
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
2015-12-25satisfy rubocopValery Sizov
2015-12-25add sorting of awardsValery Sizov
2015-12-25Add support for `twitter:label` meta tagsRobert Speicher
2015-12-25Truncate page_description to 30 wordsRobert Speicher
2015-12-24Account for `@project.description` being nilRobert Speicher
2015-12-24Add page descriptions and imagesRobert Speicher
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.
2015-12-23fix specsValery Sizov
2015-12-23base implementation of emoji picker [ci skip]Valery Sizov
2015-12-22Merge branch 'fix_leave_project_display' into 'master' Stan Hu
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
2015-12-22Move `ci_build_details_path` helper spec to correct locationRobert Speicher
Also, make it not fail.
2015-12-22removes api credentials from link to build_pageMarvin Frick
Also adds a spec for MergeRequestHelper to avoid having a regression later on.
2015-12-22Fix and test leave project displayDrew Blessing
2015-12-18Backport JIRA serviceDrew Blessing
2015-12-16Merge remote-tracking branch 'origin/rs-simplify-status-icon'Dmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-16Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets
2015-12-15Fixed Rubocop offensesGabriel Mazetto
2015-12-12Define CI status icon colors in SCSS instead of a helperRobert Speicher
2015-12-11Fix time_ago_with_tooltip for activity feedRobert Speicher
Closes #4002
2015-12-09Improve text indication visibility on snippetsZeger-Jan van de Weg
2015-12-08Fix spec failure introduced by 9d03bc6fa31f123e070bab4a58b67dbb008e75e9Robert Speicher