home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-28 05:56:37 +10:00
Code Issues Packages Projects Releases Wiki Activity
21,146 Commits 48 Branches 340 Tags
e2f937ce22e6b0eb458bbdb3fa93b06d80ecfd21
Commit Graph
299 Commits
Author SHA1 Message Date
Robert Speicher a1d3b8d7fa Fix spec failure introduced by 9d03bc6fa3 2015-12-07 16:50:20 -05:00
Valery Sizov e0131c5d07 Merge branch 'rails_update_to_4_2' into 'master' 
Rails update to 4.2.4

https://gitlab.com/gitlab-org/gitlab-ce/issues/2694

See merge request !1902
 2015-11-30 16:49:09 +00:00
Valery Sizov e92ceb7b57 fix specs 2015-11-30 16:12:31 +02:00
Stan Hu 2f90e71fd3 Merge pull request #9670 from janten/gravatar-retina 
Add support for HiDPI displays in gravatar service
 2015-11-26 08:13:28 -08:00
Valery Sizov 671a49cfd5 added specs 2015-11-19 14:41:05 +02:00
Valery Sizov 6051c28fc0 Allow groups to appear in the search results if the group owner allows it 2015-11-05 13:18:51 +02:00
Jan-Gerd Tenberge b5c19bcc4d Fix merge error 2015-10-22 21:43:17 +02:00
Jan-Gerd Tenberge b32bb37799 Merge remote-tracking branch 'origin/master' into gravatar-retina 2015-10-22 21:37:44 +02:00
Jan-Gerd Tenberge 34d0cd438a Update spec 2015-10-19 01:22:20 +02:00
Jan-Gerd Tenberge 7d7b6dbb9f Update spec 2015-10-19 01:21:21 +02:00
Douwe Maan 41615ddde4 Merge branch 'cross-reference-mr-on-issues' into 'master' 
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-18 12:07:28 +00:00
Douwe Maan 5ad3a274b3 Merge branch 'rs-redactor-filter' into 'master' 
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-17 11:55:55 +00:00
Robert Speicher c856a7a593 Merge branch 'filter-label' into 'master' 
Allow dashboard and group issues/MRs to be filtered by label

See merge request !1591
 2015-10-16 21:29:47 +00:00
Douwe Maan 34148d1576 Merge branch 'master' into rs-redactor-filter 2015-10-16 11:26:48 +02:00
Zeger-Jan van de Weg 94a788f66d Only accept open issues and merge requests 2015-10-16 09:59:32 +02:00
Yorick Peterse ff8f7fb0a1 Re-use User for avatars in link_to_member 2015-10-15 12:05:01 +02:00
Yorick Peterse 693e63f523 Allow avatar_icon to operate on a User 
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-15 12:05:01 +02:00
Douwe Maan 95f0440a78 Merge branch 'master' into rs-redactor-filter 2015-10-15 11:26:58 +02:00
Kamil Trzcinski 16bfd9d31a Fix specs 2015-10-14 17:29:18 +02:00
Douwe Maan d10e3c4498 Merge branch 'master' into filter-label 2015-10-14 13:23:01 +02:00
Douwe Maan f42cfa9e87 Refactor reference gathering to use a dedicated filter 2015-10-07 17:00:48 +02:00
Stan Hu dfbbc80611 Support filtering by "Any" milestone or issue and fix "No Milestone" and "No Label" filters 
Closes #2619

Closes https://github.com/gitlabhq/gitlabhq/issues/9631
 2015-10-07 07:21:50 -07:00
Douwe Maan 4f629dab2a Merge branch 'master' into rs-redactor-filter 2015-10-07 15:15:35 +02:00
Stan Hu 3fbcc51102 Update README cache key to use full project namespace 2015-10-02 13:26:42 -07:00
Stan Hu 1c53c28c79 Merge pull request #9684 from NKMR6194/master 
Fix link with emoji
 2015-10-01 14:10:34 -07:00
SAKATA Sinji a3c6ed5c46 Fix link with emoji 2015-10-02 01:26:19 +09:00
Stan Hu 5544d54793 Include full path of source and target branch names in New Merge Request page 
Previous title would only show the group name, which could be confusing.

Closes #2875
 2015-09-30 20:50:53 -07:00
Dmitriy Zaporozhets 3d9a7cdb4b Refactor CI helpers 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-29 16:26:40 +02:00
Jan-Gerd Tenberge 3ef71fa4fb Add support for HiDPI displays in gravatar service 2015-09-26 20:53:16 +02:00
Stan Hu 0383afc66a Add user preference to view project activity and starred project activity as default dashboard 
Closes #2662
 2015-09-26 08:46:05 -07:00
Douwe Maan 4bf1e85cce Merge branch 'fix-network-graph-refs' into 'master' 
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-24 07:43:53 +00:00
Robert Speicher 0175769aa8 Merge branch 'fix-markdown-truncation-removing-links' into 'master' 
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-23 17:20:37 +00:00
Stan Hu 150fb81ef9 Remove git refs used internally by GitLab from network graph 
Closes #2702
 2015-09-23 08:56:32 -07:00
Dmitriy Zaporozhets 3b6915d891 Add tests for CiStatusHelper and changelog item 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-23 12:34:21 +02:00
Stan Hu a7b0ee3fd1 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
 2015-09-22 21:56:27 -07:00
Stan Hu 3b39b648d2 Fix Markdown links not showing up in dashboard activity feed 
Closes #2586
 2015-09-20 09:32:35 -07:00
Kamil Trzcinski 10cf1050d0 Fix: helpers/ci/runners_helper_spec.rb 2015-09-15 21:27:10 +02:00
Kamil Trzcinski 5f315bd565 Fix: helpers/ci/application_helper_spec.rb 2015-09-15 21:24:57 +02:00
Dmitriy Zaporozhets 187face620 CLeanup CI helpers since we dont use oauth any more 2015-09-11 13:15:18 +02:00
Dmitriy Zaporozhets 0b5d627cd4 Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 2015-09-09 14:56:02 +02:00
Dmitriy Zaporozhets cc4ef4da11 Refactor CI tests 2015-09-09 14:17:16 +02:00
Robert Speicher 86f706b169 Fix GitlabMarkdownHelper spec 2015-09-01 18:09:20 -04:00
Robert Speicher 805693bfea Remove invalid spec for GitlabMarkdownHelper 2015-08-31 16:22:14 -04:00
Robert Speicher a4e4fde3e6 Restore the forwarded HTML options in link_to_gfm 2015-08-27 14:28:45 -07:00
Robert Speicher 4340dd3eeb Decouple Gitlab::Markdown from the GitlabMarkdownHelper 
This module is now the sole source of knowledge for *how* we render
Markdown (and GFM).
 2015-08-27 14:17:26 -07:00
Robert Speicher 7a81dc65d9 Re-add user_color_scheme helper 
Update PreferencesHelper specs
 2015-08-26 11:33:44 -07:00
Robert Speicher d6a145d4b0 Fix two more failing specs 2015-08-25 16:26:20 -07:00
Robert Speicher 2c3e42e4a4 Remove user_color_scheme_class 
Instead of rendering this value server-side, we use Javascript and Gon
to apply the user's color scheme (or the default) to any syntax
highlighted code blocks.

This will make it easier to cache these blocks in the future because
they're no longer state-dependent.
 2015-08-25 15:32:38 -07:00
Stan Hu 15d5dfdb33 Fix diff syntax highlighting 
Refactored HTML parser to avoid duplication of newline parsing.

Closes #2235
 2015-08-10 08:07:26 -07:00
Stan Hu 0abe98f049 Fix multi-line syntax highlighting 
HTML span elements only apply to a single line, and in the case of multi-line
comments, the highlighting was dropped as a result. Ensure that each line has
the proper styling to fix this.

Closes #1577
 2015-07-30 22:37:53 -07:00