Age | Commit message (Collapse) | Author |
|
Only create commit GPG signature when necessary
See merge request !13561
|
|
|
|
Circuitbreaker settings to avoid spec-failures
Closes #36324
See merge request !13519
|
|
`failure_count_threshold`: We should never need this, but we don't
want to block access in tests because of this.
`failure_wait_time`: Setting it to 0 now allows each storage attempt
`storage_timeout`: Try a bit longer to access storage on CI in case
the slow machines take a bit longer to spin up the process to perfom
the check
|
|
This allows testing every storage attempt after a failure. Which could
be useful for tests
|
|
Whitelist or fix additional `Gitlab/PublicSend` cop violations
See merge request !13467
|
|
Enable Layout/TrailingWhitespace cop and auto-correct offenses
See merge request !13573
|
|
Make sure MySQL would not use CURRENT_TIMESTAMP as the default for timestamp columns
Closes #36405
See merge request !13560
|
|
|
|
Resolve "Enable scope hoisting with webpack"
Closes #36152
See merge request !13374
|
|
for timestamp columns magically. See:
https://gitlab.com/gitlab-org/gitlab-ce/issues/36405
|
|
|
|
|
|
An upcoming update to rubocop-gitlab-security added additional
violations.
|
|
|
|
|
|
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
|
|
* master: (86 commits)
Show all labels
33874 confidential issue redesign
Exclude merge_jid on Import/Export attribute configuration
Resolve "User dropdown in filtered search does not load avatar on `master`"
Re-add column locked_at on migration rollback
Group-level new issue & MR using previously selected project
[EE Backport] Update log audit event in omniauth_callbacks_controller.rb
more eagerly bail when the state is prevented
Move locked_at removal to post-deployment migration
Add class to other sidebars
Improve mobile sidebar
reduce iterations by keeping a count of remaining enablers
Store & use ConvDev percentages returned by Version app
Store MergeWorker JID on merge request, and clean up stuck merges
Backport changes in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2551 to CE
DRY up caching in AbstractReferenceFilter
Update CHANGELOG
Add CHANGELOG entry
Fix html structure Removes test for removed behavior
Port form back to use form_tag
...
|
|
Resolve "Store MergeWorker JID on merge request, and clean up stuck merges"
Closes #31207
See merge request !13207
|
|
Issuables: Move some code from create services to Sidekiq workers
See merge request !13326
|
|
* master: (177 commits)
Add changelog
Bump gitlab-shell version to 5.8.0 to fix Git for Windows 2.14
Make contextual sidebar collapsible
Fixed sidebar context header hover colors
Use correct `Environment`-class within `Gitlab` namespace
Remove gl.Activities from Commits page
Move `let` calls inside the `describe` block using them
Add `/assign me` alias support for assigning issuables to oneself
GRPC::Unavailable (< GRPC::BadStatus) is wrapped in a CommandError
Use `broken_storage` in the fs_shards_spec.
Eager load project creators for project dashboards
Memoize a user's personal projects count
Remove redundant query from User#recent_push
Improve checking if projects would be returned
Change spelling of gitlab-shell
Remove unused #tree-holder
Add custom linter for inline JavaScript to haml_lint
Rename user_can_admin? because it's more accurate
Synchronous zanata community contribution translation
Add Korean translation to i18n
...
|
|
Upgrade to webpack v3.4.0
Closes #33902
See merge request !12298
|
|
Allow projects to be started from a template
Closes #32420
See merge request !13108
|
|
Support group milestone references
Closes #34778
See merge request !13289
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Group milestones can only be referred to by name, not IID. They also do not
support cross-project references.
|
|
* master: (623 commits)
Fix issues with pdf-js dependencies
fix missing changelog entries for security release on 2017-01-23
Update top bar issues icon
Fix pipeline icon in contextual nav for projects
Since mysql is not a priority anymore, test it less
Fix order of CI lint ace editor loading
Add container registry and spam logs icons
Fix different Markdown styles
Backport to CE for:
Make new dropdown dividers full width
Fix spec
Fix spec
Fix spec
Bump GITLAB_SHELL_VERSION and GITALY_VERSION to support unhiding refs
Add changelog
Install yarn via apt in update guides
Use long curl options
fix
Add a spec for concurrent process
Remove monkey-patched Array.prototype.first() and last() methods
...
|
|
# Conflicts:
# app/models/repository.rb
# spec/models/repository_spec.rb
|
|
|
|
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2483
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Inline js removal projects other
See merge request !13075
|
|
Capybara + :js specs
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
|
|
Backport some recent changes related to LDAP from EE
See merge request !13119
|
|
Add remote IP, user ID and username to JSON lograge output
See merge request !13147
|
|
into 'master'
Resolve "Transform user profile javascript into async bundle"
Closes #35224
See merge request !12929
|
|
# Conflicts:
# config/initializers/lograge.rb
|