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
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
2015-11-30Merge branch 'rails_update_to_4_2' into 'master' Valery Sizov
Rails update to 4.2.4 https://gitlab.com/gitlab-org/gitlab-ce/issues/2694 See merge request !1902
2015-11-30fix specsValery Sizov
2015-11-26Merge pull request #9670 from janten/gravatar-retinaStan Hu
Add support for HiDPI displays in gravatar service
2015-11-19added specsValery Sizov
2015-11-05 Allow groups to appear in the search results if the group owner allows itValery Sizov
2015-10-22Fix merge errorJan-Gerd Tenberge
2015-10-22Merge remote-tracking branch 'origin/master' into gravatar-retinaJan-Gerd Tenberge
2015-10-19Update specJan-Gerd Tenberge
2015-10-19Update specJan-Gerd Tenberge
2015-10-18Merge branch 'cross-reference-mr-on-issues' into 'master' Douwe Maan
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
2015-10-17Merge branch 'rs-redactor-filter' into 'master' Douwe Maan
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
2015-10-17Merge branch 'filter-label' into 'master' Robert Speicher
Allow dashboard and group issues/MRs to be filtered by label See merge request !1591
2015-10-16Merge branch 'master' into rs-redactor-filterDouwe Maan
2015-10-16Only accept open issues and merge requestsZeger-Jan van de Weg
2015-10-15Re-use User for avatars in link_to_memberYorick Peterse
2015-10-15Allow avatar_icon to operate on a UserYorick Peterse
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.
2015-10-15Merge branch 'master' into rs-redactor-filterDouwe Maan
2015-10-14Fix specsKamil Trzcinski
2015-10-14Merge branch 'master' into filter-labelDouwe Maan
2015-10-07Refactor reference gathering to use a dedicated filterDouwe Maan
2015-10-07Support filtering by "Any" milestone or issue and fix "No Milestone" and "No ↵Stan Hu
Label" filters Closes #2619 Closes https://github.com/gitlabhq/gitlabhq/issues/9631
2015-10-07Merge branch 'master' into rs-redactor-filterDouwe Maan
2015-10-02Update README cache key to use full project namespaceStan Hu
2015-10-02Merge pull request #9684 from NKMR6194/masterStan Hu
Fix link with emoji
2015-10-01Fix link with emojiSAKATA Sinji
2015-10-01Include full path of source and target branch names in New Merge Request pageStan Hu
Previous title would only show the group name, which could be confusing. Closes #2875
2015-09-29Refactor CI helpersDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-26Add support for HiDPI displays in gravatar serviceJan-Gerd Tenberge
2015-09-26Add user preference to view project activity and starred project activity as ↵Stan Hu
default dashboard Closes #2662
2015-09-24Merge branch 'fix-network-graph-refs' into 'master' Douwe Maan
Remove git refs used internally by GitLab from network graph GitLab 8.0 removed satellites and started using git refs that began with `refs/merge-requests/XXX` and `refs/tmp/XXX`, which showed up in an ugly way in the network graph: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/150eb7ae5f07f0d4793589b5eac462db/image.png) Closes #2702 See merge request !1410
2015-09-23Merge branch 'fix-markdown-truncation-removing-links' into 'master' Robert Speicher
Fix cases where Markdown did not render links in activity feed HTML would be stripped in `truncate_if_block` when a comment had multiple lines and the first wasn't long enough to be truncated. The use of `node.content` would strip all HTML tags. Using `node.inner_html` retains these tags and puts the "..." in between paragraph tags. Closes #2586 See merge request !1401
2015-09-23Remove git refs used internally by GitLab from network graphStan Hu
Closes #2702
2015-09-23Add tests for CiStatusHelper and changelog itemDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-23Fix cases where Markdown did not render links in activity feedStan Hu
HTML would be stripped in `truncate_if_block` when a comment had multiple lines and the first wasn't long enough to be truncated. The use of `node.content` would strip all HTML tags. Using `node.inner_html` retains these tags and puts the "..." in between paragraph tags. Closes #2586
2015-09-20Fix Markdown links not showing up in dashboard activity feedStan Hu
Closes #2586
2015-09-15Fix: helpers/ci/runners_helper_spec.rbKamil Trzcinski
2015-09-15Fix: helpers/ci/application_helper_spec.rbKamil Trzcinski
2015-09-11CLeanup CI helpers since we dont use oauth any moreDmitriy Zaporozhets
2015-09-09Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDmitriy Zaporozhets
2015-09-09Refactor CI testsDmitriy Zaporozhets
2015-09-02Fix GitlabMarkdownHelper specRobert Speicher
2015-08-31Remove invalid spec for GitlabMarkdownHelperRobert Speicher
2015-08-28Restore the forwarded HTML options in link_to_gfmRobert Speicher