- 16 Feb, 2017 9 commits
-
-
Lin Jen-Shin authored
* upstream/master: (37 commits) Show merge errors in merge request widget Clarify that stage is needed to stop environments Fix broken link in university docs allow clicking on text or icon to trigger expand style links on system notes to look clickable Clean up terms used for issues. Use New instead of Add. Fix most of broken docs links Set `Auto-Submitted: auto-generated` header to emails Fix Rubocop offense Fix regression where cmd-click stopped working for todos and merge request tabs Remove changelog entries for 8.16.5 release Merge branch 'fix-github-import-MR-wrong-project' into 'security' Merge branch 'svg-xss-fix' into 'security' Merge branch 'fix-rdoc-xss' into 'security' Merge branch 'asciidoctor-xss-patch' into 'security' Specify that only project owners can transfer a project only load istanbul plugin in development mode Make Karma output look nicer for CI (!9165) Centers loading icon vertically and horizontally in pipelines table in commit view Rename builds to jobs in docs ...
-
Rémy Coutable authored
Show merge errors in merge request widget Closes #28124 and gitlab-ee#1652 See merge request !9229
-
Sean McGivern authored
Set `Auto-Submitted: auto-generated` header to emails Closes #20305 See merge request !9163
-
Sean McGivern authored
There were two problems here: 1. On the JS side, the reference to $widgetBody didn't refer to the right DOM element any more. This might be because it was replaced by the `getMergeStatus` method. Even if it wasn't, ensuring we have the right element means that the content gets updated. 2. On the Ruby side, the `log_merge_error` method didn't update the `merge_error` column of the merge request. Change that to update if requested, and update in the most common cases by default. Additionally, this would sometimes return an error hash, but it doesn't look like this was ever used (the return value of `MergeService#execute` appears to be unused everywhere).
-
Achilleas Pipinellis authored
Clarify that stage is needed to stop environments Closes #28110 See merge request !9296
-
Achilleas Pipinellis authored
[ci skip]
-
Achilleas Pipinellis authored
Fix broken link in university docs See merge request !9295
-
Achilleas Pipinellis authored
[ci skip]
-
Alfredo Sumaran authored
Make Karma output look nicer for CI See merge request !9165
-
- 15 Feb, 2017 31 commits
-
-
Allison Whilden authored
Clean up terms used for issues. Use New instead of Add. See merge request !9281
-
Alfredo Sumaran authored
style links on system notes to look clickable Closes #27959 See merge request !9251
-
Simon Knox authored
-
Simon Knox authored
-
Pedro Moreira da Silva authored
-
Achilleas Pipinellis authored
Fix most of broken docs links See merge request !9275
-
Annabel Dunstone Gray authored
Change wording of MR comment box See merge request !9193
-
Achilleas Pipinellis authored
[ci skip]
-
Semyon Pupkov authored
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/20305
-
Rémy Coutable authored
Move tag services to `Tags` namespace See merge request !9231
-
Alfredo Sumaran authored
Fix Rubocop offense See merge request !9274
-
Alfredo Sumaran authored
-
Alfredo Sumaran authored
Fix regression where cmd-click stopped working for todos and merge request tabs Closes #27922 See merge request !9115
-
Rémy Coutable authored
Resolve 'Alphabetically sort tags on runner list' Closes #27409 See merge request !8922
-
Douwe Maan authored
Remove deprecated CI service Closes #28094 See merge request !9221
-
Rémy Coutable authored
Specify that only project owners can transfer a project Closes #26651 See merge request !9262
-
Rémy Coutable authored
Add missing api entities Closes #23895 See merge request !7138
-
Clement Ho authored
-
Alfredo Sumaran authored
Only load istanbul plugin in development mode See merge request !9261
-
Alfredo Sumaran authored
Stop Pikaday using moment See merge request !9244
-
Douwe Maan authored
Show notifications settings even when repository feature is disabled See merge request !9180
-
Robert Speicher authored
-
Douwe Maan authored
# Conflicts: # db/schema.rb
-
Robert Speicher authored
Fix labels being applied to wrong merge requests on GitHub import See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2064
-
Robert Speicher authored
Fix for XSS vulnerability in SVG attachments See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2059
-
Robert Speicher authored
Fix XSS in rdoc and other markups See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2058
-
Robert Speicher authored
Add sanitization filter to asciidocs output to prevent XSS See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2057
-
Annabel Dunstone Gray authored
Centers loading icon vertically and horizontally in pipelines table in commit view Closes #28229 See merge request !9256
-
Mark Fletcher authored
[skip ci]
-
Mike Greiling authored
-
winniehell authored
-