summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'feature/user-datetime-search-api-mysql' into 'master'Douwe Maan2017-07-071-1/+2
|\ | | | | | | | | | | | | Add creation time filters to user search API for admins Closes #29507 See merge request !12682
| * move CreatedAtFilter to concerns folderJames Lopez2017-07-071-1/+2
| |
* | Merge branch '20628-add-oauth-implicit-grant' into 'master'Douwe Maan2017-07-071-3/+1
|\ \ | | | | | | | | | | | | | | | | | | #20628 Enable implicit flow in Gitlab as OAuth Provider Closes #20628, #2716, and #19470 See merge request !12384
| * | #20628 Enable implicit flow in Gitlab as OAuth ProviderMateusz Pytel2017-07-071-3/+1
| | | | | | | | | | | | Closes #20628 by re-enabling implicit grant in Doorkeeper config. OAuth2 documentation refactored.
* | | Merge branch 'dm-fix-project-path-helpers-production' into 'master'Douwe Maan2017-07-071-10/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Include new URL helpers retroactively into includers of Gitlab::Routing Closes #34821 See merge request !12716
| * | | Include new URL helpers retroactively into includers of Gitlab::Routingdm-fix-project-path-helpers-productionDouwe Maan2017-07-071-10/+4
| | | |
* | | | Merge branch '34737-authentiq-oauth-feature-spec' into 'master'Douwe Maan2017-07-071-1/+4
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Test logging in via the Authentiq OAuth provider in a feature spec Closes #34737 See merge request !12694
| * | | Test logging in via the Authentiq OAuth provider in a feature spec.34737-authentiq-oauth-feature-specTimothy Andrew2017-07-071-1/+4
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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.
* | | Native group milestonesFelipe Artur2017-07-071-1/+1
| | |
* | | Resolve "Inconsistent location of members page between groups and projects"Tim Zallmann2017-07-071-1/+1
| | |
* | | Merge branch 'feature/intermediate/12729-group-secret-variables' into 'master'Kamil Trzciński2017-07-071-0/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add Group secret variables Closes #12729 See merge request !12582
| * | | Wrap additional routes by dash(-). And remove those routes from path_regex.rb.Shinya Maeda2017-07-071-4/+6
| | | |
| * | | Basic BE changeShinya Maeda2017-07-071-0/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge branch 'gitaly-mandatory' into 'master'Sean McGivern2017-07-073-10/+3
|\ \ \ | |/ / |/| | | | | | | | Remove option to disable Gitaly in Rails See merge request !12677
| * | Remove option to disable Gitaly completelyJacob Vosmaer2017-07-073-10/+3
| | |
* | | Merge branch 'fix-routes-in-production-mode' into 'master'Douwe Maan2017-07-061-1/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix shorter route helpers in production environment Closes #34741 See merge request !12675
| * | | Fix shorter route helpers in production environmentfix-routes-in-production-modeSean McGivern2017-07-061-1/+5
| |/ / | | | | | | | | | | | | | | | 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).
* | | Improve & fix the performance bar UI and behaviorRémy Coutable2017-07-062-2/+2
| | |
* | | Just draw :legacy_builds34702-draw-legacy-buildsLin Jen-Shin2017-07-062-2/+23
| | |
* | | Merge branch '18000-remember-me-for-oauth-login' into 'master'Douwe Maan2017-07-061-0/+43
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Fix `migration:path` build for "Honor the 'Remember me' parameter for OAuth-based login" Closes #34713 See merge request !12668
| * | Remove Authentiq from the OAuth login integration tests.Timothy Andrew2017-07-061-4/+0
| | | | | | | | | | | | | | | - This is causing autoload-related errors in the `migration:path` builds. We need to find a better way of testing this provider.
| * | Fix build for !11963.Timothy Andrew2017-07-061-22/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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`
| * | Add Omniauth OAuth config to the test section of `gitlab.yml`Timothy Andrew2017-07-061-0/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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.
* | | Merge branch '34636-update-prometheus-metrics-library' into 'master'Tim Zallmann2017-07-061-18/+68
|\ \ \ | | | | | | | | | | | | | | | | Update Prometheus Metrics Library See merge request !12621
| * | | Add NGINX metrics and other minor changes34636-update-prometheus-metrics-libraryJoshua Lambert2017-07-041-37/+53
| | | |
| * | | Add ELB metricsJoshua Lambert2017-07-031-2/+36
| |/ /
* | | Merge branch 'dm-project-path-helpers-try-2' into 'master'Sean McGivern2017-07-053-3/+23
|\ \ \ | | | | | | | | | | | | | | | | Create and use project path helpers that only need a project, no namespace See merge request !12566
| * | | Create and use project path helpers that only need a project, no namespaceDouwe Maan2017-07-053-3/+23
| | | |
| * | | Revert "Merge branch '18000-remember-me-for-oauth-login' into 'master'"revert-6df61942Sean McGivern2017-07-051-47/+0
| | | | | | | | | | | | This reverts merge request !11963
| * | | Merge branch '18000-remember-me-for-oauth-login' into 'master'Sean McGivern2017-07-051-0/+47
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Honor the "Remember me" parameter for OAuth-based login Closes #18000 See merge request !11963
| | * | | Fix build for !11963.Timothy Andrew2017-07-031-22/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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`
| | * | | Add Omniauth OAuth config to the test section of `gitlab.yml`Timothy Andrew2017-07-031-0/+66
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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.
* | | | Disable Flipper memoizer in tests to avoid transient failuressh-disable-flipper-midddlware-testsStan Hu2017-07-051-2/+4
|/ / / | | | | | | | | | Closes #34278
* | | Instrument Unicorn with Ruby exporterPaweł Chojnacki2017-07-043-1/+18
|/ /
* | Merge branch 'enable-webpack-code-splitting' into 'master'Jacob Schatz2017-06-301-2/+2
|\ \ | | | | | | | | | | | | | | | | | | Enable webpack code splitting Closes #32989 See merge request !12032
| * | move webpack publicPath setup earlier in the bootstrap processes to avoid ES ↵Mike Greiling2017-06-281-1/+2
| | | | | | | | | | | | module execution order issues
| * | dynamically set webpack publicPath when relative_url_root enabledMike Greiling2017-06-281-1/+0
| | |
* | | Merge branch 'dm-merge-request-creations-controller' into 'master'Sean McGivern2017-06-291-12/+44
|\ \ \ | | | | | | | | | | | | | | | | Split up MergeRequestsController See merge request !12150
| * | | Split up MergeRequestsControllerdm-merge-request-creations-controllerDouwe Maan2017-06-281-12/+44
| | | |
* | | | Merge branch 'shell-test-rebuild' into 'master'Robert Speicher2017-06-281-4/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Reinstall shell on the test env if it's outdated See merge request !12285
| * | | | Reinstall shell on the test env if it's outdatedshell-test-rebuildAlejandro Rodríguez2017-06-191-4/+6
| | | | |
* | | | | Merge branch 'cherry-pick-5ea675be' into 'master'Tim Zallmann2017-06-281-0/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | Merge branch 'additional-metrics-dashboard' into '28717-additional-metrics-review-branch' See merge request !12454
| * | | | Merge branch 'additional-metrics-dashboard' into ↵Phil Hughes2017-06-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '28717-additional-metrics-review-branch' Additional metrics dashboard See merge request !11740
* | | | | Resolve "Navigation - Move contextual navigation to sidebar"Annabel Dunstone Gray2017-06-281-0/+1
| |_|/ / |/| | |
* | | | Merge branch 'update_bootsnap_1.1.1' into 'master'Robert Speicher2017-06-271-0/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump bootsnap to 1.1.1 Closes #34084 See merge request !12425
| * | | | Bump bootsnap to 1.1.1blackst0ne2017-06-271-0/+6
| | | | |
* | | | | Merge branch 'master' into experimental-top-navPhil Hughes2017-06-239-28/+137
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'hot-reload' into 'master'Tim Zallmann2017-06-231-0/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hot reloading for .vue files Closes #33729 See merge request !12180
| | * | | | hot reloading for .vue fileshot-reloadSimon Knox2017-06-151-0/+4
| | | | | |
| * | | | | Merge branch '31574-bootstrap-form-builder' into 'master'Phil Hughes2017-06-231-0/+7
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | Add bootstrap_form gem See merge request !10985
View Lorry Controller Status