a037a79130
Setup repositories settings properly
2017-08-17 16:00:07 -07:00
1c3a2bc389
Setup LDAP settings properly
2017-08-17 16:00:07 -07:00
ec34b2d051
Merge branch 'dm-gpg-signature-performance' into 'master'
...
Only create commit GPG signature when necessary
See merge request !13561
2017-08-16 18:34:55 +00:00
ba7251fefd
Only create commit GPG signature when necessary
2017-08-16 18:57:50 +02:00
4e0ee10a72
Merge branch 'bvl-circuitbreaker-settings-to-avoid-failures' into 'master'
...
Circuitbreaker settings to avoid spec-failures
Closes #36324
See merge request !13519
2017-08-16 13:38:00 +00:00
ee603a0089
Allow a `failure_wait_time` of 0 for storage access
...
This allows testing every storage attempt after a failure. Which could
be useful for tests
2017-08-16 14:15:50 +02:00
fcce6c3168
Merge branch 'rs-more-public-send-whitelists' into 'master'
...
Whitelist or fix additional `Gitlab/PublicSend` cop violations
See merge request !13467
2017-08-16 11:25:26 +00:00
7b68bdce15
Merge branch 'rs-trailingwhitespace-cop' into 'master'
...
Enable Layout/TrailingWhitespace cop and auto-correct offenses
See merge request !13573
2017-08-16 10:27:46 +00:00
4edfad9678
Enable Layout/TrailingWhitespace cop and auto-correct offenses
2017-08-15 13:44:37 -04:00
d6515aa3e4
Make sure MySQL would not use CURRENT_TIMESTAMP
...
for timestamp columns magically. See:
https://gitlab.com/gitlab-org/gitlab-ce/issues/36405
2017-08-15 19:07:28 +08:00
260c8da060
Whitelist or fix additional `Gitlab/PublicSend` cop violations
...
An upcoming update to rubocop-gitlab-security added additional
violations.
2017-08-14 12:14:11 -04:00
c946ee1282
Enable the Layout/SpaceBeforeBlockBraces cop
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-08-09 11:52:22 +02:00
9770c57fab
Re-enable SqlInjection and CommandInjection
2017-08-08 10:50:54 -04:00
fd40bce9cc
Merge branch '31207-clean-locked-merge-requests' into 'master'
...
Resolve "Store MergeWorker JID on merge request, and clean up stuck merges"
Closes #31207
See merge request !13207
2017-08-08 01:47:48 +00:00
0640b3d1d8
Store MergeWorker JID on merge request, and clean up stuck merges
2017-08-07 15:23:37 -03:00
746f0ec367
Add sidekiq metrics endpoint and add http server to sidekiq
2017-08-07 17:13:02 +00:00
3899d07f9e
Move hostname to Gitlab::Environment
2017-08-04 15:38:49 +02:00
3598e60bf2
Add a Circuitbreaker for storage paths
2017-08-04 15:38:48 +02:00
60797a42b4
Ensure Gitlab::Application.routes.default_url_options are set correctly in Capybara + :js specs
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-07-28 16:33:30 +02:00
da3100254f
Merge branch 'backport-2844-ldap-ee-license-checks' into 'master'
...
Backport some recent changes related to LDAP from EE
See merge request !13119
2017-07-28 09:13:50 +00:00
9bc176b2c3
Add remote IP, user ID and username to JSON lograge output
...
This makes the logs a bit more useful to search requests by users.
2017-07-28 00:48:03 -05:00
86ae883b63
Merge branch 'backport-ee-2456' into 'master'
...
Skip OAuth authorization for trusted applications
See merge request !13061
2017-07-27 17:41:40 +00:00
066f4d8b71
Merge branch 'remove_custom_devise_failure_app' into 'master'
...
Remove GitLab custom failure app for Devise
See merge request !13136
2017-07-27 16:22:52 +00:00
e561b142fa
Backport gitlab-ee!2456
2017-07-27 12:09:46 -04:00
ac0cbe6970
Merge branch 'feature/gpg-signed-commits' into 'master'
...
GPG signed commits
Closes #20268
See merge request !9546
2017-07-27 15:29:39 +00:00
3d83181b81
Remove GitLab custom fealure app for devise
2017-07-27 18:14:09 +03:00
842bcfa777
Merge branch 'pawel/ensure_temp_files_are_deleted_in_fs_metrics-35457' into 'master'
...
Ensure test files are deleted after fs metrics gathering run
Closes #35457
See merge request !13080
2017-07-27 14:45:02 +00:00
07dbd5649a
use Module#prepend instead of alias_method_chain
2017-07-27 15:46:03 +02:00
ce4e0837c4
mysql hack: set length for binary indexes
2017-07-27 15:46:03 +02:00
ef97cb54ae
Backport some recent changes related to LDAP from EE
2017-07-27 08:45:16 -05:00
d27dec80ce
Support custom directory in gitlab:backup:create task
2017-07-27 13:24:19 +02:00
ef50875d3a
Merge branch '33601-add-csrf-token-verification-to-api' into 'master'
...
Resolve "Add CSRF token verification to API"
Closes #33601
See merge request !12154
2017-07-27 10:20:52 +00:00
71c36c5bb4
Add warning about certificate verification on load
2017-07-26 02:43:37 -07:00
72d8b1e40a
Move backwards compatibility logic out of the code
...
And closer to the configuration setup. The code doesn’t need to know about this.
2017-07-26 02:43:36 -07:00
6dbff9663d
Add LDAP config options
2017-07-26 02:43:32 -07:00
cc3a82bc8b
Add `rescue false`.
2017-07-26 11:05:44 +02:00
8ce8b21f67
Refactor CSRF protection
2017-07-26 11:05:44 +02:00
2286879583
Ensure test files are deleted after tests
2017-07-25 14:19:09 +02:00
bd13978c71
Merge branch 'add-instrumentation-to-link-to-gfm' into 'master'
...
Adds link_to_gfm method instrumentation
See merge request !13069
2017-07-25 11:12:36 +00:00
4236c2f055
Adds link_to_gfm method instrumentation
2017-07-25 10:51:21 +01:00
33dc5171e5
Resolve "More RESTful API: include resource URLs in responses"
2017-07-25 09:35:45 +00:00
68529f4f80
Standardize on ISO8601 UTC time for lograge
2017-07-20 07:58:01 -07:00
2c3d52161a
Update Prometheus gem to version that explicitly calls `munmap`
2017-07-19 08:54:39 +00:00
1c7893c5c1
Merge branch 'rc/bump-peek-performance_bar' into 'master'
...
Bump peek-performance_bar to 1.3.0 and get rid of a monkey-patch
See merge request !12939
2017-07-19 08:52:01 +00:00
e2b1c16ade
Add structured logging for Rails processes
...
This introduces JSON logging for Rails views saved to a file called
`development_json.log`, `production_json.log`, etc.
For example, instead of this unparsable log:
```
Started GET "/" for 127.0.0.1 at 2012-03-10 14:28:14 +0100
Processing by HomeController#index as HTML
Rendered text template within layouts/application (0.0ms)
Rendered layouts/_assets.html.erb (2.0ms)
Rendered layouts/_top.html.erb (2.6ms)
Rendered layouts/_about.html.erb (0.3ms)
Rendered layouts/_google_analytics.html.erb (0.4ms)
Completed 200 OK in 79ms (Views: 78.8ms | ActiveRecord: 0.0ms)
```
We get a single line with this:
```
{"method":"GET","path":"/,"format":"html","controller":"HomeController","action":"index","status":200,"duration":79,"view":78.8,"db":0.0,"location":"http://localhost/ ","time":"2017-07-18 09:35:17 -0700"}
```
Part of #20060
2017-07-18 09:49:21 -07:00
66c7f51897
Bump peek-performance_bar to 1.3.0 and get rid of a monkey-patch
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-07-18 13:56:36 +02:00
901319fc69
Merge branch '34831-remove-coffee-rails-gem' into 'master'
...
Remove coffee-rails gem
Closes #34831
See merge request !12715
2017-07-17 21:18:55 +00:00
be08202b4b
Merge branch 'bjk/metric_names' into 'master'
...
Update metric names to match Prometheus guidelines.
Closes #35031
See merge request !12812
2017-07-14 18:05:18 +00:00
a5b8d4bcea
Instrument Ability
2017-07-14 10:46:49 +01:00
1afdbe320e
Merge branch 'fixes-for-internal-auth-disabled' into 'master'
...
Fixes needed when GitLab sign-in is not enabled
See merge request !12491
2017-07-14 08:49:36 +00:00
Michael Kozono
Robert Speicher
Douwe Maan
Rémy Coutable
Bob Van Landuyt
Robert Speicher
Lin Jen-Shin
Brian Neel
Stan Hu
Oswaldo Ferreira
Paweł Chojnacki
Bob Van Landuyt
Douwe Maan
Dmitriy Zaporozhets
Valery Sizov
Alexis Reigel
Rubén Dávila
Markus Koller
Sean McGivern
blackst0ne
Tiago Botelho
Jacob Schatz
Sean McGivern