| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| | |
|
| |\
| |
| |
| |
| | |
Remove duplicate method
See merge request gitlab-org/gitlab-ce!18886
|
| | | |
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | | |
Allow a user to sign out when on the terms page
Closes #46211
See merge request gitlab-org/gitlab-ce!18875
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
Before we would block the `sign_out` request when the user did not
accept the terms, therefore redirecting them to the terms again.
By allowing all request to devise controllers, we avoid this problem.
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
'b-rails5-fix-spec-controllers-projects-jobs_controller_spec-rb' into 'master'
Resolve "[Rails5] Fix spec/controllers/projects/jobs_controller_spec.rb"
Closes #46227
See merge request gitlab-org/gitlab-ce!18891
|
| | |/ /
| | |
| | |
| | |
| | | |
In Rails 5.0 `response.content_type` does not return charset which is expected in specs.
This commit replaces `response.content_type` with `response.headers["Content-Type"]` in specs.
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
'blackst0ne-replace-spinach-project-merge-requests-references.feature' into 'master'
Replace the `project/merge_requests/references.feature` spinach test with an rspec analog
See merge request gitlab-org/gitlab-ce!18794
|
| | | | | |
|
| | | | | |
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | | |
Merge branch 'docs-fixed-typo-microsoft-teams-slug' into 'master'
See merge request gitlab-org/gitlab-ce!18908
|
| |/ / / /
| | | |
| | | |
| | | |
| | | | |
Fix: API Documentation typo on Microsoft Teams slug
See merge request gitlab-org/gitlab-ee!5412
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Enforce terms acceptance before configuring 2FA
Closes #46256
See merge request gitlab-org/gitlab-ce!18896
|
| | | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | | |
This prevents a redirect loop when a user has to enable 2FA and accept
the terms.
Now they will need to accept the terms, then enable 2FA, or any other requirements.
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Block access to API & git when terms are enforced
Closes #45849
See merge request gitlab-org/gitlab-ce!18816
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Allow builds that have been triggered by a user before terms were
enforced access to git. That way the builds can complete as usual.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The `access_git` and `access_api` were currently never checked for
anonymous users. And they would also be allowed access:
An anonymous user can clone and pull from a public repo
An anonymous user can request public information from the API
So the policy didn't actually reflect what we were enforcing.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
When terms are enforced, but the user has not accepted the terms
access to the API & git is rejected with a message directing the user
to the web app to accept the terms.
|
| |\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Vendor Auto DevOps template
See merge request gitlab-org/gitlab-ce!18876
|
| |/ / / / / |
|
| |\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Resolve "Remove modal box confirmation when retrying a pipeline"
Closes #45715
See merge request gitlab-org/gitlab-ce!18879
|
| |/ / / / / |
|
| |\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Remove Gitlab::RepoPath.strip_storage_path
See merge request gitlab-org/gitlab-ce!18904
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This used to be executed because of the post receive worker, but this
uses Gitlab::GlRepository.parse now. So this removes dead code and
reduces the number of calls on `#legacy_storage_path`.
|
| |\ \ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Add 2FA filter to group members page
See merge request gitlab-org/gitlab-ce!18483
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* Show 2fa badge on a group members page
* Make group members page UI consistent with project members page
* Fix ambiguous sql in User.with/without_two_factor methods
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| |\ \ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Wiki Find Page to opt_out
Closes gitaly#894
See merge request gitlab-org/gitlab-ce!18895
|
| | | |_|_|/ / /
| |/| | | | |
| | | | | | |
| | | | | | | |
Closes https://gitlab.com/gitlab-org/gitaly/issues/894
|
| |\ \ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Resolve "[Rails5] Bump Rails5 to 5.0.7"
Closes #46234
See merge request gitlab-org/gitlab-ce!18888
|
| | |/ / / / / /
| | | | | | |
| | | | | | |
| | | | | | | |
atomic 1.1.100 was yanked by its author.
|
| |\ \ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
into 'master'
Resolve "[Rails5] Fix `NoMethodError: undefined method `-' for "3":String`"
Closes #46233
See merge request gitlab-org/gitlab-ce!18892
|
| | |/ / / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
In Rails 5 the `per_page` argument came from `params` is String but an
Integer is expected.
This commit explicitly converts `per_page` to an Integer.
It fixes the errors like:
```
1) Groups::ChildrenController GET #index for subgroups filtering children succeeds if multiple pages contain matching subgroups
Failure/Error:
hash[page] = second_collection.page(second_collection_page)
.per(per_page - paginated_first_collection(page).size)
.padding(offset)
NoMethodError:
undefined method `-' for "3":String
Did you mean? -@
# ./lib/gitlab/multi_collection_paginator.rb:42:in `block in paginated_second_collection'
# ./lib/gitlab/multi_collection_paginator.rb:46:in `paginated_second_collection'
# ./lib/gitlab/multi_collection_paginator.rb:14:in `paginate'
# ./app/finders/group_descendants_finder.rb:52:in `children'
# ./app/finders/group_descendants_finder.rb:34:in `execute'
# ./app/controllers/groups/children_controller.rb:36:in `setup_children'
# ./app/controllers/groups/children_controller.rb:18:in `index'
# ./lib/gitlab/i18n.rb:50:in `with_locale'
# ./lib/gitlab/i18n.rb:56:in `with_user_locale'
# ./app/controllers/application_controller.rb:351:in `set_locale'
# ./spec/controllers/groups/children_controller_spec.rb:182:in `block (5 levels) in <top (required)>'
# ./spec/spec_helper.rb:198:in `block (2 levels) in <top (required)>'
```
|
| |\ \ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Resolve "[Rails5] Fix `Route source can't be blank`"
Closes #46228
See merge request gitlab-org/gitlab-ce!18890
|
| | |/ / / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
In Rails 5.0 automatic inverse does not work for polymorphic relathionships.
It was fixed in Rails 5.2: https://github.com/rails/rails/pull/28808
Until that the `inverse_of: :source` argument should be set explicitly.
|
| |\ \ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Resolve "[Rails5] Fix app/views/groups/issues.html.haml"
Closes #46225
See merge request gitlab-org/gitlab-ce!18889
|
| | |/ / / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Fixes the errors like:
```
ActionView::Template::Error:
Attempting to generate a URL from non-sanitized request parameters! An attacker can inject malicious data into the generated URL, such as changing the host. Whitelist and sanitize passed parameters to be secure.
```
|
| |\ \ \ \ \ \ \
| |_|_|/ / / /
|/| | | | | |
| | | | | | |
| | | | | | | |
Support `js-close` as a removal class in UserCallout
See merge request gitlab-org/gitlab-ce!18790
|
| |/ / / / / / |
|
| |\ \ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Fixed none merge request files not being openable in the web IDE
See merge request gitlab-org/gitlab-ce!18881
|
| | | |_|/ / /
| |/| | | | |
|
| |\ \ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
'ce-5911-extract-ee-specific-files-lines-for-spec-models-clusters' into 'master'
Backport EE specific cluster spec changes to CE
See merge request gitlab-org/gitlab-ce!18866
|
| | | | | | | | |
|
| | | | | | | | |
|
| | | | | | | | |
|
| | | | | | | | |
|
| |\ \ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Add missing tooltip to creation date on container registry overview
Closes #34229
See merge request gitlab-org/gitlab-ce!18767
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Signed-off-by: Lars Greiss <l.greiss@mediacologne.de>
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Signed-off-by: Lars Greiss <l.greiss@mediacologne.de>
|
| |\ \ \ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Remove method call to deprecated method
See merge request gitlab-org/gitlab-ce!18815
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Given the settings initializer creates Gitaly Storage Settings objects
already, the calls to path can be moved to that initializer.
|
