summaryrefslogtreecommitdiff
path: root/spec/support
Commit message (Collapse)AuthorAgeFilesLines
* fixed and refactored a few things based on MR feedbackJames Lopez2016-05-061-8/+8
|
* Merge branches 'feature/project-export' and 'master' of ↵James Lopez2016-05-031-0/+7
|\ | | | | | | gitlab.com:gitlab-org/gitlab-ce into feature/project-export
| * Ensure URL in all Service subclasses are validRémy Coutable2016-04-251-0/+7
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-04-213-8/+28
|\ \ | |/ | | | | feature/project-export
| * Merge branch 'pmq20/gitlab-ce-issue_12785'Douwe Maan2016-04-191-1/+1
| |\
| | * Add support to cherry-pick any commitP.S.V.R2016-04-181-1/+1
| | | | | | | | | | | | | | | Issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/12785 Merge Request: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3514
| * | Added System Hooks for push and tag_pushGabriel Mazetto2016-04-191-1/+16
| | | | | | | | | | | | | | | Code is based on Project Webhooks, removing deprecations and without commits listing.
| * | Read job variables directly from gitlab CI configGrzegorz Bizon2016-04-181-6/+11
| |/
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-04-121-4/+5
|\ \ | |/ | | | | feature/project-export
| * Merge branch 'patch/fix-markdown-preview-wikis' into 'master' Robert Speicher2016-04-071-4/+5
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wiki preview URL converting problem [via Markdown] Current implementation when rendering the preview, thinks relative links are for project repository files. We are creating a new preview route that will define correct context data to render for wikis instead. Fixes #2380, #1184 See merge request !3461
| | * Fix a few edited references from WikiLinkFilter and specsGabriel Mazetto2016-04-061-4/+5
| | |
* | | continuing to refactor config, added spec and fixed a few problemsJames Lopez2016-04-071-0/+20
|/ /
* | Fix creation of merge requests for orphaned branchesStan Hu2016-04-041-0/+1
| | | | | | | | Closes #14875
* | Added & use Gitlab::Routing for URL helpersroutingYorick Peterse2016-04-012-2/+2
| | | | | | | | | | | | | | Rails' "url_helpers" method creates an anonymous Module (which a bunch of methods) on every call. By caching the output of this method in a dedicated method we can shave off about 10 seconds of loading time for an issue with around 200 comments.
* | Move CarrierWave test env config to separate fileGrzegorz Bizon2016-03-301-0/+7
|/
* Tweaks, refactoring, and specsDouwe Maan2016-03-202-22/+1
|
* Merge branch 'master' into issue_12658Douwe Maan2016-03-203-2/+4
|\
| * Restrict access to references for confidential issuesDouglas Barbosa Alexandre2016-03-171-0/+2
| |
| * Merge branch '4009-external-users' into 'master' Douwe Maan2016-03-171-0/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | External Users The user has the rights of a public user execpt it can never create a project, group, or team. Also it cant view internal projects. Partially fix for both #4009 and #13938 (except the LDAP sync or a pattern to detect external users) ![Screen_Shot_2016-03-14_at_22.02.52](/uploads/486a84ab3acb98c6cfb71a4ec7d268e2/Screen_Shot_2016-03-14_at_22.02.52.png) See merge request !3171
| * \ Merge branch 'fix-capybara-deprecation-warnings' into 'master' Robert Speicher2016-03-162-2/+2
| |\ \ | | | | | | | | | | | | | | | | Fix Capybara 2.6.2 deprecation warnings See merge request !3236
| | * | Fix Capybara 2.6.2 deprecation warningsStan Hu2016-03-152-2/+2
| | | |
* | | | Code fixesFelipe Artur2016-03-171-0/+4
| | | |
* | | | Merge 4009-external-users into issue_12658Felipe Artur2016-03-163-61/+15
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'master' into 4009-external-users4009-external-usersZeger-Jan van de Weg2016-03-151-0/+13
| |\ \ \ | | |/ /
| | * | Original implementation to allow users to subscribe to labelsTimothy Andrew2016-03-151-0/+13
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Allow subscribing (the current user) to a label - Refactor the `Subscription` coffeescript class - The main change is that it accepts a container, and conducts all DOM queries within its scope. We need this because the labels page has multiple instances of `Subscription` on the same page. 2. Creating an issue or MR with labels notifies users subscribed to those labels - Label `has_many` subscribers through subscriptions. 3. Adding a label to an issue or MR notifies users subscribed to those labels - This only applies to subscribers of the label that has just been added, not all labels for the issue.
| * | External UsersZeger-Jan van de Weg2016-03-131-0/+2
| |/ | | | | | | | | The user has the rights of a public user execpt it can never create a project, group, or team. Also it cant view internal projects.
| * Removed benchmark suite and its documentationremove-benchmark-suiteYorick Peterse2016-03-101-61/+0
| | | | | | | | | | | | | | | | | | The rationale for this can be found in https://gitlab.com/gitlab-org/gitlab-ce/issues/13718 but in short the benchmark suite no longer serves a good purpose now that we have proper production monitoring in place. Fixes gitlab-org/gitlab-ce#13718
* | Add security specsFelipe Artur2016-03-101-0/+17
|/
* Merge branch 'feature/jschatz1/sidebar-sizing' into 'master' Jacob Schatz2016-02-241-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sidebar overlaps content when screen is below 1200px. When screen is below 1200px, the sidebar overlaps. When screen is above 1200px, the sidebar pushes content out. z-index change to make sure hamburger stays on top. Fixes #12717 ![screensize](/uploads/9a21fa06d583a49d6ebbf1ada34c6792/screensize.gif) ![screensize-small](/uploads/7c25f46e962248a40840562a01c83f8f/screensize-small.gif) Also sorry I couldn't get the collapse button in the screen cap. It's there. See merge request !2620
| * Set window_size to 1366*768Alfredo Sumaran2016-02-231-1/+1
| |
* | Add newlineJacob Vosmaer2016-02-171-1/+1
| |
* | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Jacob Vosmaer2016-02-172-0/+71
|\ \ | |/ | | | | git-archive-refactor
| * Merge branch 'bugagazavr/gitlab-ce-extend-hooks' into 'master' Douwe Maan2016-02-161-0/+27
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new data to project in push, issue, merge-request and note webhooks data _Originally opened at !2738 by @bugagazavr._ - - - **What does this MR do?** Adds more data to hooks, makes repository data in all hook more dry ( use one hook_attrs method for repository data in all hooks ) **Are there points in the code the reviewer needs to double check?** 1. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/app/models/project.rb#L738 2. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/app/models/concerns/issuable.rb#L132 3. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/lib/gitlab/push_data_builder.rb#L52 4. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/lib/gitlab/note_data_builder.rb#L56 **Why was this MR needed?** More information about user for push events, and more data about repositiry ( project ) **What are the relevant issue numbers?** No **Screenshots (if relevant)** No See merge request !2788
| | * Add new data to project in push, issue, merge-request and note webhooks databugagazavr/gitlab-ce-extend-hooksKirill Zaitsev2016-02-111-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add `avatar_url`, `description`, `git_ssh_url`, `git_http_url`, `path_with_namespace` and `default_branch` in `project` in push, issue, merge-request and note webhooks data - Deprecate the `ssh_url` in favor of `git_ssh_url` and `http_url` in favor of `git_http_url` in `project` for push, issue, merge-request and note webhooks data - Deprecate the `repository` key in push, issue, merge-request and note webhooks data, use `project` instead
| * | Validate email addresses using Devise.email_regexpRémy Coutable2016-02-091-0/+44
| |/ | | | | | | | | | | | | Also: - Get rid of legacy :strict_mode - Get rid of custom :email validator - Add some shared examples to spec emails validation
* | Fix APIJacob Vosmaer2016-02-111-0/+16
|/
* Increase the minimum length for commit SHA matching to 7rs-issue-12706Robert Speicher2016-01-291-2/+2
| | | | | | This is the git default and will help to prevent false positive matches. Closes #12706
* Prevent transient Capybara timeouts during feature testsrs-transient-capybara-timeoutRobert Speicher2016-01-282-1/+22
| | | | | | | | | | | The problem occurred because asset compilation takes a long time, so when the asset cache didn't exist and the first test ran, it would often (randomly) time out during the generation before the actual test even had a chance to run. Now we check if the cache exists before the suite runs, and if not, we manually fire a request to the root URL in order to generate it. This should allow subsequent tests to use the cached assets.
* Let the CI runner know about builds that this build depends onci/build_dependenciesKamil Trzcinski2016-01-141-4/+4
| | | | This allows us to implement artifacts passing: runner will download artifacts from all prior builds
* Merge branch 'add-pagination-headers-to-api' into 'master' Dmitriy Zaporozhets2016-01-141-0/+20
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add pagination headers to already paginated API resources Following #3045, I've added pagination headers using already available Kaminari methods. ## Pagination headers in action ![Screen_Shot_2016-01-14_at_12.14.53](/uploads/88807f754dd9aafbb24da85f6bdf9521/Screen_Shot_2016-01-14_at_12.14.53.png) --- I've also added a shared example to test paginated API resources. A possible next step would be to paginate all the API resources that return an array. See merge request !2426
| * Add pagination headers to already paginated API resourcesadd-pagination-headers-to-apiRémy Coutable2016-01-141-0/+20
| |
* | Fix parse_gollum_tags matcherDouglas Barbosa Alexandre2016-01-141-2/+2
| |
* | Add tests for the wiki pipelineDouglas Barbosa Alexandre2016-01-142-0/+22
|/
* Render milestone links as referencesDouwe Maan2015-12-242-0/+17
|
* Backport JIRA serviceDrew Blessing2015-12-181-0/+67
|
* Merge remote-tracking branch 'origin/feature/update-rubocop'Dmitriy Zaporozhets2015-12-161-6/+6
|\
| * Fixed Rubocop offensesGabriel Mazetto2015-12-151-6/+6
| |
* | Move Markdown/reference logic from Gitlab::Markdown to BanzaiDouwe Maan2015-12-151-18/+18
|/
* Merge branch 'master' into ux/suppress-ci-yml-warningGrzegorz Bizon2015-12-141-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (24 commits) Fix runners admin view Fix migrations Run builds from projects with enabled CI Use Gitlab::Git instead of Ci::Git Fix last specs Fix specs Fix after column rename Fix errors Update badge Finishing touches Fix triggers tests Rename columns and rename migrations Reimplement Trigger API Remove ci_ prefix from all ci related things Add runners token Migrate CI::Project to Project Fix indentation and BuildsEmailService Change default values Enhance migrate CI emails Fix issue tracker service ... Conflicts: spec/features/commits_spec.rb
* | Improve gitlab ci commits specs (refactoring)Grzegorz Bizon2015-12-141-0/+4
|/ | | | | | This minimizes usage of instance variables in this spec, and changes double quotation marks to single when string interpolation is not being used.