Age | Commit message (Collapse) | Author |
|
into 'master'
Do not enable prometheus metrics when metrics folder is missing
See merge request !12263
|
|
Support a configurable Rails asset_host to allow for CDNs
See merge request !12102
|
|
Missing translations for the project & repository pages.
Closes #33420
See merge request !12052
Conflicts:
app/assets/javascripts/locale/en/app.js
app/assets/javascripts/locale/es/app.js
app/views/projects/pipeline_schedules/_form.html.haml
locale/en/gitlab.po
locale/es/gitlab.po
locale/gitlab.pot
|
|
Add an optional performance bar to view performance metrics for the current page
Closes #29010
See merge request !11439
|
|
Add Bootsnap to all environments to reduce application startup time
Closes #33081
See merge request !12034
|
|
Fall back to gzip when missing optional zopfli dependency
See merge request !12068
|
|
Instrument MergeRequestDiff#load_commits
See merge request !12162
|
|
Master security update
See merge request !12025
|
|
|
|
Ran:
- git format-patch v9.2.2..v9.2.5 --stdout > patchfile.patch
- git checkout -b 9-2-5-security-patch origin/v9.2.2
- git apply patchfile.patch
- git commit
- [Got the sha ref for the commit]
- git checkout -b upstream-9-2-security master
- git cherry-pick <SHA of the patchfile commit>
- [Resolved conflicts]
- git cherry-pick --continue
|
|
|
|
|
|
|
|
|
|
Implement ability to update deploy keys
Closes #3191
See merge request !10383
|
|
|
|
Add Prometheus metrics endpoint and basic infrastructure to meter code
See merge request !11553
|
|
Support descriptions for snippets
Closes #31894
See merge request !11071
|
|
|
|
|
|
Forbid Sidekiq scheduling in transactions
Closes #27233
See merge request !9376
|
|
ConvDev Index
Closes #30469
See merge request !11377
|
|
'32992-consider-using-zopfli-over-standard-gzip-compression-for-webpack-assets' into 'master'
Use zopfli for better asset compression and disable compression in CI
Closes #32992
See merge request !11798
|
|
+ rename controler method to #index from #metrics
+ remove assertion from nullMetric
|
|
|
|
|
|
|
|
|
|
|
|
Scheduling jobs in transactions can lead to race conditions where a job
runs before a transaction has been committed. The added initializer
ensures the various Sidekiq scheduling methods raise an error when
called inside a transaction.
Fixes #27233
|
|
into 'master'
Add translations for elapsed time in words
Closes #32747
See merge request !11769
|
|
Simplify test&save actions when setting a service integration
Closes #31511
See merge request !11599
|
|
|
|
Use inline source maps for karma
Closes #30996
See merge request !11815
|
|
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
|
Add username parameter to gravatar URL
Closes #24472
See merge request !11741
|
|
|
|
|
|
Update session cookie key name to be unique to instance in development
Closes #31644
See merge request !11839
|
|
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/31644
|
|
Resolve N+1 query issue with discussions
Closes #33013
See merge request !11775
|
|
|
|
|
|
|
|
* upstream/master: (116 commits)
Revert "Merge branch 'grpc-1.3.4' into 'master'"
Return nil when looking up config for unknown LDAP provider
Avoid crash when trying to parse string with invalid UTF-8 sequence
Enable Gitaly by default in GitLab 9.3
Don’t create comment on JIRA if link already exists
Disable sub_group_issuables_spec.rb for mysql
Fix math rendering on blob pages
Add changelog
Don't allow to pass a user to ProjectWiki#http_url_to_repo
Revert "Merge branch '1937-https-clone-url-username' into 'master'
"
Fix bottom padding for build page
Fix /unsubscribe slash command creating extra todos
Fix omniauth-google-oauth2 dependencies in Gemfile.lock
Update looks job log
'New issue'/'New merge request' dropdowns should show only projects with issues/merge requests feature enabled
Fix spec for Members::AuthorizedDestroyService
31616-add-uptime-of-gitlab-instance-in-admin-area
Set head pipeline when creating merge requests
Create a separate helper to check if we show particular tab on a search page
Add performance deltas between app deployments on Merge Request widget
...
|
|
|
|
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11407#note_30922591
|
|
|
|
|
|
|