0151325dac
Merge request widget redesign
2017-05-09 04:15:34 +00:00
aa874a1cd6
Merge branch 'mia_backort' into 'master'
...
Backport of Multiple Assignees feature
See merge request !11089
2017-05-05 19:17:28 +00:00
e4f7b87ddb
Support comments for personal snippets
2017-05-05 15:45:49 +02:00
387c4b2c21
Backport of multiple_assignees_feature [ci skip]
2017-05-04 17:11:53 +03:00
21e4f0534d
Merge branch 'dm-link-discussion-to-outdated-diff' into 'master'
...
Allow commenting on older versions of the diff and comparisons between diff versions
See merge request !10388
2017-05-03 21:27:34 +00:00
c1e2da9293
Merge branch 'dm-blob-external-storage' into 'master'
...
Refactor Blob support of external storage in preparation of job artifact blobs
See merge request !11048
2017-05-03 19:54:30 +00:00
f8fabfcc6f
Allow commenting on older versions of the diff and comparisons between diff versions
2017-05-03 14:47:21 -05:00
720cc14a75
Refactor Blob support of external storage in preparation of job artifact blobs
2017-05-03 10:20:05 -05:00
cac04fbd77
Merge branch 'emoji-button-titles' into 'master'
...
Added emoji description title to award emoji buttons
Closes #29971
See merge request !10881
2017-05-03 11:34:04 +00:00
d32ecb23eb
Merge branch '12910-personal-snippets-notes-show' into 'master'
...
Display comments for personal snippets
See merge request !10974
2017-05-02 14:38:28 +00:00
3efe534255
Merge branch '26488-target-disabled-mr' into 'master'
...
Fix 404 when upstream disabled merge requests
Closes #26488
See merge request !10427
2017-05-02 11:14:41 +00:00
8c3a03c1b9
Display comments for personal snippets
2017-05-02 13:07:53 +02:00
60ebd101d0
Use blob viewers for snippets
2017-04-30 11:21:20 -05:00
0be3187a56
Pull preserve into render helpers
2017-04-28 11:37:19 -05:00
87a3bd26fa
Address feedback
2017-04-27 12:23:27 -05:00
dc4726f0a7
Satisfy Rubocop
2017-04-27 12:23:27 -05:00
964e7d206b
Add specs
2017-04-27 12:23:26 -05:00
a6536a84e7
Fix some specs
2017-04-27 12:23:26 -05:00
94b93e49d2
Merge branch 'master' into emoji-button-titles
2017-04-27 16:56:30 +01:00
66c8756e44
Remove the unnecessary ApplicationSetting stubbing
2017-04-27 13:22:17 +02:00
a53442751f
Fix failing specs
2017-04-27 13:22:17 +02:00
4f2d6b3e21
Refactor MarkupHelper
2017-04-27 13:22:17 +02:00
05e0f50453
Cache the rendered README, but post-process on show
...
Because the post-processing of the rendered README is dependent on the
context (i.e. the current user), do the post-processing when the
README is being displayed.
2017-04-27 13:22:17 +02:00
ef4d4446e9
Move some methods from ApplicationHelper to MarkupHelper
2017-04-27 13:22:17 +02:00
d95bffc6da
Rename GitlabMarkdownHelper -> MarkupHelper
...
It does more than solely GitLab Markdown, so rename to MarkupHelper.
2017-04-27 13:22:17 +02:00
429a42b0cd
Merge branch 'master' into emoji-button-titles
2017-04-27 11:44:02 +01:00
2df748aa71
Merge branch 'blackst0ne/gitlab-ce-fix_emoji_parser'
2017-04-27 11:02:27 +01:00
ccac05dd90
Fix 404 when upstream has disabled merge requests
2017-04-27 01:04:07 +03:00
465a818061
Merge branch '26509-show-update-time' into 'master'
...
Add updated time to project list
Closes #26509
See merge request !8514
2017-04-26 13:21:12 +00:00
019b06b9d2
Load a project's CI status in batch from redis
2017-04-26 12:04:22 +00:00
3ff8d8020e
Merge branch '20378-natural-sort-issue-numbers' into 'master'
...
Change issues sentence to use natural sorting
Closes #20378
See merge request !7110
2017-04-26 09:40:12 +00:00
a78eeefd6e
Change issues sentence to use natural sorting
2017-04-25 18:57:08 -05:00
1dc91f48cf
Fixed GFM spec failure
2017-04-25 12:33:48 +01:00
31c990cc41
Fix rendering emoji inside a string
2017-04-25 21:06:24 +11:00
22c88c675d
Merge branch 'add-aria-to-icon' into 'master'
...
Add aria to icon
See merge request !10670
2017-04-24 19:55:46 +00:00
0affdb85b1
Merge branch 'fix/gb/fix-incorrect-commit-status-badge-text' into 'master'
...
Fix incorrect commit status text on main project page
See merge request !10863
2017-04-24 15:13:26 +00:00
ffe4e5c74d
Improve specs
2017-04-24 10:14:34 -04:00
2a80ba27b6
Add specs for new ci status helper method
2017-04-21 22:30:45 +02:00
7057fbf404
Add updated time to project list
2017-04-21 10:10:21 -05:00
040062cc8a
submodule_links: handle urls that don't end with .git
...
Signed-off-by: David Turner <novalis@novalis.org>
2017-04-21 10:54:31 -04:00
7f66e8ad17
Add tests
2017-04-18 10:27:10 -05:00
878e46a1af
Fix restricted visibility project setting
2017-04-17 13:57:09 +00:00
e585b77730
Change project view default for existing users and anonymous visitors to files+readme
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2017-04-10 21:28:41 +03:00
8b98ca50b3
Merge branch 'master' into new-resolvable-discussion
2017-04-07 21:00:40 +01:00
02072e17ab
Rename `ProjectBuildStatus` -> `ProjectPipelineStatus`
2017-04-07 17:24:11 +02:00
47abf00b24
Update project build status cache when transitioning
2017-04-07 17:24:11 +02:00
9082d1e046
Rename Ci::PipelineStatus -> Ci::ProjectBuildStatus
2017-04-07 17:24:11 +02:00
792f6ed16f
Merge branch 'master' into new-resolvable-discussion
...
# Conflicts:
# app/assets/javascripts/filtered_search/dropdown_hint.js
# app/views/shared/issuable/_search_bar.html.haml
2017-04-06 15:00:26 -05:00
b42dc1a52b
Linking to edit file directly
2017-04-06 16:36:38 +00:00
9cee280d70
Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussion
2017-04-06 13:47:52 +01:00
Fatih Acet
Jacob Schatz
Jarka Kadlecova
Valery Sizov
Sean McGivern
Douwe Maan
Filipa Lacerda
Phil Hughes
Toon Claes
Sean McGivern
mhasbini
Annabel Dunstone Gray
Bob Van Landuyt
Jeff Stubler
blackst0ne
Kamil Trzciński
Clement Ho
Grzegorz Bizon
David Turner
James Lopez
Dmitriy Zaporozhets
Luke "Jared" Bennett
Eric Eastwood