summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fix_health_check_type' into 'master' Douwe Maan2016-05-121-1/+1
|\ | | | | | | | | | | | | | | | | Fix minor typos in admin health check page Fix minor typos from gitlab-org/gitlab-ce!3888 cc/ @DouweM @twk3 See merge request !4134
| * Fix minor typos in admin health check pageDrew Blessing2016-05-121-1/+1
| |
* | Merge branch 'rs-cleanup-events_helper_spec' into 'master' Douwe Maan2016-05-121-47/+48
|\ \ | | | | | | | | | | | | | | | | | | Clean up EventsHelper spec Extracted from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4090 See merge request !4133
| * | Clean up EventsHelper specRobert Speicher2016-05-121-47/+48
| | |
* | | Merge branch 'deprecated-class-methods-cop' into 'master' Robert Speicher2016-05-123-7/+7
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | Enable the Rubocop DeprecatedClassMethods cop This reports uses of `File.exists?` and `Dir.exists?`, which were both deprecated in Ruby and will eventually be removed in favor of `.exist?`. Also fixes all existing uses of the deprecated methods. See merge request !4087
| * | Enable the Rubocop DeprecatedClassMethods copConnor Shea2016-05-083-7/+7
| | | | | | | | | | | | | | | | | | This reports uses of `File.exists?` and `Dir.exists?`, which were both deprecated in Ruby and will eventually be removed in favor of `.exist?`. Also fixes all existing uses of the deprecated methods.
* | | Merge branch 'default-scope-on-builds-page' into 'master' Robert Speicher2016-05-122-0/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a description for default scope on builds Should be "**All* builds (from this project)" for the {project,admin} builds page without scope. Fix a regression on !2243 (#4240). See merge request !4118
| * | | Fix a description for default scope on buildsTakuya Noguchi2016-05-132-0/+2
| | | |
* | | | Merge branch 'feature/label-subscription-api' into 'master' Douwe Maan2016-05-123-0/+104
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add API endpoints for un/subscribing from/to a label See merge request !4051
| * | | | Add API endpoints for un/subscribing from/to a labelAhmad Sherif2016-05-123-0/+104
| | | | | | | | | | | | | | | | | | | | Closes #15638
* | | | | Merge branch 'health-check-route'Douwe Maan2016-05-124-0/+177
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * | | | Support token header for health check token, and general cleanup of the ↵DJ Mountney2016-05-111-0/+15
| | | | | | | | | | | | | | | | | | | | health_check feature.
| * | | | Add tests for the health check featureDJ Mountney2016-05-104-0/+162
| | | | |
* | | | | Merge branch 'otzy007/gitlab-ce-disable_oauth_sign_in_sources'Douwe Maan2016-05-122-1/+55
|\ \ \ \ \
| * | | | | more readable specs for enabled_button_based_providers and ↵Andrei Gliga2016-05-121-15/+29
| | | | | | | | | | | | | | | | | | | | | | | | button_based_providers_enabled?
| * | | | | DRYing enabled_button_based_providers testsAndrei Gliga2016-05-121-7/+4
| | | | | |
| * | | | | enabled_button_based_providers into their own describe sectionAndrei Gliga2016-05-121-0/+2
| | | | | |
| * | | | | use stub_application_setting insteadAndrei Gliga2016-05-121-10/+4
| | | | | |
| * | | | | between ""Andrei Gliga2016-05-121-1/+1
| | | | | |
| * | | | | stub Devise.omniauth_providers to return GitHub even if the gitlab.yml has ↵Andrei Gliga2016-05-121-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | no omniauth provider enabled This will fix failing tests in case gitlab.yml file has no omniauth providers enabled
| * | | | | tests for button_based_providers_enabled? helper method of AuthHelperAndrei Gliga2016-05-121-0/+18
| | | | | |
| * | | | | tests for enabled_button_based_providers helper method of AuthHelperAndrei Gliga2016-05-121-1/+21
| | | | | |
| * | | | | validate disabled_oauth_sign_in_sources in ApplicationSeAndrei Gliga2016-05-121-0/+3
| | | | | |
* | | | | | Merge branch 'send-incremental-build-log' into 'master' Jacob Schatz2016-05-121-33/+78
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update build log incrementally Proof of concept implementation of incremental sending of build log to browser. cc @jschatz1 @vsizov @grzesiek @tmaczukin See merge request !3737
| * | | | | Merge remote-tracking branch 'origin/master' into send-incremental-build-logKamil Trzcinski2016-05-1062-893/+468
| |\ \ \ \ \
| * | | | | | Send trace to a browser incrementally when build is runningKamil Trzcinski2016-05-091-33/+78
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | We send a state of ansi2html to client, client needs to send this state back. The state describes the configuration of generator and position within trace.
* | | | | | Removed tracking of total method execution timestotal-method-timeYorick Peterse2016-05-121-6/+0
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because method call timings are inclusive (that is, they include the time of any sub method calls) this would lead to the total method execution time often being far greater than the total transaction time. Because this is incredibly confusing it's best to simply _not_ track the total method execution time, after all it's not that useful to begin with. Fixes gitlab-org/gitlab-ce#17239
* | | | | Implement @rymai's feedback after review.Timothy Andrew2016-05-121-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | - Separate 'exercise' and 'verify' steps of tests. - Use `build_stubbed` instead of `build`
* | | | | Add a spec for `WikiLinkFilter`Timothy Andrew2016-05-121-0/+77
| | | | | | | | | | | | | | | | | | | | - And fix behavior for non-file hierarchical links.
* | | | | Merge branch 'issue_15572_snippets_tab_under_user_profile' into 'master' Douwe Maan2016-05-112-4/+59
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Add snippet tab under user profile Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15572 See merge request !4001
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Long Nguyen2016-05-1164-894/+606
| |\ \ \ \ | | | | | | | | | | | | | | | | | | issue_15572_snippets_tab_under_user_profile
| * | | | | Add specs for user routing and update spec for user controllerLong Nguyen2016-05-082-0/+59
| | | | | |
| * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Long Nguyen2016-05-088-29/+360
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | issue_15572_snippets_tab_under_user_profile
| * | | | | user routings refactorLong Nguyen2016-05-081-0/+4
| | | | | |
| * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Long Nguyen2016-05-0562-410/+1660
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | issue_15572_snippets_tab_under_user_profile
| * | | | | | Remove unused code, update spec, and update changelogLong Nguyen2016-05-051-8/+0
| | | | | | |
* | | | | | | Merge branch 'hook-docs-behavior' into 'master' Robert Speicher2016-05-111-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve documentation and web test for web hooks Tips and documentation of actual hook behavior. Improved user feedback when testing hooks via the web UI. See merge request !4015
| * | | | | | | Fix test failuresJacob Vosmaer2016-05-091-2/+2
| | | | | | | |
* | | | | | | | Merge branch '17249-starred' into 'master' Robert Speicher2016-05-112-12/+28
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restrict starred projects to viewable ones `User#starred_projects` doesn't perform any visibility checks. This has a couple of problems: 1. It assumes a user can always view all of their starred projects in perpetuity (project not changed to private, access revoked, etc.). 2. It assumes that we'll only ever allow a user to star a project they can view. This is currently the case, but bugs happen. Add `User#viewable_starred_projects` to filter the starred projects by those the user either has explicit access to, or are public or internal. Then use that in all places where we list the user's starred projects. Closes #17249. See merge request !4108
| * | | | | | | | Tidy up user project specsSean McGivern2016-05-111-13/+8
| | | | | | | | |
| * | | | | | | | Restrict starred projects to viewable onesSean McGivern2016-05-102-12/+33
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `User#starred_projects` doesn't perform any visibility checks. This has a couple of problems: 1. It assumes a user can always view all of their starred projects in perpetuity (project not changed to private, access revoked, etc.). 2. It assumes that we'll only ever allow a user to star a project they can view. This is currently the case, but bugs happen. Add `User#viewable_starred_projects` to filter the starred projects by those the user either has explicit access to, or are public or internal. Then use that in all places where we list the user's starred projects.
* | | | | | | | Merge branch '17270-only-generate-email-on-push-once-for-all-recipients' ↵Robert Speicher2016-05-113-45/+58
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Only generate repository push email once The repository push email can be very expensive to generate, especially with syntax-highlighted diffs. Instead of generating the email for each recipient, generate one email object and reset the Message-Id and To headers for each recipient. (Cloning would also be expensive in the case of large emails, although probably not as bad as generating from scratch.) Closes #17270. See merge request !4070
| * | | | | | | Only generate repository push email onceSean McGivern2016-05-113-45/+58
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The repository push email can be very expensive to generate, especially with syntax-highlighted diffs. Instead of generating the email for each recipient, generate one email object and reset the Message-Id and To headers for each recipient. (Cloning would also be expensive in the case of large emails, although probably not as bad as generating from scratch.)
* | | | | | | Merge branch 'stanhu/gitlab-ce-add-eager-load-lib' into 'master' Robert Speicher2016-05-101-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add eager load paths to help prevent dependency load issues with Sidekiq workers _Originally opened at !3545 by @stanhu._ - - - Relevant resources: - https://github.com/mperham/sidekiq/wiki/FAQ#why-doesnt-sidekiq-autoload-my-rails-application-code - https://github.com/mperham/sidekiq/issues/1281#issuecomment-27129904 - http://blog.arkency.com/2014/11/dont-forget-about-eager-load-when-extending-autoload - https://github.com/rails/rails/blob/52ce6ece8c8f74064bb64e0a0b1ddd83092718e1/railties/lib/rails/engine.rb#L472-L479 - https://github.com/rails/rails/blob/v4.2.6/railties/lib/rails/paths.rb Attempts to address #3661, #11896, #12769, #13521, #14131, #14589, #14759, #14825. See merge request !3724
| * | | | | | | Fix a few places where autoloading would failRémy Coutable2016-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix naming of API::CommitStatuses - Ensure we use require_dependency instead of require - Ensure the namespace is right in lib/api/api.rb, otherwise, we might require Grape::API::Helpers which defines the `#params` method. This is to avoid requiring a file multiple times and getting an "Already initialized constant" error. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | Fix an issue when filtering merge requests with more than one labelRémy Coutable2016-05-101-0/+137
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'fix/using-uploads-in-global-snippets' into 'master' Robert Speicher2016-05-101-0/+18
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix using link to uploads in global snippets Closes #17342, closes #17363 See merge request !4085
| * | | | | | Do not process upload links if no project contextGrzegorz Bizon2016-05-101-3/+3
| | | | | | |
| * | | | | | Fix using link to uploads in global snippetsGrzegorz Bizon2016-05-101-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #17342, closes #17363
* | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-05-1053-886/+220
|\ \ \ \ \ \ \