Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add markdown buttons to file editor27861-add-markdown-editing-buttons-to-the-file-editor | Sam Bigelow | 2019-01-02 | 12 | -213/+421 |
| | | | | | | | Currently, we have markdown files in many places (e.g. comments, new issues, etc.). This Merge Request detects if the file being edited is a markdown file and adds markdown buttons and their functionality to the single file editor (Not the web IDE) | ||||
* | Merge branch 'update-gitlab-runner-helm-chart-to-0-1-43' into 'master' | Kamil Trzciński | 2019-01-02 | 3 | -4/+9 |
|\ | | | | | | | | | Update gitlab runner helm chart to 0.1.43 See merge request gitlab-org/gitlab-ce!24083 | ||||
| * | Update GitLab Runner Helm Chart to 0.1.43update-gitlab-runner-helm-chart-to-0-1-43 | Tomasz Maczukin | 2018-12-31 | 3 | -4/+9 |
| | | |||||
* | | Merge branch 'blackst0ne-bump-rails-cve-2018-16476' into 'master' | Grzegorz Bizon | 2019-01-02 | 7 | -44/+83 |
|\ \ | | | | | | | | | | | | | Bump Ruby on Rails to 5.0.7.1 See merge request gitlab-org/gitlab-ce!23396 | ||||
| * | | Bump Ruby on Rails to 5.0.7.1blackst0ne-bump-rails-cve-2018-16476 | blackst0ne | 2018-12-21 | 7 | -44/+83 |
| | | | | | | | | | | | | Fix the CVE-2018-16476 vulnerability. | ||||
* | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq | John Jarvis | 2019-01-02 | 40 | -71/+470 |
|\ \ \ | |||||
| * \ \ | Merge branch 'security-label-xss' into 'master' | John Jarvis | 2019-01-02 | 3 | -1/+28 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | [master] Escape html entities when no label found See merge request gitlab/gitlabhq!2706 | ||||
| | * | | | Escape html entities when no label found | Jarka Košanová | 2018-12-12 | 3 | -1/+28 |
| | | | | | |||||
| * | | | | Merge branch 'security-master-secret-ci-variables-exposed' into 'master' | John Jarvis | 2019-01-02 | 20 | -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 entry | Matija Čupić | 2018-12-08 | 1 | -0/+5 |
| | | | | | | |||||
| | * | | | | Use full ref when creating MR pipeline in specs | Matija Čupić | 2018-12-08 | 1 | -6/+6 |
| | | | | | | |||||
| | * | | | | Use build for testing HasRef | Matija Čupić | 2018-12-08 | 1 | -8/+8 |
| | | | | | | |||||
| | * | | | | Support merge_request pipeline ref types | Matija Čupić | 2018-12-08 | 1 | -7/+3 |
| | | | | | | |||||
| | * | | | | Check resolved_ref before checking if protected | Matija Čupić | 2018-12-08 | 1 | -1/+2 |
| | | | | | | |||||
| | * | | | | Check for explicit true or false in specs | Matija Čupić | 2018-12-08 | 1 | -6/+22 |
| | | | | | | |||||
| | * | | | | Conditionally assign ref_name for more efficiency | Matija Čupić | 2018-12-08 | 1 | -1/+5 |
| | | | | | | |||||
| | * | | | | Refactor Project#protected_for? specs | Matija Čupić | 2018-12-08 | 1 | -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_for | Matija Čupić | 2018-12-08 | 2 | -2/+22 |
| | | | | | | |||||
| | * | | | | Remove resolving conditional from protected_for | Matija Čupić | 2018-12-08 | 2 | -7/+24 |
| | | | | | | |||||
| | * | | | | Raise an error on ambiguous refs | Matija Čupić | 2018-12-08 | 3 | -3/+5 |
| | | | | | | |||||
| | * | | | | Rename Repository#resolve_ref to expand_ref | Matija Čupić | 2018-12-08 | 3 | -14/+13 |
| | | | | | | |||||
| | * | | | | Make full ref in Repository#resolve_ref explicit | Matija Čupić | 2018-12-08 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Implement Command#ambiguous_ref? | Matija Čupić | 2018-12-08 | 3 | -1/+27 |
| | | | | | | |||||
| | * | | | | Simplify conditionals in Project#protected_ref? | Matija Čupić | 2018-12-08 | 1 | -2/+6 |
| | | | | | | |||||
| | * | | | | Revert "Use to_s.start_with? in tag/branch ref method" | Matija Čupić | 2018-12-08 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ec4730478b798270781257913ee4cede673d4d4e. | ||||
| | * | | | | Implement Repository#ambiguous_ref? | Matija Čupić | 2018-12-08 | 5 | -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 method | Matija Čupić | 2018-12-08 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | Move Project#resolve_ref to Repository | Matija Čupić | 2018-12-08 | 5 | -67/+65 |
| | | | | | | |||||
| | * | | | | Search for tag / branch ref from beginning | Matija Čupić | 2018-12-08 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | Remove Repository#find_ref | Matija Čupić | 2018-12-08 | 2 | -46/+0 |
| | | | | | | |||||
| | * | | | | Use strings instead of Gitlab::Git::Ref | Matija Čupić | 2018-12-08 | 2 | -36/+19 |
| | | | | | | |||||
| | * | | | | Allow any character in tag / branch ref regex | Matija Čupić | 2018-12-08 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | Remove Gitlab::Git::Ref#full_ref | Matija Čupić | 2018-12-08 | 7 | -46/+7 |
| | | | | | | |||||
| | * | | | | Check for Tag/Branch corectness | Matija Čupić | 2018-12-08 | 2 | -5/+21 |
| | | | | | | |||||
| | * | | | | Reintroduce Command#protected_ref? | Matija Čupić | 2018-12-08 | 8 | -10/+36 |
| | | | | | | |||||
| | * | | | | Use nil instead of raising AmbiguousRef | Matija Čupić | 2018-12-08 | 3 | -7/+14 |
| | | | | | | |||||
| | * | | | | Use Gitlab::Git::Ref in Project#resolve_ref | Matija Čupić | 2018-12-08 | 9 | -28/+113 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reworks Project#resolve_ref to return Gitlab::Git::Branch, Gitlab::Git::Tag or raise an AmbiguousRef error. | ||||
| | * | | | | Avoid using magic variable in spec | Matija Čupić | 2018-12-08 | 1 | -3/+3 |
| | | | | | | |||||
| | * | | | | Make HasRef#git_ref public | Matija Čupić | 2018-12-08 | 2 | -4/+28 |
| | | | | | | |||||
| | * | | | | Prevent creating pipelines with ambiguous refs | Matija Čupić | 2018-12-08 | 8 | -30/+35 |
| | | | | | | |||||
| | * | | | | Use full ref when possible to avoid ambiguity | Matija Čupić | 2018-12-08 | 7 | -8/+70 |
| | | | | | | |||||
| | * | | | | Support both ref and ref-name in protected_for? | Matija Čupić | 2018-12-08 | 2 | -8/+87 |
| | | | | | | |||||
| * | | | | | Merge branch 'security-master-url-rel' into 'master' | John Jarvis | 2019-01-02 | 3 | -10/+15 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [master] Set URL rel attribute for broken URLs See merge request gitlab/gitlabhq!2695 | ||||
| | * | | | | | Set URL rel attribute for broken URLs | Jan Provaznik | 2018-12-11 | 3 | -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 Jarvis | 2019-01-02 | 14 | -16/+55 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [master] Security todos not redacted for guests See merge request gitlab/gitlabhq!2697 | ||||
| | * | | | | | | Delete confidential issue todos for guests | Felipe Artur | 2018-12-14 | 14 | -16/+55 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix leaking information of confidential issues on TODOs when user is downgraded to guest access. | ||||
* | | | | | | | | Merge branch ↵ | Kushal Pandya | 2019-01-02 | 4 | -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 tab | Constance Okoghenun | 2019-01-02 | 4 | -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 McGivern | 2019-01-02 | 3 | -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 date | Jacopo | 2018-12-31 | 3 | -2/+7 |
| | | | | | | | | | |