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
path: root/config
AgeCommit message (Collapse)Author
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-14Refactor user bundleMike Greiling
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 'sh-disabled-prepared-statements-in-test' into 'master'Yorick Peterse
Disabled prepared statements in test See merge request !12773
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-11Disabled prepared statements in testStan Hu
Some tests may test migrations and change the types of columns. If this happens, Rails may cache a statement that will cause PostgreSQL to fail with the message, "cached plan must not change result type": https://github.com/rails/rails/issues/12330 This happened in https://gitlab.com/gitlab-org/gitlab-ee/issues/2890#note_34636077.
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-10Revert "Merge branch 'update_bootsnap_1.1.1' into 'master'"Marin Jankovski
This reverts commit 83ec509ce43c56da601335de5b9ea4422c785560, reversing changes made to 57f0677ad854b7b17bd57e1e3b0ef542ce322b56.
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 'feature/user-datetime-search-api-mysql' into 'master'Douwe Maan
Add creation time filters to user search API for admins Closes #29507 See merge request !12682
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-07Merge branch 'dm-fix-project-path-helpers-production' into 'master'Douwe Maan
Include new URL helpers retroactively into includers of Gitlab::Routing Closes #34821 See merge request !12716
2017-07-07Merge branch '34737-authentiq-oauth-feature-spec' into 'master'Douwe Maan
Test logging in via the Authentiq OAuth provider in a feature spec Closes #34737 See merge request !12694
2017-07-07move CreatedAtFilter to concerns folderJames Lopez
2017-07-07Include new URL helpers retroactively into includers of Gitlab::RoutingDouwe Maan
2017-07-07Native group milestonesFelipe Artur
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-07Resolve "Inconsistent location of members page between groups and projects"Tim Zallmann
2017-07-07Merge branch 'feature/intermediate/12729-group-secret-variables' into 'master'Kamil Trzciński
Add Group secret variables Closes #12729 See merge request !12582
2017-07-07Merge branch 'gitaly-mandatory' into 'master'Sean McGivern
Remove option to disable Gitaly in Rails See merge request !12677
2017-07-07Remove option to disable Gitaly completelyJacob Vosmaer
2017-07-07Wrap additional routes by dash(-). And remove those routes from path_regex.rb.Shinya Maeda
2017-07-07Basic BE changeShinya Maeda
Fix static-snalysis Move the precedence of group secure variable before project secure variable. Allow project_id to be null. Separate Ci::VariableProject and Ci::VariableGroup Add the forgotton files Add migration file to update type of ci_variables Fix form_for fpr VariableProject Fix test Change the table structure according to the yorik advice Add necessary migration files. Remove unnecessary migration spec. Revert safe_model_attributes.yml Fix models Fix spec Avoid self.variable. Use becomes for correct routing. Use unique index on group_id and key Add null: false for t.timestamps Fix schema version Rename VariableProject and VariableGroup to ProjectVariable and GroupVariable Rename the rest of them Add the rest of files Basic BE change Fix static-snalysis Move the precedence of group secure variable before project secure variable. Allow project_id to be null. Separate Ci::VariableProject and Ci::VariableGroup Add the forgotton files Add migration file to update type of ci_variables Fix form_for fpr VariableProject Fix test Change the table structure according to the yorik advice Add necessary migration files. Remove unnecessary migration spec. Revert safe_model_attributes.yml Fix models Fix spec Avoid self.variable. Use becomes for correct routing. Use unique index on group_id and key Add null: false for t.timestamps Fix schema version Rename VariableProject and VariableGroup to ProjectVariable and GroupVariable Rename the rest of them Add the rest of files Implement CURD Rename codes related to VariableGroup and VariableProject FE part Remove unneccesary changes Make Fe code up-to-date Add protected flag to migration file Protected group variables essential package Update schema Improve doc Fix logic and spec for models Fix logic and spec for controllers Fix logic and spec for views(pre feature) Add feature spec Fixed bugs. placeholder. reveal button. doc. Add changelog Remove unnecessary comment godfat nice catches Improve secret_variables_for arctecture Fix spec Fix StaticAnlysys & path_regex spec Revert "Improve secret_variables_for arctecture" This reverts commit c3216ca212322ecf6ca534cb12ce75811a4e77f1. Use ayufan suggestion for secret_variables_for Use find instead of find_by Fix spec message for variable is invalid Fix spec remove variable.group_id = group.id godffat spec nitpicks Use include Gitlab::Routing.url_helpers for presenter spec
2017-07-07Test logging in via the Authentiq OAuth provider in a feature spec.Timothy Andrew
- The `migration:path-pg` build was previously failing when the Authentiq feature spec was enabled by placing Authentiq configuration in the `test` section of `gitlab.yml` - The `migration:path-pg` task checks out an old revision of the codebase (`v8.14.10`) and runs a `schema:load`. It then checks out the commit under test, and runs `db:migrate`, to verify that migrations run without errors. - The problem here is that `v8.14.10` does not have the Authentiq module installed, but is run with the `gitlab.yml` for `master`, which would contain the `Authentiq` configuration in the `test` section. - The solution was to use the `v8.14.10` `gitlab.yml` for the `schema:load`, rather than the `gitlab.yml` from master.
2017-07-07Merge branch 'fix-routes-in-production-mode' into 'master'Douwe Maan
Fix shorter route helpers in production environment Closes #34741 See merge request !12675
2017-07-06Improve & fix the performance bar UI and behaviorRémy Coutable
2017-07-06Just draw :legacy_buildsLin Jen-Shin
2017-07-06Merge branch '18000-remember-me-for-oauth-login' into 'master'Douwe Maan
Fix `migration:path` build for "Honor the 'Remember me' parameter for OAuth-based login" Closes #34713 See merge request !12668
2017-07-06Fix shorter route helpers in production environmentSean McGivern
I don't know exactly when Rails picks each module to use, but this seems to be used by `app` in the console (for instance, `app.project_path` would fail before, but works now).
2017-07-06Merge branch '34636-update-prometheus-metrics-library' into 'master'Tim Zallmann
Update Prometheus Metrics Library See merge request !12621
2017-07-06Remove Authentiq from the OAuth login integration tests.Timothy Andrew
- This is causing autoload-related errors in the `migration:path` builds. We need to find a better way of testing this provider.
2017-07-06Fix build for !11963.Timothy Andrew
- Don't use `request.env['omniauth.params']` if it isn't present. - Remove the `saml` section from the `gitlab.yml` test section. Some tests depend on this section not being initially present, so it can be overridden in the test. This MR doesn't add any tests for SAML, so we didn't really need this in the first place anyway. - Clean up the test -> omniauth section of `gitlab.yml`
2017-07-06Add Omniauth OAuth config to the test section of `gitlab.yml`Timothy Andrew
- I tried to get this to work by stubbing out portions of the config within the test. This didn't work as expected because Devise/Omniauth loaded before the stub could run, and the stubbed config was ignored. - I attempted to fix this by reloading Devise/Omniauth after stubbing the config. This successfully got Devise to load the stubbed providers, but failed while trying to access a route such as `user_gitlab_omniauth_authorize_path`. - I spent a while trying to figure this out (even trying `Rails.application.reload_routes!`), but nothing seemed to work. - I settled for adding this config directly to `gitlab.yml` rather than go down this path any further.
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-05Revert "Merge branch '18000-remember-me-for-oauth-login' into 'master'"Sean McGivern
This reverts merge request !11963
2017-07-05Disable Flipper memoizer in tests to avoid transient failuresStan Hu
Closes #34278
2017-07-05Merge branch '18000-remember-me-for-oauth-login' into 'master'Sean McGivern
Honor the "Remember me" parameter for OAuth-based login Closes #18000 See merge request !11963
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-05Bring back healthcheck token access to monitoring resources, but mark this ↵Pawel Chojnacki
as deprecated
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
2017-07-04Add NGINX metrics and other minor changesJoshua Lambert
2017-07-03Add ELB metricsJoshua Lambert