Commit Graph

82 Commits

Author SHA1 Message Date
GitLab Bot 3174adc799 Add latest changes from gitlab-org/gitlab@master 2020-05-26 00:08:21 +00:00
GitLab Bot abae8f34f3 Add latest changes from gitlab-org/gitlab@master 2020-03-31 21:08:05 +00:00
GitLab Bot f6e2f30241 Add latest changes from gitlab-org/gitlab@master 2020-03-31 00:08:09 +00:00
GitLab Bot e20baee820 Add latest changes from gitlab-org/gitlab@master 2020-03-27 18:07:48 +00:00
GitLab Bot eb1f5a3e08 Add latest changes from gitlab-org/gitlab@master 2020-02-17 18:09:00 +00:00
GitLab Bot 7351a484d7 Add latest changes from gitlab-org/gitlab@master 2020-02-10 12:08:59 +00:00
GitLab Bot b806264d29 Add latest changes from gitlab-org/gitlab@master 2020-01-16 09:08:46 +00:00
GitLab Bot 6ede90f5dd Add latest changes from gitlab-org/gitlab@master 2020-01-13 06:08:10 +00:00
GitLab Bot d10a462fed Add latest changes from gitlab-org/gitlab@master 2019-12-16 12:07:43 +00:00
GitLab Bot ee97c0d1a2 Add latest changes from gitlab-org/gitlab@master 2019-10-10 03:06:28 +00:00
GitLab Bot 8c8b94e711 Add latest changes from gitlab-org/gitlab@master 2019-10-07 21:07:54 +00:00
GitLab Bot 274ea604fc Add latest changes from gitlab-org/gitlab@master 2019-09-16 21:06:30 +00:00
Peter Leitzen 7b87ed1499 Cleanup usages of `JSON.parse` in specs
Prefer `json_response` where applicable.
2019-07-16 08:03:49 +00:00
Bob Van Landuyt 23b35e0592 Use next_instance_of instead of any_instance_of
For prepended classes, we need to use `expect_next_instance_of`
instead of RSpecs `any_instance_of` variants.
2019-06-20 18:24:34 +02:00
Brett Walker 6b4f93c034 Update application settings using correct action
Updating multiple application settings panels through
a single action causes the incorrect action to be shown
when there are errors.  Instead, make each panel action
handle both updating and display.
2019-06-19 12:29:10 -05:00
gfyoung 93a44e135b Add some frozen string to spec/**/*.rb
Adds frozen string to the following:

* spec/bin/**/*.rb
* spec/config/**/*.rb
* spec/controllers/**/*.rb

xref https://gitlab.com/gitlab-org/gitlab-ce/issues/59758
2019-04-15 10:17:05 +00:00
Imre Farkas 9bc5ed14fe Move Contribution Analytics related spec in spec/features/groups/group_page_with_external_authorization_service_spec to EE 2019-04-09 15:38:58 +00:00
Gosia Ksionek 64858317ad Add part of needed code
Add columns to store project creation settings

Add project creation level column in groups
 and default project creation column in application settings

Remove obsolete line from schema

Update migration with project_creation_level column existence check

Rename migrations to avoid conflicts

Update migration methods

Update migration method
2019-04-05 18:49:46 +00:00
Andreas Brandl 46b1b9c1d6 Revert "Merge branch 'if-57131-external_auth_to_ce' into 'master'"
This reverts merge request !26823
2019-04-05 13:02:56 +00:00
Imre Farkas d9d7237d2e Move Contribution Analytics related spec in spec/features/groups/group_page_with_external_authorization_service_spec to EE 2019-04-05 11:45:47 +00:00
blackst0ne b44a2c801a Update specs to rails5 format
Updates specs to use new rails5 format.

The old format:
`get :show, { some: params }, { some: headers }`

The new format:
`get :show, params: { some: params }, headers: { some: headers }`
2018-12-19 10:04:31 +11:00
Tomasz Maczukin 42af229510
Simplify runner registration token resetting
This icommit adds several changes related to the same topic
- resetting a Runner registration token:

1. On Project settings page it adds a button for resetting the
   registration token and it removes the Runner token field
   that was confusing all GitLab users.

2. On Group settings page it adds the same button for resetting
   the registration token.

3. On Admin Runners settings page it moves the button to the same
   place as in Project and Group settings and it changes slightly
   the page layout to make it more similar to Group and Project
   setting pages.

4. It refactorizes a little the partial that prints runner
   registration description. Thanks to this Project, Group
   and Admin settings of the Runner are re-using the same
   code to generate the button.

5. Updates the translations of changed text.
2018-10-04 08:37:01 +02:00
Rubén Dávila 007b81b8e2 Add receive_max_input_size setting to Application settings
If user has configure the setting then it will be passed to gitlab-shell
and gitlab-workhorse
2018-09-07 12:27:35 -05:00
Jasper Maes 71e0d33e74 Rails5 ActionController::ParameterMissing: param is missing or the value is empty: application_setting 2018-06-13 18:00:15 +02:00
Dmitriy Zaporozhets b6c6adfa51
Update invalid test application_settings_controller_spec.rb
There are 2 problems with this spec:

1. It checks for default visiblity level however there is not code in
controller to handle such default. Same check can be performed on model
directly.
2. It passes empty application_setting hash while controller requires
application_setting not to be empty by using `require` with `permit`

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2018-04-14 00:04:55 +03:00
Mark Fletcher 6dcba97c83 Permits 'password_authentication_enabled_for_git' parameter for ApplicationSettingsController 2018-01-19 12:04:45 +00:00
Robert Speicher 72a7b30c9f Change all `:empty_project` to `:project` 2017-08-02 17:47:31 -04:00
Robert Speicher 9513bd18c4 Ensure all project factories use `:repository` trait or `:empty_project` 2017-08-01 14:51:52 -04:00
Sean McGivern 0483019e98 Port 'Add more usage data to EE ping' to CE
CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/735
2017-04-14 15:20:55 +02:00
Toon Claes 5058fc67ac Remove redundant code to convert restricted_levels to integers
The ApplicationSetting#restricted_visibility_levels= now takes care of
converting string formatted levels to integers.
2017-03-23 15:25:42 +01:00
Toon Claes 7bfa523485 Resolve future conflicts with CE -> EE merge
EE already includes specs for the ApplicationSettingsController, so
ensure future changes will be easier to merge to EE.
2017-03-23 11:13:11 +01:00
Toon Claes 4e1cebabc7 Undo explicit conversion to Integer
With the changes in Gitlab::VisibilityLevel it is no longer needed to
explicit conversion to Integer in the controller itself.
2017-03-20 22:57:45 +01:00