Age | Commit message (Collapse) | Author |
|
|
|
Added changes count to web IDE folder
See merge request gitlab-org/gitlab-ce!18452
|
|
See https://gitlab.com/gitlab-org/gitlab-ce/issues/45970
|
|
Platform: Use component to emit event on Subscription toggle component instead of eventHub
See merge request gitlab-org/gitlab-ce!18703
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Revert "Merge branch '5480-sidebar-subscription-event-handling' into 'master'"
Closes #45979
See merge request gitlab-org/gitlab-ce!18692
|
|
Deprecation of ActionView's time_ago_in_words
Closes #45761
See merge request gitlab-org/gitlab-ce!18607
|
|
Save and expose only generic merge error
See merge request gitlab-org/gitlab-ce!18646
|
|
'45970-broken-master-in-spec-features-issues-user_uses_slash_commands_spec-rb' into 'master'
Resolve "Broken master in spec/features/issues/user_uses_slash_commands_spec.rb"
Closes #45970
See merge request gitlab-org/gitlab-ce!18687
|
|
This reverts merge request !18682
|
|
Move WorkInProgress vue component
See merge request gitlab-org/gitlab-ce!17536
|
|
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
|
|
|
|
rspec analog
|
|
|
|
[Rails5] Fix spec/models/notification_setting_spec.rb
See merge request gitlab-org/gitlab-ce!18664
|
|
|
|
[Rails5] Fix `undefined method 'downcase'` errors in requests specs
See merge request gitlab-org/gitlab-ce!18645
|
|
Fix file_store for artifacts and lfs when saving
See merge request gitlab-org/gitlab-ce!18624
|
|
Enable LFS setting UI for Masters and Owners
Closes #33320
See merge request gitlab-org/gitlab-ce!18562
|
|
Migrate pipeline stages indices
Closes #43009
See merge request gitlab-org/gitlab-ce!18420
|
|
When an error occurs during merge, the error message is exposed to user
and it is also saved in DB. This error message may be user unfriendly
(as in !41820) and it could also expose a detailed backend information.
Instead of displaying the specific error message, only sanitized generic
message is displayed. This is potentially controversial change because
disadvantage is that user doesn't get specific reason of failure.
Additional changes:
* repository.merge including exceptions is is extracted into a
separate method to make things clearer
* update! is used instead of update so we don't silently ignore
an error
Related to !41857
|
|
|
|
|
|
Fix commit trailer rendering when Gravatar is disabled
Closes #45633
See merge request gitlab-org/gitlab-ce!18586
|
|
Use persisted diff data instead fetching Git on discussions
Closes #44052
See merge request gitlab-org/gitlab-ce!18657
|
|
LFS can be enabled and disabled per project using the API by Masters
and Owners, but the UI is only available to Admins. The interface and
API should be consistent.
LFS can also be enabled and disabled per group using the API by Owners,
but the UI is only available to Admins. This interface should also be
consistent.
Additionally removes an unneeded check if 2FA interface, since the
interface is only available to Owners.
Closes #33320
|
|
Add alpine mirrors while operating on k8s cluster
Closes gitlab-ee#4922
See merge request gitlab-org/gitlab-ce!18651
|
|
|
|
|
|
* master: (106 commits)
|
|
|
|
[CE] Exclude LDAP from OmniauthCallbackController base methods
See merge request gitlab-org/gitlab-ce!18619
|
|
|
|
|
|
In Rails 5 assigning a value which is not explicitly `true` or `false` to a boolean column transforms it to `true`.
In Rails 4 it transforms the value to `false` with the deprecation warning:
```
DEPRECATION WARNING: You attempted to assign a value which is not explicitly `true` or `false` ("nil") to a boolean column. Currently this value casts to `false`. This will change to match Ruby's semantics, and will cast to `true` in Rails 5. If you would like to maintain the current behavior, you should explicitly handle the values you would like cast to `false`.
```
This commit fixes the spec that expects to receive Rails 4 behavior.
|
|
|
|
Today, when fetching diffs of a note, we always go to Gitaly in order to diff between commits and return the diff of each discussion note. With this change we avoid doing that for notes on the "current version" of the MR.
|
|
Sanitize user name to avoid XSS attacks
See merge request gitlab/gitlabhq!2373
|
|
Serve archive requests with the correct file in all cases (10.7)
See merge request gitlab/gitlabhq!2376
|
|
|
|
Skip `authenticate_user!` for Doorkeeper controllers
Closes #44639
See merge request gitlab-org/gitlab-ce!18599
|
|
|