summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [master] Secret CI variables can exposed by creating a tag with the same name as an existing protected branch See merge request gitlab/gitlabhq!2596
| | * | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This refactors the Project#protected_for? specs to separate them into two contexts: when the ref is a full ref and when the ref is a ref name.
| | * | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ec4730478b798270781257913ee4cede673d4d4e.
| | * | | | | | | | | | | | | | Implement Repository#ambiguous_ref?Matija Čupić2018-12-085-45/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This implements Repository#ambiguous_ref? and checks if a ref is ambiguous before trying to resolve the ref in Project#protected_for?
| | * | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reworks Project#resolve_ref to return Gitlab::Git::Branch, Gitlab::Git::Tag or raise an AmbiguousRef error.
| | * | | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [master] Set URL rel attribute for broken URLs See merge request gitlab/gitlabhq!2695
| | * | | | | | | | | | | | | | | Set URL rel attribute for broken URLsJan Provaznik2018-12-113-10/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's possible that URI fails to parse a link, but browsers still recognize given URL as a link, we should make sure that 'rel' attribute is set also in this case.
| * | | | | | | | | | | | | | | | Merge branch 'security-todos_not_redacted_for_guests' into 'master'John Jarvis2019-01-0214-16/+55
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [master] Security todos not redacted for guests See merge request gitlab/gitlabhq!2697
| | * | | | | | | | | | | | | | | Delete confidential issue todos for guestsFelipe Artur2018-12-1414-16/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix leaking information of confidential issues on TODOs when user is downgraded to guest access.
* | | | | | | | | | | | | | | | | Merge branch ↵Kushal Pandya2019-01-024-4/+58
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '54206-show-the-activity-filter-dropdown-in-discussion-tab-only' into 'master' Resolve "Show the activity filter dropdown in discussion tab only, show all discussions always in changes tab" Closes #54206 See merge request gitlab-org/gitlab-ce!24082
| * | | | | | | | | | | | | | | | Made discussion filters only visible in merge request discussions tabConstance Okoghenun2019-01-024-4/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Discussion filters will be hidden on Commits, Pipelines, and Changes tabs on merge requests page. This does not affect its behavior on issues page
* | | | | | | | | | | | | | | | | Merge branch '55369-update-milestone-sort-to-say-say-milestone-due-date' ↵Sean McGivern2019-01-023-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Update `Milestone` sort to say say `Milestone due date`" Closes #55369 See merge request gitlab-org/gitlab-ce!24080
| * | | | | | | | | | | | | | | | | 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 directory Closes gitlab-com/gl-infra/infrastructure#5807 See merge request gitlab-org/gitlab-ce!23981
| * | | | | | | | | | | | | | | | | | Use directories.new when getting S3 directoryJan Provaznik2018-12-273-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling `Fog::Storage::AWS::Directories#get` requires the ListAllMyBuckets permission, but we can avoid that extra query and permission by initializing the directory with a specific bucket: https://stackoverflow.com/a/12288581/1992201
* | | | | | | | | | | | | | | | | | | Merge branch '55755-user-activity-is-stuck-loading-when-there-is-none' into ↵Kushal Pandya2019-01-025-7/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "User activity is stuck loading when there is none" Closes #55755 See merge request gitlab-org/gitlab-ce!24063
| * | | | | | | | | | | | | | | | | | | Resolve "User activity is stuck loading when there is none"Martin Wortschack2019-01-025-7/+24
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge branch 'sh-bump-qa-image-ruby-2.5' into 'master'Grzegorz Bizon2019-01-021-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade GitLab QA image to Ruby 2.5 See merge request gitlab-org/gitlab-ce!24091
| * | | | | | | | | | | | | | | | | | Upgrade GitLab QA image to Ruby 2.5Stan Hu2018-12-311-1/+1
| | |_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GitLab is now shipping with Ruby 2.5.3, so we should make the version consistent for the QA image as well.
* | | | | | | | | | | | | | | | | | Merge branch ↵Sean McGivern2019-01-0212-13/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '55838-remove-gem-install-bundler-from-docker-based-ruby-environments' into 'master' Remove gem install bundler from Docker-based Ruby environments Closes #55838 See merge request gitlab-org/gitlab-ce!24093
View Lorry Controller Status