Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-07-28Ensure Gitlab::Application.routes.default_url_options are set correctly in ↵Rémy Coutable
Capybara + :js specs Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-07-28Merge branch 'backport-2844-ldap-ee-license-checks' into 'master'Douwe Maan
Backport some recent changes related to LDAP from EE See merge request !13119
2017-07-28Add remote IP, user ID and username to JSON lograge outputStan Hu
This makes the logs a bit more useful to search requests by users.
2017-07-27Merge branch 'backport-ee-2456' into 'master'Robert Speicher
Skip OAuth authorization for trusted applications See merge request !13061
2017-07-27Merge branch 'remove_custom_devise_failure_app' into 'master'Robert Speicher
Remove GitLab custom failure app for Devise See merge request !13136
2017-07-27Backport gitlab-ee!2456Oswaldo Ferreira
2017-07-27Merge branch 'feature/gpg-signed-commits' into 'master'Dmitriy Zaporozhets
GPG signed commits Closes #20268 See merge request !9546
2017-07-27Remove GitLab custom fealure app for deviseValery Sizov
2017-07-27Merge branch 'pawel/ensure_temp_files_are_deleted_in_fs_metrics-35457' into ↵Douwe Maan
'master' Ensure test files are deleted after fs metrics gathering run Closes #35457 See merge request !13080
2017-07-27use Module#prepend instead of alias_method_chainAlexis Reigel
2017-07-27mysql hack: set length for binary indexesAlexis Reigel
2017-07-27Backport some recent changes related to LDAP from EERubén Dávila
2017-07-27Support custom directory in gitlab:backup:create taskMarkus Koller
2017-07-27Merge branch '33601-add-csrf-token-verification-to-api' into 'master'Sean McGivern
Resolve "Add CSRF token verification to API" Closes #33601 See merge request !12154
2017-07-26Add warning about certificate verification on loadMichael Kozono
2017-07-26Move backwards compatibility logic out of the codeMichael Kozono
And closer to the configuration setup. The code doesn’t need to know about this.
2017-07-26Add LDAP config optionsMichael Kozono
2017-07-26Add `rescue false`.blackst0ne
2017-07-26Refactor CSRF protectionblackst0ne
2017-07-25Ensure test files are deleted after testsPawel Chojnacki
2017-07-25Merge branch 'add-instrumentation-to-link-to-gfm' into 'master'Sean McGivern
Adds link_to_gfm method instrumentation See merge request !13069
2017-07-25Adds link_to_gfm method instrumentationTiago Botelho
2017-07-25Resolve "More RESTful API: include resource URLs in responses"Oswaldo Ferreira
2017-07-20Standardize on ISO8601 UTC time for logrageStan Hu
2017-07-19Update Prometheus gem to version that explicitly calls `munmap`Paweł Chojnacki
2017-07-19Merge branch 'rc/bump-peek-performance_bar' into 'master'Sean McGivern
Bump peek-performance_bar to 1.3.0 and get rid of a monkey-patch See merge request !12939
2017-07-18Add structured logging for Rails processesStan Hu
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-18Bump peek-performance_bar to 1.3.0 and get rid of a monkey-patchRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-07-18Merge branch '34831-remove-coffee-rails-gem' into 'master'Jacob Schatz
Remove coffee-rails gem Closes #34831 See merge request !12715
2017-07-14Merge branch 'bjk/metric_names' into 'master'Douwe Maan
Update metric names to match Prometheus guidelines. Closes #35031 See merge request !12812
2017-07-14Instrument AbilitySean McGivern
2017-07-14Merge branch 'fixes-for-internal-auth-disabled' into 'master'Sean McGivern
Fixes needed when GitLab sign-in is not enabled See merge request !12491
2017-07-13Fixes needed when GitLab sign-in is not enabledRobin Bobbitt
When sign-in is disabled: - skip password expiration checks - prevent password reset requests - don’t show Password tab in User Settings - don’t allow login with username/password for Git over HTTP requests - render 404 on requests to Profiles::PasswordsController
2017-07-13Rename ConnectionRackMiddleware to RequestsRackMiddleware.Pawel Chojnacki
+ fix tests after metrics rename
2017-07-11Merge branch '33949-remove-healthcheck-access-token' into 'master'Sean McGivern
Remove the need to use health check token by adding ability to whitelist hosts Closes #33949 See merge request !12612
2017-07-11Support multiple Redis instances based on queue typePaul Charlton
2017-07-11Merge branch 'master' into 'catch-redis-address-error'DJ Mountney
# Conflicts: # lib/gitlab/current_settings.rb
2017-07-10Re-add Feature.register_feature_groups which is already documentedRémy Coutable
This is a follow-up for !12362 where this was documented but the code was removed in the last iteration. Since this can still be useful and this is already supported by the API, I think re-adding the code was the best course of action. Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-07-07Merge branch '20628-add-oauth-implicit-grant' into 'master'Douwe Maan
#20628 Enable implicit flow in Gitlab as OAuth Provider Closes #20628, #2716, and #19470 See merge request !12384
2017-07-07Remove .coffee ext files for i18nTakuya Noguchi
2017-07-07#20628 Enable implicit flow in Gitlab as OAuth ProviderMateusz Pytel
Closes #20628 by re-enabling implicit grant in Doorkeeper config. OAuth2 documentation refactored.
2017-07-07Remove option to disable Gitaly completelyJacob Vosmaer
2017-07-05Merge branch 'dm-project-path-helpers-try-2' into 'master'Sean McGivern
Create and use project path helpers that only need a project, no namespace See merge request !12566
2017-07-05Create and use project path helpers that only need a project, no namespaceDouwe Maan
2017-07-05Disable Flipper memoizer in tests to avoid transient failuresStan Hu
Closes #34278
2017-07-05Merge prometheus unicorn sampler settigns within monitoring settingsPawel Chojnacki
2017-07-05Add spaces between test phasesPawel Chojnacki
+ fix wrong test setup
2017-07-05correctly handle transforming settings into useful datastructurePawel Chojnacki
2017-07-05Remove the need to use health check tokenPawel Chojnacki
in favor of whitelist that will be used to control the access to monitoring resources
2017-07-04Instrument Unicorn with Ruby exporterPaweł Chojnacki