summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Re-enable polling for environmentsenable-polling-envFilipa Lacerda2017-07-063-4/+8
|
* Merge branch 'revert-018f7e46' into 'master'Phil Hughes2017-07-062-56/+19
|\ | | | | | | | | Revert "Merge branch 'winh-mr-widget-no-pipeline' into 'master'" See merge request !12674
| * Revert "Merge branch 'winh-mr-widget-no-pipeline' into 'master'"revert-018f7e46Kamil Trzciński2017-07-062-56/+19
| | | | | | This reverts merge request !12127
* | Merge branch '34716-environment-specific-variables-ce' into 'master'Douwe Maan2017-07-0612-35/+140
|\ \ | | | | | | | | | | | | | | | | | | Backports for ee-2112 Closes #34716 See merge request !12671
| * | Backports for ee-2112Lin Jen-Shin2017-07-0612-35/+140
| | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2112
* | | Merge branch ↵Douwe Maan2017-07-062-1/+41
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | '34172_add_traditional_chinese_in_taiwan_translations_of_commits_page' into 'master' Add Traditional Chinese in Taiwan translations of Commits Page See merge request !12407
| * | | Synchronous discussion in the translationHuang Tao2017-07-061-6/+6
| | | |
| * | | synchronize changes in community translation of msgid黄涛2017-07-051-1/+1
| | | |
| * | | Add Traditional Chinese in Taiwan translations of Commits Page黄涛2017-07-052-53/+37
| | | |
| * | | Merge branch ↵黄涛2017-07-050-0/+0
| |\ \ \ | | | | | | | | | | | | | | | '34172_add_traditional_chinese_in_taiwan_translations_of_commits_page' of gitlab.com:htve/gitlab-ce into 34172_add_traditional_chinese_in_taiwan_translations_of_commits_page
| | * | | add changelog黄涛2017-06-231-0/+4
| | | | | | | | | | | | | | | | | | | | [skip ci]
| | * | | Add Traditional Chinese in Taiwan translations of Commits Page黄涛2017-06-231-0/+52
| | | | | | | | | | | | | | | | | | | | [skip ci]
| * | | | add changelog黄涛2017-07-051-0/+4
| | | | | | | | | | | | | | | | | | | | [skip ci]
| * | | | Add Traditional Chinese in Taiwan translations of Commits Page黄涛2017-07-051-0/+52
| | | | | | | | | | | | | | | | | | | | [skip ci]
* | | | | Merge branch '33360-generate-kubeconfig' into 'master'Kamil Trzciński2017-07-068-16/+150
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generate KUBECONFIG in KubernetesService#predefined_variables Closes #33360 See merge request !12223
| * | | | | Encode certificate-authority-data in base64Lin Jen-Shin2017-07-063-6/+15
| | | | | |
| * | | | | Rename KUBECONFIG_FILE to KUBECONFIGLin Jen-Shin2017-07-064-4/+4
| | | | | |
| * | | | | Merge remote-tracking branch 'upstream/master' into 33360-generate-kubeconfigLin Jen-Shin2017-07-062359-20554/+43844
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (888 commits) Fix Rubocop offense Use a previous approach for cycle analytics dummy pipeline Allow admin to disable all restricted visibility levels Removes file_name_regex from Gitlab::Regex Remove IIFEs around several javascript classes Update CHANGELOG.md for 9.3.5 Add ProjectPathHelper cop Create and use project path helpers that only need a project, no namespace Handles realtime with 2 states for environments table Revert "Merge branch '18000-remember-me-for-oauth-login' into 'master'" Allow creation of files and directories with spaces in web UI Disable Flipper memoizer in tests to avoid transient failures Introduce cache policies for CI jobs fix sidebar padding for full-width items (Time Tracking help) Replace 'snippets/snippets.feature' spinach with rspec Rename ci_config_file to ci_config_path Add back Pipeline#ci_yaml_file_path due to all the troubles Revert change to design. Go back to scrollable page Fix cycle analytics tests by making pipeline valid Fixes the column widths for the new navigation options in settings ...
| * | | | | | Fix rubocop offense33360-generate-kubeconfigLin Jen-Shin2017-06-161-4/+4
| | | | | | |
| * | | | | | Changelog entry, doc, and only pass KUBECONFIG_FILELin Jen-Shin2017-06-164-3/+6
| | | | | | |
| * | | | | | Generate KUBECONFIG in KubernetesService#predefined_variablesLin Jen-Shin2017-06-166-16/+138
| | | | | | |
* | | | | | | Merge branch '18000-remember-me-for-oauth-login' into 'master'Douwe Maan2017-07-0612-4/+254
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-062-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - This is causing autoload-related errors in the `migration:path` builds. We need to find a better way of testing this provider.
| * | | | | | | Add Jasmine tests for `OAuthRememberMe`Timothy Andrew2017-07-062-0/+31
| | | | | | | |
| * | | | | | | Fix build for !11963.Timothy Andrew2017-07-063-24/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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`
| * | | | | | | Implement review comments for !11963 from @filipa.Timothy Andrew2017-07-062-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Disable an ESLint check rather than work around it (by converting `OAuthRememberMe` from a regular class to a static class. - Scope `$` calls inside `OAuthRememberMe`
| * | | | | | | Implement review comments for !11963 from @adamniedzielski.Timothy Andrew2017-07-065-19/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Change double quotes to single quotes. - Why is `OmniAuth.config.full_host` being reassigned in the integration test? - Use `map` over `map!` to avoid `dup` in the `gitlab:info` rake task - Other minor changes
| * | | | | | | Don't allow the `gitlab:env:info` rake task to mutate the list of omniauth ↵Timothy Andrew2017-07-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | providers. - The test for `rake gitlab:env:info` executed the rake task, which mutated the list of omniauth providers, breaking subsequent tests relying on this list. - I've changed the rake task to duplicate the providers list before modifying it.
| * | | | | | | Add CHANGELOG entry for CE MR 11963Timothy Andrew2017-07-061-0/+4
| | | | | | | |
| * | | | | | | Get ESLint spec passing for the `OAuthRememberMe` class.Timothy Andrew2017-07-061-6/+6
| | | | | | | |
| * | | | | | | Add Omniauth OAuth config to the test section of `gitlab.yml`Timothy Andrew2017-07-062-51/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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.
| * | | | | | | Add more providers to the OAuth login integration tests.Timothy Andrew2017-07-061-2/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added saml, authentiq, cas3, and auth0 - Crowd seems to be a special case that will be handled separately.
| * | | | | | | Move OAuth "remember me" javascript logic into a class.Timothy Andrew2017-07-063-14/+33
| | | | | | | |
| * | | | | | | Test the "Remember Me" flow for OAuth-based login.Timothy Andrew2017-07-063-3/+68
| | | | | | | |
| * | | | | | | Add integration tests around OAuth login.Timothy Andrew2017-07-063-1/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - There was previously a test for `saml` login in `login_spec`, but this didn't seem to be passing. A lot of things didn't seem right here, and I suspect that this test hasn't been running. I'll investigate this further. - It took almost a whole working day to figure out this line: OmniAuth.config.full_host = ->(request) { request['REQUEST_URI'].sub(request['REQUEST_PATH'], '') } As always, it's obvious in retrospect, but it took some digging to figure out tests were failing and returning 404s during the callback phase. - Test all OAuth providers - github, twitter, bitbucket, gitlab, google, and facebook
| * | | | | | | Implement "remember me" for OAuth-based login.Timothy Andrew2017-07-062-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Pass a `remember_me` query parameter along with the initial OAuth request, and pick this parameter up during the omniauth callback from request.env['omniauth.params']`. - For 2FA-based login, copy the `remember_me` param from `omniauth.params` to `params`, which the 2FA process will pick up. - For non-2FA-based login, simply call the `remember_me` devise method to set the session cookie.
* | | | | | | | Merge branch 'foreign-keys-for-project-model' into 'master'Sean McGivern2017-07-0656-248/+627
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add foreign keys to various tables that point to the "projects" table See merge request !9388
| * | | | | | | | Rename ActiverecordSerialize copYorick Peterse2017-07-0618-31/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This cop has been renamed to ActiveRecordSerialize to match the way "ActiveRecord" is usually written.
| * | | | | | | | Update CI runner factories to not use invalid IDsYorick Peterse2017-07-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These IDs point to non-existing rows, causing the foreign key constraints to fail.
| * | | | | | | | Added Cop to blacklist the use of `dependent:`Yorick Peterse2017-07-0629-73/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is allowed for existing instances so we don't end up 76 offenses right away, but for new code one should _only_ use this if they _have_ to remove non database data. Even then it's usually better to do this in a service class as this gives you more control over how to remove the data (e.g. in bulk).
| * | | | | | | | Add many foreign keys to the projects tableYorick Peterse2017-07-0614-146/+458
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the need for relying on Rails' "dependent" option for data removal, which is _incredibly_ slow (even when using :delete_all) when deleting large amounts of data. This also ensures data consistency is enforced on DB level and not on application level (something Rails is really bad at). This commit also includes various migrations to add foreign keys to tables that eventually point to "projects" to ensure no rows get orphaned upon removing a project.
* | | | | | | | 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 '34698-fix-stubbing-cached-markdown-fields' into 'master'Rémy Coutable2017-07-061-1/+1
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix stubbing attributes alongside cache_markdown_field Closes #34698 See merge request !12661
| * | | | | | | | Fix stubbing attributes alongside cache_markdown_fieldNick Thomas2017-07-051-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch '33657-user-projects-api' into 'master'Rémy Coutable2017-07-066-50/+257
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add user projects API Closes #33657 See merge request !12596
| * | | | | | | | | Add user projects APIvanadium232017-07-066-50/+257
| | | | | | | | | |
* | | | | | | | | | Merge branch '34698-fix-transient-failure' into 'master'Grzegorz Bizon2017-07-061-8/+17
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a nasty transient failure happening is a subsequent spec Closes #34698 See merge request !12664
| * | | | | | | | | Fix project_path helper arguments in wiki specs34698-fix-transient-failureGrzegorz Bizon2017-07-061-1/+1
| | | | | | | | | |
View Lorry Controller Status