Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'deprecated-insert-sql' into 'master' | Robert Speicher | 2019-01-02 | 2 | -1/+6 |
|\ | | | | | | | | | Fix deprecation: insert_sql is deprecated and will be removed See merge request gitlab-org/gitlab-ce!23944 | ||||
| * | Fix deprecation: insert_sql is deprecated and will be removed | Jasper Maes | 2019-01-02 | 2 | -1/+6 |
| | | |||||
* | | Merge branch 'deprecated-redirect-back' into 'master' | Robert Speicher | 2019-01-02 | 4 | -3/+8 |
|\ \ | |/ |/| | | | | | Fix deprecation: redirect_to :back is deprecated See merge request gitlab-org/gitlab-ce!23943 | ||||
| * | Fix deprecation: redirect_to :back is deprecated | Jasper Maes | 2019-01-02 | 4 | -3/+8 |
|/ | |||||
* | Merge branch 'mk/avoid-extra-storage-perm-and-query' into 'master' | Stan Hu | 2019-01-02 | 5 | -5/+5 |
|\ | | | | | | | | | Avoid extra storage bucket perm and query See merge request gitlab-org/gitlab-ce!23995 | ||||
| * | Avoid extra storage bucket perm and querymk/avoid-extra-storage-perm-and-query | Michael Kozono | 2018-12-21 | 5 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | Specifically, the `ListAllMyBuckets` permission. This works if you know the directory exists. See more: * https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23981 * https://stackoverflow.com/a/12288581/1992201 | ||||
* | | Merge branch '55266-fix-incorrect-due-date-parsing' into 'master' | Clement Ho | 2019-01-02 | 2 | -2/+12 |
|\ \ | | | | | | | | | | | | | | | | | | | Use `parsePikadayDate` to parse due date string Closes #55266 See merge request gitlab-org/gitlab-ce!24045 | ||||
| * | | Add changelog entry55266-fix-incorrect-due-date-parsing | Kushal Pandya | 2018-12-27 | 1 | -0/+5 |
| | | | |||||
| * | | Use `parsePikadayDate` to parse due date string | Kushal Pandya | 2018-12-27 | 1 | -2/+7 |
| | | | |||||
* | | | Merge branch '18667-handle-push-opts' into 'master' | Douwe Maan | 2019-01-02 | 13 | -19/+84 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Handle 'git push -o ci.skip' Closes #18667 See merge request gitlab-org/gitlab-ce!15643 | ||||
| * | | | Add support for Git push options, specifically ci.skip | Jonathon Reinhart | 2018-12-31 | 13 | -19/+84 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitlab-org/gitlab-shell!166 added support for collecting push options from the environment, and passing them along to the /internal/post_receive API endpoint. This change handles the new push_options JSON element in the payload, and passes them on through to the GitPushService and GitTagPushService services. Futhermore, it adds support for the first push option, ci.skip. With this change, one can use 'git push -o ci.skip' to skip CI pipe execution. Note that the pipeline is still created, but in the "skipped" state, just like with the 'ci skip' commit message text. Implements #18667 | ||||
* | | | | 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 |
| | | | | | | | | |