Commit Graph
1640 Commits
Author SHA1 Message Date
Yorick Peterse b933367ab3 Instrument all Grape API helpers 2016-05-17 00:16:49 +02:00
Kamil Trzcinski 7257703388 Bring back port to registry configuration 2016-05-16 09:45:18 -05:00
Kamil Trzcinski 4f1e0014a7 Simplify registry configuration 2016-05-14 14:03:41 -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
Gabriel Mazetto 8d58e691c6 remove extra space to fix codestyle 2016-05-13 04:51:13 -03:00
Gabriel Mazetto f5a0ac0fc1 Codestyle: make sure we have space around operators 2016-05-13 04:46:56 -03: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
Douwe Maan 7fc51d1908 Merge branch 'health-check-route'
# Conflicts:
#	db/schema.rb
2016-05-12 16:39:03 -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
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
Rémy Coutable 941301339d Remove Rails monkey-patches now that we're using Rails 4.2.6
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-05-11 12:32:48 +02: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
Kamil Trzcinski db25c17036 Merge remote-tracking branch 'origin/master' into send-incremental-build-log 2016-05-10 13:58:10 -05:00
DJ Mountney 160ef66d1b Add health_check access token, and enforce on the health_check endpoint
Also added a health check page to the admin section for resetting the token.
2016-05-10 08:46:02 -07:00
DJ Mountney 9898f9b4e6 Set the standard health_check options to include the cache check. 2016-05-10 08:24:09 -07:00
DJ Mountney 67dc3b9c11 Add the health_check gem end expose the health_check route 2016-05-10 08:24:09 -07:00
Rémy Coutable 5589dcf8db Fix a few places where autoloading would fail
- 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>
2016-05-10 11:51:19 +02:00
Stan HuandRémy Coutable 6da3388569 Add eager load paths to help prevent dependency load issues with Sidekiq workers
Attempts to address #13521, #14825

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-05-10 11:51:19 +02:00
Long Nguyen dd1ad6bf3e Code improve 2016-05-10 09:56:12 +07:00
Kamil Trzcinski 1dea54c220 Remove unused parts 2016-05-09 20:35:01 +03:00
Kamil Trzcinski 0094d8f196 Rename images to container_registry 2016-05-09 20:29:57 +03:00
Kamil Trzcinski 51a8811e26 Revert "Eager load lib/api"
This reverts commit 0a280158ef.
2016-05-09 20:26:14 +03:00
Kamil Trzcinski 71da2e0b56 Merge remote-tracking branch 'origin/master' into docker-registry 2016-05-09 20:21:02 +03:00
Kamil Trzcinski baef6728fa Send trace to a browser incrementally when build is running
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.
2016-05-09 19:59:45 +03:00
Dmitriy Zaporozhets 90ae445ba9 Merge branch 'rs-remove-wall_enabled' into 'master'
Remove `wall_enabled` field from Project



See merge request !4089
2016-05-09 10:02:59 +00:00
Rémy Coutable 7d95d3cde7 Merge branch 'trusted-proxies-ip-addr' into 'master'
Pass trusted_proxies to action_dispatch as IPAddrs instead of strings

Without this setting your own trusted_proxies does not work.

Fixes an issue introduce in: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3524

Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/17004

See merge request !3970
2016-05-09 09:47:16 +00:00
Connor Shea 9cc0937b3a 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.
2016-05-08 15:33:34 -06:00
Robert Speicher 0e29653f51 Remove wall_enabled field from Project 2016-05-08 15:47:42 -04:00
Long Nguyen 29089352e3 Routing refactoring 2016-05-08 20:48:07 +07:00
Long Nguyen ff21f999ae Fix routing error 2016-05-08 15:29:51 +07:00
Long Nguyen ffda8a1a0e user routings refactor 2016-05-08 15:27:33 +07:00
Long Nguyen 5f60841d7e Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into issue_15572_snippets_tab_under_user_profile 2016-05-05 15:07:50 +07:00
Artem Sidorenko fb5682e7cd Use the new admin settings for gravatar 2016-05-04 17:45:29 +02:00
Yorick Peterse 917c26ced7 Merge branch 'add-instrumentation-for-15137' into 'master'
Instrument methods used in email diffs

See merge request !4038
2016-05-04 14:25:28 +00:00
Sean McGivern f660b2173e Instrument methods used in email diffs
Make all of the nested constant instrumentation for core app code work
the same way, add mailer instrumentation, and add instrumentation to the
premailer gem.
2016-05-04 14:20:48 +01:00
Connor Shea 3004386b55 Revert "Remove the Devise Async gem."
This reverts commit 1cc614f2bd.

It was causing the ActiveJob integration to fail, so unfortunately we'll have to add the gem again.
2016-05-03 15:43:51 -06:00
Robert Speicher c9bc3d20ef Merge remote-tracking branch 'dev/master' into 'master' 2016-05-02 19:58:54 -04:00
Jacob Vosmaer dc0ff9a174 Fix "remember me" sign in option 2016-05-02 17:22:03 +02:00
Kamil Trzcinski 105017c308 Added JWT controller 2016-05-02 13:29:17 +02:00
Long Nguyen c0f02aad4a Add snippet tab under user profile 2016-05-02 16:37:12 +07:00
Robert Speicher 40c38644a8 Merge branch 'add-parameters' into 'master'
Add more parameters to the filter_parameters config.

Adds Sentry DSN, Webhooks, Deploy Keys, etc.

Alphabetized the parameters and included line breaks between each parameter. Easier to merge into EE if there are any differences.

This also seems to be the more popular syntax for adding new parameters, from what I can find.

In the future we may want to [increase the specificity of some of these](http://blog.bigbinary.com/2016/03/07/parameter-filtering-enhacement-rails-5.html) once Rails 5 is out. e.g. instead of `:hook`, `"hook.url"` would be just as effective without removing potentially useful information from the logs.

cc: @stanhu 

See merge request !3971
2016-04-30 01:48:05 +00:00
Connor Shea 8d3debe4cc Add more parameters to the filter_parameters config.
Adds Sentry DSN, Webhooks, Deploy Keys, etc.

Alphabetized the parameters and included line breaks between each parameter. Easier to merge into EE if there are any differences.

This also seems to be the more popular syntax for adding new parameters, from what I can find.
2016-04-29 18:44:49 -06:00
Robert Speicher ccd3f70765 Merge branch 'sentry-filter' into 'master'
Prevent Rails filtered parameters from leaking to Sentry.

As described in their Docs: https://docs.getsentry.com/on-premise/clients/ruby/integrations/rails/

See merge request !3974
2016-04-29 18:10:53 +00:00
Timothy AndrewandKamil Trzcinski 0a280158ef Eager load lib/api
- So that the server doesn't have to be restarted for every change in dev.
2016-04-29 16:50:07 +02:00
Kamil Trzcinski 72611f9cfa Auth token 2016-04-29 16:45:00 +02:00
Kamil Trzcinski f41a3e24d2 Added authentication service for docker registry 2016-04-29 16:45:00 +02:00
Connor Shea 519a791ef9 Prevent Rails filtered parameters from leaking to Sentry.
As described in their Docs: https://docs.getsentry.com/on-premise/clients/ruby/integrations/rails/
2016-04-28 15:08:23 -06:00
Yorick PeterseandJacob Schatz 0426647069 Load the "New Branch" button asynchronously
This button depends on Issue#can_be_worked_on? which in turn depends on
Issue#related_branches. By rendering this button asynchronously we can
finally remove all usages of Issue#related_branches and
Issue#referenced_merge_requests from the issues "show" page.
2016-04-28 16:13:48 -04:00