Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | no schema info for ApplicationSetting | Andrei Gliga | 2016-05-12 | 1 | -49/+0 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Revert "disabled_oauth_sign_in_sources column" and keep on schema only the ↵ | Andrei Gliga | 2016-05-12 | 1 | -9/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | disabled_oauth_sign_in_sources column This reverts commit 95358e0095403ad44149d11922d52e4590285a20. | |||||
| * | | | | | | | | new screenshot for the docs on how to enabled/disable OmniAuth Sign In | Andrei Gliga | 2016-05-12 | 1 | -0/+0 | |
| | | | | | | | | | ||||||
| * | | | | | | | | config/gitlab.yml between `` | Andrei Gliga | 2016-05-12 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Revert "no need to show the help about Github or the other authentication ↵ | Andrei Gliga | 2016-05-12 | 2 | -1/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sources" This reverts commit 78a832d0fd7ff445c707809134dbb2a42d2a9e03. Show help only for the enabled OAuth Providers on oauth-providers-help block aria: { describedby: help_block_id } instead of 'aria-describedby' => help_block_id provider and not p a more simple approach to the OmniAuth helper links for oauth-providers-help | |||||
| * | | | | | | | | inline btn-group{ data: { toggle: 'buttons' } } | Andrei Gliga | 2016-05-12 | 1 | -2/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | << instead of += | Andrei Gliga | 2016-05-12 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | enabled_button_based_providers.any? instead of ! empty? for ↵ | Andrei Gliga | 2016-05-12 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | button_based_providers_enabled? | |||||
| * | | | | | | | | button_based_providers.any? instead of !button_based_providers.empty? | Andrei Gliga | 2016-05-12 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Array(enabled_oauth_sign_in_sources) instead of the if | Andrei Gliga | 2016-05-12 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | enabled_oauth_sign_in_sources param doesn't need permit | Andrei Gliga | 2016-05-12 | 1 | -1/+0 | |
| | | | | | | | | | ||||||
| * | | | | | | | | credits for !4034 | Andrei Gliga | 2016-05-12 | 1 | -2/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | corrections to the Enable or disable Sign In with OmniAuth | Andrei Gliga | 2016-05-12 | 1 | -2/+3 | |
| | | | | | | | | | ||||||
| * | | | | | | | | documentation for enabling or disabling OAuth sign in | Andrei Gliga | 2016-05-12 | 2 | -0/+14 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Allow Admins to remove the Login with buttons for OAuth services and still ↵ | Andrei Gliga | 2016-05-12 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | be able to import on the changelog | |||||
| * | | | | | | | | On Application Settings Page let the user select the enabled OAuth Sign in ↵ | Andrei Gliga | 2016-05-12 | 3 | -13/+13 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sources instead of the disabled ones | |||||
| * | | | | | | | | more readable specs for enabled_button_based_providers and ↵ | Andrei Gliga | 2016-05-12 | 1 | -15/+29 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | button_based_providers_enabled? | |||||
| * | | | | | | | | typo | Andrei Gliga | 2016-05-12 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | unindent 1 level the Disable OAuth form | Andrei Gliga | 2016-05-12 | 1 | -8/+8 | |
| | | | | | | | | | ||||||
| * | | | | | | | | no need to show the help about Github or the other authentication sources | Andrei Gliga | 2016-05-12 | 1 | -3/+0 | |
| | | | | | | | | | ||||||
| * | | | | | | | | if omniauth is enabled and if there are button_based_providers available ↵ | Andrei Gliga | 2016-05-12 | 1 | -10/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | show the disable OAuth sources | |||||
| * | | | | | | | | DRYing enabled_button_based_providers tests | Andrei Gliga | 2016-05-12 | 1 | -7/+4 | |
| | | | | | | | | | ||||||
| * | | | | | | | | enabled_button_based_providers into their own describe section | Andrei Gliga | 2016-05-12 | 1 | -0/+2 | |
| | | | | | | | | | ||||||
| * | | | | | | | | use stub_application_setting instead | Andrei Gliga | 2016-05-12 | 1 | -10/+4 | |
| | | | | | | | | | ||||||
| * | | | | | | | | between "" | Andrei Gliga | 2016-05-12 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | stub Devise.omniauth_providers to return GitHub even if the gitlab.yml has ↵ | Andrei Gliga | 2016-05-12 | 1 | -2/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | no omniauth provider enabled This will fix failing tests in case gitlab.yml file has no omniauth providers enabled | |||||
| * | | | | | | | | tests for button_based_providers_enabled? helper method of AuthHelper | Andrei Gliga | 2016-05-12 | 1 | -0/+18 | |
| | | | | | | | | | ||||||
| * | | | | | | | | tests for enabled_button_based_providers helper method of AuthHelper | Andrei Gliga | 2016-05-12 | 1 | -1/+21 | |
| | | | | | | | | | ||||||
| * | | | | | | | | validate disabled_oauth_sign_in_sources in ApplicationSe | Andrei Gliga | 2016-05-12 | 2 | -0/+13 | |
| | | | | | | | | | ||||||
| * | | | | | | | | text for the disable_oauth_signin_sources label | Andrei Gliga | 2016-05-12 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | show only the eanbled oauth providers | Andrei Gliga | 2016-05-12 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | render the omniauth_box if there are any button_based_providers | Andrei Gliga | 2016-05-12 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | method to check if oauth button based providers are enabled | Andrei Gliga | 2016-05-12 | 1 | -0/+4 | |
| | | | | | | | | | ||||||
| * | | | | | | | | method to get the enabled_button_based_providers | Andrei Gliga | 2016-05-12 | 1 | -0/+6 | |
| | | | | | | | | | ||||||
| * | | | | | | | | OAuth Providers disable from the ApplicationSettings page | Andrei Gliga | 2016-05-12 | 2 | -0/+25 | |
| | | | | | | | | | ||||||
| * | | | | | | | | default value for disabled_oauth_sign_in_sources in create_from_defaults @ ↵ | Andrei Gliga | 2016-05-12 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ApplicationSetting | |||||
| * | | | | | | | | disabled_oauth_sign_in_sources parameter handling in ↵ | Andrei Gliga | 2016-05-12 | 1 | -1/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ApplicationSettingsController | |||||
| * | | | | | | | | serialize the disabled_oauth_sign_in_sources | Andrei Gliga | 2016-05-12 | 1 | -0/+50 | |
| | | | | | | | | | ||||||
| * | | | | | | | | disabled_oauth_sign_in_sources column | Andrei Gliga | 2016-05-12 | 2 | -0/+6 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge branch 'send-incremental-build-log' into 'master' | Jacob Schatz | 2016-05-12 | 7 | -65/+174 | |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update build log incrementally Proof of concept implementation of incremental sending of build log to browser. cc @jschatz1 @vsizov @grzesiek @tmaczukin See merge request !3737 | |||||
| * | | | | | | | | Fix specssend-incremental-build-log | Kamil Trzcinski | 2016-05-12 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Merge remote-tracking branch 'origin/master' into send-incremental-build-log | Kamil Trzcinski | 2016-05-10 | 190 | -2902/+839 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Encode state as base64 string | Kamil Trzcinski | 2016-05-09 | 4 | -22/+27 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Send trace to a browser incrementally when build is running | Kamil Trzcinski | 2016-05-09 | 6 | -58/+162 | |
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We send a state of ansi2html to client, client needs to send this state back. The state describes the configuration of generator and position within trace. | |||||
* | | | | | | | | | Merge branch 'update-changelog-875' into 'master' | Yorick Peterse | 2016-05-12 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated CHANGELOG for 8.7.5 See merge request !4129 | |||||
| * | | | | | | | | | Updated CHANGELOG for 8.7.5 | Yorick Peterse | 2016-05-12 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | |||||
* | | | | | | | | | | Merge branch '14272-forks-listed-when-permission-is-missing' into 'master' | Rémy Coutable | 2016-05-12 | 2 | -2/+3 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only show forks for users who can download code The ForksController enforces this, so don't show the link if it won't go anywhere. Closes #14272. See merge request !4017 | |||||
| * | | | | | | | | | Only show forks for users who can download code | Sean McGivern | 2016-05-12 | 2 | -2/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ForksController enforces this, so don't show the link if it won't go anywhere. | |||||
* | | | | | | | | | | Merge branch 'fix/reuse-runner-edit-form-in-admin-area' into 'master' | Rémy Coutable | 2016-05-12 | 6 | -47/+33 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reuse runners edit form in admin and project area Reuse runners edit form in admin and project area.  See merge request !4094 | |||||
| * | | | | | | | | | | Use % notation for arrays in runner model constantsfix/reuse-runner-edit-form-in-admin-area | Grzegorz Bizon | 2016-05-11 | 1 | -2/+2 | |
| | | | | | | | | | | |