summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'imported-ghe-project-names-links-to-github' into 'master' Robert Speicher2016-04-191-0/+25
|\ | | | | | | | | | | | | Fix GitHub project's link in the import page when provider has a custom URL Closes gitlab-org/gitlab-ee#478 See merge request !3803
| * Fix GitHub project's link on import page when provider has a custom URLDouglas Barbosa Alexandre2016-04-191-0/+25
| |
* | Merge branch 'pmq20/gitlab-ce-issue_12785'Douwe Maan2016-04-194-1/+154
|\ \
| * | Add support to cherry-pick any commitP.S.V.R2016-04-184-1/+154
| | | | | | | | | | | | | | | Issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/12785 Merge Request: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3514
* | | Merge branch 'mr-formatting' into 'master' Robert Speicher2016-04-194-11/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | use ! rather than # for merge request references Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/15278 See merge request !3740
| * | | format merge request references properlyBen Bodenmiller2016-04-184-11/+11
| | | |
* | | | Merge branch '14566-confidential-issue-branches' into 'master' Robert Speicher2016-04-191-7/+34
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sanitize branch names for confidential issues - When creating new branches for confidential issues, prefer a branch name like `issue-15` to `some-sensitive-issue-title-15`. - The behaviour for non-confidential issues stays the same. Closes #14566 See merge request !3671
| * | | | A new branch created for a confidential issue is named ↵14566-confidential-issue-branchesTimothy Andrew2016-04-191-1/+1
| | | | | | | | | | | | | | | | | | | | `<id>-confidential-issue`.
| * | | | Merge remote-tracking branch 'origin/master' into ↵Timothy Andrew2016-04-1532-197/+1245
| |\ \ \ \ | | | | | | | | | | | | | | | | | | 14566-confidential-issue-branches
| * | | | | Make a few style changes based on MR feedback.Timothy Andrew2016-04-151-2/+2
| | | | | |
| * | | | | Merge remote-tracking branch 'origin/master' into ↵Timothy Andrew2016-04-1314-74/+271
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | 14566-confidential-issue-branches
| * | | | | | Fix the rubocop check.Timothy Andrew2016-04-131-2/+3
| | | | | | |
| * | | | | | Test the `Issue#to_branch_name` method.Timothy Andrew2016-04-121-2/+11
| | | | | | |
| * | | | | | Augment the tests for `Issue#related_branches`Timothy Andrew2016-04-121-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Test the case where we have a referenced merge request that's being - excluded as a "related branch" - This took a while to figure out, especially the `create_cross_references!` line.
| * | | | | | Refactor `Issue#related_branches`Timothy Andrew2016-04-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Previously, the controller held the logic to calculate related branches, which was: `<branches ending with `issue.iid`> - <branches with a merge request referenced in the current issue>` - This logic belongs in the `related_branches` method, not in the controller. This commit makes this change. - This means that `Issue#related_branches` now needs to take a `User`. When we find the branches that have a merge request referenced in the current issue, this is limited to merge requests that the current user has access to. - This is not directly related to #14566, but is a related refactoring.
* | | | | | | Merge branch 'rs-issue-15126' into 'master' Douwe Maan2016-04-192-1/+30
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove persistent XSS vulnerability in `commit_person_link` helper Because we were incorrectly supplying the tooltip title as `data-original-title` (which Bootstrap's Tooltip JS automatically applies based on the `title` attribute; we should never be setting it directly), the value was being passed through as-is. Instead, we should be supplying the normal `title` attribute and letting Rails escape the value, which also negates the need for us to call `sanitize` on it. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15126 See merge request !1948
| * | | | | | Remove additional misuse of `data-original-title` attributeRobert Speicher2016-04-181-1/+1
| | | | | | |
| * | | | | | Remove persistent XSS vulnerability in `commit_person_link` helperRobert Speicher2016-04-171-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because we were incorrectly supplying the tooltip title as `data-original-title` (which Bootstrap's Tooltip JS automatically applies based on the `title` attribute; we should never be setting it directly), the value was being passed through as-is. Instead, we should be supplying the normal `title` attribute and letting Rails escape the value, which also negates the need for us to call `sanitize` on it. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15126
* | | | | | | Merge branch 'api-fix-annotated-tags' into 'master' Rémy Coutable2016-04-191-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Present an array of Gitlab::Git::Tag instead of array of rugged tags The annotated message was always `null` because the wrong array was presented. The entity requires an array of `Gitlab::Git::Tags` instead an array of raw rugged tags was presented. Since a rugged tag does not respond to `message` to get the annotated message, this was always `null`. See merge request !3764
| * | | | | | | Ensure that annoation is presented properlyRobert Schilling2016-04-181-0/+2
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'configurable-shared-runners-text' into 'master' Kamil Trzciński2016-04-191-0/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add configurable shared runners text cc @axil @rspeicher @grzesiek See merge request !3750
| * | | | | | | Use different markdownconfigurable-shared-runners-textKamil Trzcinski2016-04-191-2/+3
| | | | | | | |
| * | | | | | | Update according to review commentsKamil Trzcinski2016-04-181-5/+4
| | | | | | | |
| * | | | | | | Add configurable shared runners textKamil Trzcinski2016-04-181-0/+16
| | | | | | | |
* | | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqGrzegorz Bizon2016-04-191-0/+50
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of dev.gitlab.org:gitlab/gitlabhq: Add Changelog entry for group link permissions fix Use guard clause to check ability to share project Refactor method that shares project with a group Check permissions when sharing project with group
| * | | | | | | | Check permissions when sharing project with groupGrzegorz Bizon2016-04-191-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #15330
* | | | | | | | | Merge branch 'make-before-after-overridable' into 'master' Kamil Trzciński2016-04-191-3/+70
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make before_script and after_script overridable This is makes it possible to overwrite the before_script and after_script at job level. This is continuation of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3771 See merge request !3772
| * | | | | | | | | Make rubocop happymake-before-after-overridableKamil Trzcinski2016-04-181-8/+8
| | | | | | | | | |
| * | | | | | | | | Merge branch 'after-script' into make-before-after-overridableKamil Trzcinski2016-04-1810-43/+370
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'after-script' into make-before-after-overridableKamil Trzcinski2016-04-181-2/+2
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'after-script' into make-before-after-overridableKamil Trzcinski2016-04-171-14/+14
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * after-script: Add CHANGELOG and documentation Rename finally_script to after_script Conflicts: lib/ci/gitlab_ci_yaml_processor.rb spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
| * | | | | | | | | | | | Allow the before_script and finally_script to be overwritten in context of jobKamil Trzcinski2016-04-161-3/+70
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'after-script' into 'master' Kamil Trzciński2016-04-191-0/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | / / / / / / / / | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement after_script which allows to do cleanups as part of the build process This implements `after_script` in global context. The `after_script` will be executed always after the job, even if the job were canceled. This requires changes on Runner side that will be implemented in 1.2. cc @tmaczukin @grzesiek See merge request !3771
| * | | | | | | | | | | Merge remote-tracking branch 'origin/master' into after-scriptKamil Trzcinski2016-04-183-22/+99
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge remote-tracking branch 'origin/master' into after-scriptKamil Trzcinski2016-04-187-21/+271
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Fix rubocop complainsKamil Trzcinski2016-04-181-2/+2
| | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Rename finally_script to after_scriptKamil Trzcinski2016-04-171-7/+7
| | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Implement finally_script which allows to do cleanups as part of the build ↵Kamil Trzcinski2016-04-161-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | process
* | | | | | | | | | Merge branch 'feature/system_hook_push' into 'master' Dmitriy Zaporozhets2016-04-193-16/+40
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added System Hooks for push and tag_push Implements `push` and `tag_push` events for System Hooks. They are based on Webhooks Events but without any deprecated item. We don't send commits too. We are implementing this, to be used by Geo repository syncing (gitlab-org/gitlab-ee#76). These hook events will be sent only when the respective configuration flags are set to true. UI changes to admin screen will be made in another MR. See merge request !3744
| * | | | | | | | | | Using single builder for push and tag eventsGabriel Mazetto2016-04-191-22/+6
| | | | | | | | | | |
| * | | | | | | | | | Refactor GitTagPushService and fig tags_push system event hookGabriel Mazetto2016-04-191-12/+12
| | | | | | | | | | |
| * | | | | | | | | | Added System Hooks for push and tag_pushGabriel Mazetto2016-04-192-4/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code is based on Project Webhooks, removing deprecations and without commits listing.
* | | | | | | | | | | Merge branch 'auto-fsck-skip-wiki' into 'master' Yorick Peterse2016-04-192-1/+35
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve 'auto fsck' feature - skip wiki repositories when they are disabled (avoids false alarms) - more context in admin alert emails Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/15332 See merge request !3781
| * | | | | | | | | | Destroy wikis uniformlyJacob Vosmaer2016-04-181-2/+6
| | | | | | | | | | |
| * | | | | | | | | | Improve 'auto fsck' admin emailsJacob Vosmaer2016-04-181-1/+1
| | | | | | | | | | |
| * | | | | | | | | | When a project wiki is disabled skip it for fsckJacob Vosmaer2016-04-181-0/+30
| | | | | | | | | | |
* | | | | | | | | | | Use double instead of OpenStruct in the Issue/PR formatters specsDouglas Barbosa Alexandre2016-04-182-32/+34
| | | | | | | | | | |
* | | | | | | | | | | Set GitHub milestones to Issue/Merge Request that were importedDouglas Barbosa Alexandre2016-04-182-0/+35
| | | | | | | | | | |
* | | | | | | | | | | Import milestones from GitHubDouglas Barbosa Alexandre2016-04-181-0/+82
| | | | | | | | | | |
* | | | | | | | | | | Import labels from GitHubDouglas Barbosa Alexandre2016-04-181-0/+19
| | | | | | | | | | |