Commit Graph
5162 Commits
Author SHA1 Message Date
Kamil Trzcinski 284dc3285a Fix abilities 2016-05-14 14:22:10 -05:00
Kamil Trzcinski 9496f7a71a Merge branch 'docker-registry' into docker-registry-view 2016-05-14 11:16:21 -05:00
Kamil Trzcinski 0a9979d9ef Rename specs 2016-05-14 11:16:11 -05:00
Kamil Trzcinski 654d5ad3f4 Merge branch 'docker-registry' into docker-registry-view 2016-05-14 11:15:33 -05:00
Kamil Trzcinski 63cdf1aeb0 Use Auth::ContainerRegistryAuthenticationService 2016-05-14 11:11:48 -05:00
Kamil Trzcinski 774a510782 Fix specs 2016-05-14 09:39:33 -05:00
Kamil Trzcinski f4f59d0f13 Merge branch 'docker-registry' into docker-registry-view 2016-05-13 17:15:01 -05:00
Kamil Trzcinski 0958f331d1 Merge remote-tracking branch 'origin/master' into docker-registry
# Conflicts:
#	config/initializers/1_settings.rb
2016-05-13 17:14:46 -05:00
Kamil Trzcinski 692b5e0b47 Merge branch 'docker-registry' into docker-registry-view
# Conflicts:
#	app/controllers/jwt_controller.rb
#	app/services/jwt/container_registry_authentication_service.rb
2016-05-13 16:43:49 -05:00
Kamil Trzcinski 9e318bd99d Fix container registry permissions 2016-05-13 12:20:23 -05:00
Gabriel Mazetto f5a0ac0fc1 Codestyle: make sure we have space around operators 2016-05-13 04:46:56 -03:00
Douwe Maan 6aef256733 Merge branch 'fix_health_check_type' into 'master'
Fix minor typos in admin health check page

Fix minor typos from gitlab-org/gitlab-ce!3888

cc/ @DouweM @twk3 

See merge request !4134
2016-05-12 23:03:36 +00:00
Douwe Maan d2fb451c8f Merge branch 'rs-cleanup-events_helper_spec' into 'master'
Clean up EventsHelper spec

Extracted from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4090

See merge request !4133
2016-05-12 22:41:19 +00:00
Robert Speicher 4735a75340 Merge branch 'deprecated-class-methods-cop' into 'master'
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
2016-05-12 22:41:01 +00:00
Drew Blessing 4fea5cda0b Fix minor typos in admin health check page 2016-05-12 17:11:37 -05:00
Robert Speicher 5186f6e3bd Merge branch 'default-scope-on-builds-page' into 'master'
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
2016-05-12 22:01:40 +00:00
Robert Speicher 05bbad5817 Clean up EventsHelper spec 2016-05-12 16:52:56 -05:00
Douwe Maan 850234ebd2 Merge branch 'feature/label-subscription-api' into 'master'
Add API endpoints for un/subscribing from/to a label



See merge request !4051
2016-05-12 21:51:21 +00:00
Douwe Maan 7fc51d1908 Merge branch 'health-check-route'
# Conflicts:
#	db/schema.rb
2016-05-12 16:39:03 -05:00
Ahmad Sherif 0c22698bd4 Add API endpoints for un/subscribing from/to a label
Closes #15638
2016-05-12 22:48:09 +02:00
Douwe Maan 74c69709dc Merge branch 'otzy007/gitlab-ce-disable_oauth_sign_in_sources' 2016-05-12 15:11:37 -05:00
Kamil Trzcinski 5c2f2fd289 Fix CI tests 2016-05-12 13:03:04 -05:00
Kamil Trzcinski 4d84ba43d8 Merge branch 'docker-registry' into docker-registry-view 2016-05-12 12:48:41 -05:00
Kamil Trzcinski fc2d985bfa Fix CI tests 2016-05-12 12:47:55 -05:00
Jacob Schatz f2303f9df0 Merge branch 'send-incremental-build-log' into 'master'
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
2016-05-12 16:48:42 +00:00
Takuya Noguchi 18fdbf0a03 Fix a description for default scope on builds 2016-05-13 01:28:55 +09:00
Yorick Peterse 945c5b3fe6 Removed tracking of total method execution times
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
2016-05-12 15:15:45 +02:00
Andrei Gliga 96122034cf more readable specs for enabled_button_based_providers and button_based_providers_enabled? 2016-05-12 13:44:46 +03:00
Andrei Gliga 038dbb6803 DRYing enabled_button_based_providers tests 2016-05-12 13:44:46 +03:00
Andrei Gliga 3922e7ee22 enabled_button_based_providers into their own describe section 2016-05-12 13:44:46 +03:00
Andrei Gliga fc88527c9e use stub_application_setting instead 2016-05-12 13:44:46 +03:00
Andrei Gliga 2e4c914ae8 between "" 2016-05-12 13:44:46 +03:00
Andrei Gliga deca3da1a7 stub Devise.omniauth_providers to return GitHub even if the gitlab.yml has no omniauth provider enabled
This will fix failing tests in case gitlab.yml file has no omniauth providers enabled
2016-05-12 13:44:46 +03:00
Andrei Gliga 6f69f6a1ab tests for button_based_providers_enabled? helper method of AuthHelper 2016-05-12 13:44:46 +03:00
Andrei Gliga 8c2b72b1c8 tests for enabled_button_based_providers helper method of AuthHelper 2016-05-12 13:44:46 +03:00
Andrei Gliga 47ee5125e8 validate disabled_oauth_sign_in_sources in ApplicationSe 2016-05-12 13:44:46 +03:00
Timothy Andrew a4ee7d25e3 Implement @rymai's feedback after review.
- Separate 'exercise' and 'verify' steps of tests.
- Use `build_stubbed` instead of `build`
2016-05-12 07:17:07 +05:30
Timothy Andrew a59ad3936a Add a spec for WikiLinkFilter
- And fix behavior for non-file hierarchical links.
2016-05-12 07:17:07 +05:30
DJ Mountney c8f23bd2ed Support token header for health check token, and general cleanup of the health_check feature. 2016-05-11 17:27:08 -07:00
Douwe Maan f2251273b9 Merge branch 'issue_15572_snippets_tab_under_user_profile' into 'master'
Add snippet tab under user profile

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15572

See merge request !4001
2016-05-11 22:04:25 +00:00
Robert Speicher d8415389de Merge branch 'hook-docs-behavior' into 'master'
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
2016-05-11 16:34:00 +00:00
Robert Speicher 24f353edc4 Merge branch '17249-starred' into 'master'
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
2016-05-11 12:49:29 +00:00
Robert Speicher d526cda502 Merge branch '17270-only-generate-email-on-push-once-for-all-recipients' 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
2016-05-11 12:45:39 +00:00
Sean McGivern 5f27e26bb4 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.)
2016-05-11 09:16:01 +01:00
Sean McGivern acd8930c46 Tidy up user project specs 2016-05-11 09:03:23 +01:00
Long Nguyen a22d559d27 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into issue_15572_snippets_tab_under_user_profile 2016-05-11 09:14:56 +07:00
DJ Mountney 0e0caf4d17 Add tests for the health check feature 2016-05-10 16:19:16 -07:00
Robert Speicher 971662e6a4 Merge branch 'stanhu/gitlab-ce-add-eager-load-lib' into 'master'
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
2016-05-10 20:14:40 +00:00
Kamil Trzcinski db25c17036 Merge remote-tracking branch 'origin/master' into send-incremental-build-log 2016-05-10 13:58:10 -05:00
Sean McGivern 97424ea544 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.
2016-05-10 18:13:52 +01:00