summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'wlsf82-branches-crud-testWalmyr Filho2019-01-02111-183/+1236
|\
| * Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqJohn Jarvis2019-01-0240-71/+470
| |\
| | * Merge branch 'security-label-xss' into 'master'John Jarvis2019-01-023-1/+28
| | |\
| | | * Escape html entities when no label foundJarka Košanová2018-12-123-1/+28
| | * | Merge branch 'security-master-secret-ci-variables-exposed' into 'master'John Jarvis2019-01-0220-44/+372
| | |\ \
| | | * | Add CHANGELOG entryMatija Čupić2018-12-081-0/+5
| | | * | Use full ref when creating MR pipeline in specsMatija Čupić2018-12-081-6/+6
| | | * | Use build for testing HasRefMatija Čupić2018-12-081-8/+8
| | | * | Support merge_request pipeline ref typesMatija Čupić2018-12-081-7/+3
| | | * | Check resolved_ref before checking if protectedMatija Čupić2018-12-081-1/+2
| | | * | Check for explicit true or false in specsMatija Čupić2018-12-081-6/+22
| | | * | Conditionally assign ref_name for more efficiencyMatija Čupić2018-12-081-1/+5
| | | * | Refactor Project#protected_for? specsMatija Čupić2018-12-081-51/+67
| | | * | Add specs when full ref is passed to protected_forMatija Čupić2018-12-082-2/+22
| | | * | Remove resolving conditional from protected_forMatija Čupić2018-12-082-7/+24
| | | * | Raise an error on ambiguous refsMatija Čupić2018-12-083-3/+5
| | | * | Rename Repository#resolve_ref to expand_refMatija Čupić2018-12-083-14/+13
| | | * | Make full ref in Repository#resolve_ref explicitMatija Čupić2018-12-081-1/+1
| | | * | Implement Command#ambiguous_ref?Matija Čupić2018-12-083-1/+27
| | | * | Simplify conditionals in Project#protected_ref?Matija Čupić2018-12-081-2/+6
| | | * | Revert "Use to_s.start_with? in tag/branch ref method"Matija Čupić2018-12-081-2/+2
| | | * | Implement Repository#ambiguous_ref?Matija Čupić2018-12-085-45/+67
| | | * | Use to_s.start_with? in tag/branch ref methodMatija Čupić2018-12-081-2/+2
| | | * | Move Project#resolve_ref to RepositoryMatija Čupić2018-12-085-67/+65
| | | * | Search for tag / branch ref from beginningMatija Čupić2018-12-081-2/+2
| | | * | Remove Repository#find_refMatija Čupić2018-12-082-46/+0
| | | * | Use strings instead of Gitlab::Git::RefMatija Čupić2018-12-082-36/+19
| | | * | Allow any character in tag / branch ref regexMatija Čupić2018-12-081-2/+2
| | | * | Remove Gitlab::Git::Ref#full_refMatija Čupić2018-12-087-46/+7
| | | * | Check for Tag/Branch corectnessMatija Čupić2018-12-082-5/+21
| | | * | Reintroduce Command#protected_ref?Matija Čupić2018-12-088-10/+36
| | | * | Use nil instead of raising AmbiguousRefMatija Čupić2018-12-083-7/+14
| | | * | Use Gitlab::Git::Ref in Project#resolve_refMatija Čupić2018-12-089-28/+113
| | | * | Avoid using magic variable in specMatija Čupić2018-12-081-3/+3
| | | * | Make HasRef#git_ref publicMatija Čupić2018-12-082-4/+28
| | | * | Prevent creating pipelines with ambiguous refsMatija Čupić2018-12-088-30/+35
| | | * | Use full ref when possible to avoid ambiguityMatija Čupić2018-12-087-8/+70
| | | * | Support both ref and ref-name in protected_for?Matija Čupić2018-12-082-8/+87
| | * | | Merge branch 'security-master-url-rel' into 'master'John Jarvis2019-01-023-10/+15
| | |\ \ \
| | | * | | Set URL rel attribute for broken URLsJan Provaznik2018-12-113-10/+15
| | * | | | Merge branch 'security-todos_not_redacted_for_guests' into 'master'John Jarvis2019-01-0214-16/+55
| | |\ \ \ \
| | | * | | | Delete confidential issue todos for guestsFelipe Artur2018-12-1414-16/+55
| * | | | | | Merge branch '54206-show-the-activity-filter-dropdown-in-discussion-tab-only'...Kushal Pandya2019-01-024-4/+58
| |\ \ \ \ \ \
| | * | | | | | Made discussion filters only visible in merge request discussions tabConstance Okoghenun2019-01-024-4/+58
| * | | | | | | Merge branch '55369-update-milestone-sort-to-say-say-milestone-due-date' into...Sean McGivern2019-01-023-2/+7
| |\ \ \ \ \ \ \
| | * | | | | | | Renames Milestone sort into Milestone due dateJacopo2018-12-313-2/+7
| * | | | | | | | Merge branch 's3-directories-get' into 'master'Kamil Trzciński2019-01-023-2/+8
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Use directories.new when getting S3 directoryJan Provaznik2018-12-273-2/+8
| * | | | | | | | | Merge branch '55755-user-activity-is-stuck-loading-when-there-is-none' into '...Kushal Pandya2019-01-025-7/+24
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Resolve "User activity is stuck loading when there is none"Martin Wortschack2019-01-025-7/+24
| |/ / / / / / / / /