summaryrefslogtreecommitdiff
path: root/spec/support
Commit message (Collapse)AuthorAgeFilesLines
* 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
* 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.
* Merge branch 'complexity/rubocop-metrics' into 'master' Douwe Maan2015-12-111-3/+3
|\ | | | | | | | | | | | | | | Enable rubocop metrics This enables rubocop metrics like CyclomaticComplexity and ABCSize. Initial threshold values are high, should be probably decreased. See merge request !1802
| * Move `common_mentionable_setup` to shared context in specsGrzegorz Bizon2015-12-081-3/+3
| |
* | Merge branch 'serve_lfs_object' into 'master' Douwe Maan2015-12-081-0/+1
|\ \ | | | | | | | | | | | | | | | | | | Serve LFS object Depends on gitlab-org/gitlab_git!57 See merge request !1976
| * | Fix specs caused by update of gitlab-test repo.serve_lfs_objectMarin Jankovski2015-12-081-1/+2
| | |
| * | Add specs for showing lfs object in UI.Marin Jankovski2015-12-071-1/+1
| | |
* | | Merge branch 'master' into fix-merge-request-that-removes-submodulefix-merge-request-that-removes-submoduleDouglas Barbosa Alexandre2015-12-071-0/+11
|\ \ \ | | |/ | |/|
| * | Fix random failing test - delete attachmentfix-random-testDmitriy Zaporozhets2015-12-071-0/+11
| | | | | | | | | | | | | | | | | | | | | Make sure we wait for AJAX request to finish before end test and cleanup database Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'master' into fix-merge-request-that-removes-submoduleDouglas Barbosa Alexandre2015-12-074-20/+34
|\ \ \ | |/ /
| * | Use URL helpers in specsDouwe Maan2015-12-031-0/+4
| | |
| * | Add new references to markdown feature spec.Douwe Maan2015-12-011-7/+7
| | |
| * | Autolink first so we don't pick up numeric anchors as issue references.Douwe Maan2015-12-011-3/+16
| | |
| * | Fix specsDouwe Maan2015-11-301-10/+7
| |/
* | Fix 500 error when creating a merge request that removes a submoduleDouglas Barbosa Alexandre2015-12-041-1/+2
|/
* Replace all usages of `git` command with configurable binary pathrs-git-bin-pathRobert Speicher2015-11-031-4/+4
| | | | Closes #3311
* Merge branch 'master' into rs-redactor-filterrs-redactor-filterDouwe Maan2015-10-161-1/+1
|\
| * Merge branch 'fix-path-with-leading-dot-error' into 'master' Dmitriy Zaporozhets2015-10-151-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix error preventing displaying of commit data for a directory with a leading dot Directories with leading dots erroneously get rejected by the route controller if git ref regex is used in constraints. This prevents commit data from being loaded. The regex verification is now done in controller. Closes https://github.com/gitlabhq/gitlabhq/issues/8763 See merge request !1574
| | * Fix error preventing displaying of commit data for a directory with a ↵Stan Hu2015-10-121-1/+1
| | | | | | | | | | | | | | | | | | leading dot Closes https://github.com/gitlabhq/gitlabhq/issues/8763
* | | Merge branch 'master' into rs-redactor-filterDouwe Maan2015-10-152-12/+11
|\ \ \ | |/ /
| * | Merge branch 'simplify-cross-references' into 'master' Robert Speicher2015-10-141-11/+4
| |\ \ | | | | | | | | | | | | | | | | Simplify code around (cross)-references See merge request !1568
| | * | Make Mentionable#cross_reference_exists? private.simplify-cross-referencesDouwe Maan2015-10-141-7/+0
| | | |
| | * | Fix mentionable specsDouwe Maan2015-10-121-1/+1
| | | |
| | * | Simplify code around (cross)-referencesDouwe Maan2015-10-121-5/+5
| | |/
| * | Hide passwords to non-admin users in the services APIAlex Lossent2015-10-121-1/+7
| |/ | | | | | | In order to be consistent with !1490 doing it for the web interface
* | Always allow references to the current projectDouwe Maan2015-10-071-0/+2
| |
* | Refactor reference gathering to use a dedicated filterDouwe Maan2015-10-071-1/+8
| |
* | Merge branch 'master' into rs-redactor-filterDouwe Maan2015-10-0717-3/+370
|\ \ | |/
| * Merge branch 'refactor-build-service' into 'master' Kamil Trzciński2015-10-051-0/+8
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor Ci::Commit and Ci::Build to have all builds for same :sha on single page This makes Ci::Commit to have only :sha and simplifies routing to have only :sha in path. The :ref and :push_data is now parameter of Ci::Build. All commit related data (git author, message and .gitlab-ci.yml) is read directly from repository. All code related for creating builds is moved to CreateBuildsService. Status deduction is rewritten to make if more efficient and easier to integrate with Commit Status API. This is partially working, tests are not yet touched. This slightly changes view of Commit: ![Screen_Shot_2015-10-02_at_15.21.47](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ad3f1ccdcc87659ea437d8db6c5b9f94/Screen_Shot_2015-10-02_at_15.21.47.png) @dzaporozhets What do you think? See merge request !1502