Jacob Schatz
|
ab9612df8d
|
initial json requests instead of HTML
|
2016-01-07 11:47:39 -05:00 |
|
Douwe Maan
|
10387f6b8a
|
Merge branch 'master' into tmp-reference-pipeline-and-caching
# Conflicts:
# spec/lib/gitlab/markdown/autolink_filter_spec.rb
# spec/lib/gitlab/markdown/commit_range_reference_filter_spec.rb
# spec/lib/gitlab/markdown/commit_reference_filter_spec.rb
# spec/lib/gitlab/markdown/cross_project_reference_spec.rb
# spec/lib/gitlab/markdown/emoji_filter_spec.rb
# spec/lib/gitlab/markdown/external_issue_reference_filter_spec.rb
# spec/lib/gitlab/markdown/external_link_filter_spec.rb
# spec/lib/gitlab/markdown/issue_reference_filter_spec.rb
# spec/lib/gitlab/markdown/label_reference_filter_spec.rb
# spec/lib/gitlab/markdown/merge_request_reference_filter_spec.rb
# spec/lib/gitlab/markdown/redactor_filter_spec.rb
# spec/lib/gitlab/markdown/reference_gatherer_filter_spec.rb
# spec/lib/gitlab/markdown/relative_link_filter_spec.rb
# spec/lib/gitlab/markdown/sanitization_filter_spec.rb
# spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb
# spec/lib/gitlab/markdown/syntax_highlight_filter_spec.rb
# spec/lib/gitlab/markdown/table_of_contents_filter_spec.rb
# spec/lib/gitlab/markdown/task_list_filter_spec.rb
# spec/lib/gitlab/markdown/upload_link_filter_spec.rb
# spec/lib/gitlab/markdown/user_reference_filter_spec.rb
|
2015-12-10 14:04:34 +01:00 |
|
Zeger-Jan van de Weg
|
77f8a1e392
|
Merge when build succeeds
|
2015-11-02 17:27:38 +01:00 |
|
Douwe Maan
|
ed41333a6e
|
Use Gitlab::Markdown.render with :pipeline option rather than different methods
|
2015-10-14 19:28:09 +02:00 |
|
Dmitriy Zaporozhets
|
3e259ea8bc
|
Revert "Merge branch 'revert-satellites' into 'master'
"
This reverts commit 5daf44b7c8, reversing
changes made to 2f706fbd23.
|
2015-08-11 14:33:31 +02:00 |
|
Dmitriy Zaporozhets
|
9f10943c1a
|
Revert "Merge branch 'drop-satellites'"
This reverts commit 957e849f41, reversing
changes made to 6b9dbe9f5a.
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2015-08-11 10:28:42 +02:00 |
|
Dmitriy Zaporozhets
|
f293d991a4
|
Revert "Merge branch 'mr-widget-text' into 'master'
"
This reverts commit 151d9fb35f, reversing
changes made to 819d110cab.
|
2015-08-11 10:26:12 +02:00 |
|
Douwe Maan
|
b8590da024
|
Improve MR merge widget text and UI consistency.
|
2015-08-08 21:24:43 +02:00 |
|
Dmitriy Zaporozhets
|
a87989fb7d
|
Remove satellites
|
2015-07-15 15:45:57 +02:00 |
|
Dmitriy Zaporozhets
|
946b4ceda3
|
Improve variables in mr widget
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2015-06-11 18:45:12 +02:00 |
|
Dmitriy Zaporozhets
|
d2d8037b1a
|
Refactor merge request widget step 2
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2015-06-11 15:14:50 +02:00 |
|
Dmitriy Zaporozhets
|
644b6ba993
|
Refactor accept merge request widget
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2015-06-11 09:40:26 +02:00 |
|