| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | New implementation for highlighting diff files. #3945 | Rubén Dávila | 2015-12-30 | 1 | -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. #3945 | Rubén Dávila | 2015-12-28 | 1 | -0/+11 | |
| | |/ |/| | ||||||
| * | | Merge branch 'revert_votes_back' into 'master' | Dmitriy Zaporozhets | 2015-12-25 | 1 | -0/+7 | |
| |\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | Revert vote buttons back to issue and MR pages https://gitlab.com/gitlab-org/gitlab-ce/issues/3672 /cc @dzaporozhets @JobV  See merge request !2206 | |||||
| | * | satisfy rubocoprevert_votes_back | Valery Sizov | 2015-12-25 | 1 | -1/+1 | |
| | | | ||||||
| | * | add sorting of awards | Valery Sizov | 2015-12-25 | 1 | -0/+7 | |
| | | | ||||||
| * | | Add support for `twitter:label` meta tagsrs-opengraph | Robert Speicher | 2015-12-24 | 1 | -0/+29 | |
| | | | ||||||
| * | | Truncate page_description to 30 words | Robert Speicher | 2015-12-24 | 1 | -0/+13 | |
| | | | ||||||
| * | | Account for `@project.description` being nil | Robert Speicher | 2015-12-23 | 1 | -0/+8 | |
| | | | ||||||
| * | | Add page descriptions and images | Robert Speicher | 2015-12-23 | 1 | -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 specs | Valery Sizov | 2015-12-22 | 1 | -6/+0 | |
| | | ||||||
| * | base implementation of emoji picker [ci skip] | Valery Sizov | 2015-12-22 | 1 | -6/+0 | |
| | | ||||||
| * | Merge branch 'fix_leave_project_display' into 'master' | Stan Hu | 2015-12-22 | 1 | -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 display | Drew Blessing | 2015-12-21 | 1 | -0/+10 | |
| | | | ||||||
| * | | Move `ci_build_details_path` helper spec to correct location | Robert Speicher | 2015-12-21 | 2 | -22/+20 | |
| | | | | | | | | | Also, make it not fail. | |||||
| * | | removes api credentials from link to build_page | Marvin Frick | 2015-12-22 | 1 | -0/+22 | |
| |/ | | | | | Also adds a spec for MergeRequestHelper to avoid having a regression later on. | |||||
| * | Backport JIRA service | Drew Blessing | 2015-12-18 | 1 | -4/+17 | |
| | | ||||||
| * | Merge remote-tracking branch 'origin/rs-simplify-status-icon' | Dmitriy Zaporozhets | 2015-12-16 | 1 | -8/+3 | |
| |\ | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| | * | Define CI status icon colors in SCSS instead of a helperrs-simplify-status-icon | Robert Speicher | 2015-12-12 | 1 | -8/+3 | |
| | | | ||||||
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-12-16 | 1 | -3/+4 | |
| |\ \ | ||||||
| | * | | Fix time_ago_with_tooltip for activity feedrs-timeago | Robert Speicher | 2015-12-11 | 1 | -3/+4 | |
| | |/ | | | | | | | Closes #4002 | |||||
| * | | Fixed Rubocop offenses | Gabriel Mazetto | 2015-12-15 | 1 | -1/+1 | |
| |/ | ||||||
| * | Improve text indication visibility on snippets | Zeger-Jan van de Weg | 2015-12-08 | 1 | -51/+34 | |
| | | ||||||
| * | Fix spec failure introduced by 9d03bc6fa31f123e070bab4a58b67dbb008e75e9 | Robert Speicher | 2015-12-07 | 1 | -1/+1 | |
| | | ||||||
| * | Merge branch 'rails_update_to_4_2' into 'master' | Valery Sizov | 2015-11-30 | 1 | -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_2 | Valery Sizov | 2015-11-30 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge pull request #9670 from janten/gravatar-retina | Stan Hu | 2015-11-26 | 1 | -6/+10 | |
| |\ \ | |/ |/| | Add support for HiDPI displays in gravatar service | |||||
| | * | Fix merge error | Jan-Gerd Tenberge | 2015-10-22 | 9 | -31/+97 | |
| | |\ | ||||||
| | * \ | Merge remote-tracking branch 'origin/master' into gravatar-retina | Jan-Gerd Tenberge | 2015-10-22 | 1 | -1/+1 | |
| | |\ \ | ||||||
| | | * | | Update spec | Jan-Gerd Tenberge | 2015-10-19 | 1 | -2/+2 | |
| | | | | | ||||||
| | * | | | Update spec | Jan-Gerd Tenberge | 2015-10-19 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | Add support for HiDPI displays in gravatar service | Jan-Gerd Tenberge | 2015-09-26 | 1 | -4/+8 | |
| | |/ / | ||||||
| * | | | added specs | Valery Sizov | 2015-11-19 | 1 | -0/+26 | |
| | | | | ||||||
| * | | | Allow groups to appear in the search results if the group owner allows it | Valery Sizov | 2015-11-05 | 1 | -0/+5 | |
| | |/ |/| | ||||||
| * | | Merge branch 'cross-reference-mr-on-issues' into 'master' | Douwe Maan | 2015-10-18 | 1 | -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.  /cc @DouweM See merge request !1569 | |||||
| | * | | Only accept open issues and merge requests | Zeger-Jan van de Weg | 2015-10-16 | 1 | -0/+10 | |
| | | | | ||||||
| * | | | Merge branch 'rs-redactor-filter' into 'master' | Douwe Maan | 2015-10-17 | 1 | -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-filter | Douwe Maan | 2015-10-16 | 2 | -0/+23 | |
| | |\ \ \ | | |/ / | ||||||
| | * | | | Merge branch 'master' into rs-redactor-filter | Douwe Maan | 2015-10-15 | 2 | -1/+6 | |
| | |\ \ \ | ||||||
| | * | | | | Refactor reference gathering to use a dedicated filter | Douwe Maan | 2015-10-07 | 1 | -1/+1 | |
| | | | | | | ||||||
| | * | | | | Merge branch 'master' into rs-redactor-filter | Douwe Maan | 2015-10-07 | 9 | -16/+166 | |
| | |\ \ \ \ | ||||||
| | * | | | | | Fix GitlabMarkdownHelper spec | Robert Speicher | 2015-09-01 | 1 | -11/+14 | |
| | | | | | | | ||||||
| * | | | | | | Merge branch 'filter-label' into 'master' | Robert Speicher | 2015-10-16 | 1 | -5/+0 | |
| |\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | Allow dashboard and group issues/MRs to be filtered by label See merge request !1591 | |||||
| | * | | | | | Merge branch 'master' into filter-labelfilter-label | Douwe Maan | 2015-10-14 | 1 | -5/+0 | |
| | | | | | | | ||||||
| * | | | | | | Re-use User for avatars in link_to_member | Yorick Peterse | 2015-10-15 | 1 | -0/+14 | |
| | | | | | | | ||||||
| * | | | | | | Allow avatar_icon to operate on a User | Yorick Peterse | 2015-10-15 | 1 | -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 specs | Kamil Trzcinski | 2015-10-14 | 1 | -1/+1 | |
| |/ / / / | ||||||
| * | | | | Support filtering by "Any" milestone or issue and fix "No Milestone" and "No ↵ | Stan Hu | 2015-10-07 | 1 | -0/+5 | |
| | |/ / |/| | | | | | | | | | | | | | | | | | | | | Label" filters Closes #2619 Closes https://github.com/gitlabhq/gitlabhq/issues/9631 | |||||
| * | | | Update README cache key to use full project namespace | Stan Hu | 2015-10-02 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | Merge pull request #9684 from NKMR6194/master | Stan Hu | 2015-10-01 | 1 | -0/+6 | |
| |\ \ \ | | | | | | | | | Fix link with emoji | |||||
| | * | | | Fix link with emoji | SAKATA Sinji | 2015-10-02 | 1 | -0/+6 | |
| | | | | | ||||||
