4ed7fa9445
Resolve "System level labels UI broken"
2018-08-07 10:56:17 +00:00
6b2b89f3cd
Merge branch 'osw-fix-n-plus-1-for-mrs-without-merge-info' into 'master'
...
Avoid N+1 on MRs page when metrics merging date cannot be found
Closes #47613
See merge request gitlab-org/gitlab-ce!21053
2018-08-07 10:38:46 +00:00
c8c38f94f2
Merge branch '36409-frontend-for-clarifying-the-usefulness-of-the-search-bar' into 'master'
...
Resolve "Frontend for clarifying the usefulness of the search bar"
Closes #36409
See merge request gitlab-org/gitlab-ce!20537
2018-08-07 09:59:01 +00:00
efec7e086d
Resolve "Frontend for clarifying the usefulness of the search bar"
2018-08-07 09:59:01 +00:00
8a1d55a3bd
Merge branch 'jr-fixup-ssh-cert-docs' into 'master'
...
Fix typo and improve formatting
See merge request gitlab-org/gitlab-ce!21056
2018-08-07 09:51:58 +00:00
6d633a7f77
Merge branch 'git-rerere-link-doc-update' into 'master'
...
Update git rerere link in docs
See merge request gitlab-org/gitlab-ce!21060
2018-08-07 09:25:25 +00:00
7a56f0e93a
Update git rerere link in docs
...
The original link was moved.
2018-08-07 01:13:16 -07:00
b211f7c253
Merge branch 'winh-user-status-docs' into 'master'
...
Add documentation for setting up a user status
See merge request gitlab-org/gitlab-ce!21045
2018-08-07 07:13:50 +00:00
2521a8e5f9
Add documentation for setting up a user status
2018-08-07 07:13:50 +00:00
bc4918eb1a
Merge branch 'tz-frontend-avatar-resizing' into 'master'
...
Send resize parameters for avatars
See merge request gitlab-org/gitlab-ce!20966
2018-08-07 06:04:33 +00:00
fac4f50cf6
Send resize parameters for avatars
2018-08-07 06:04:33 +00:00
dd627072b3
Merge branch 'mg-backport-create-item-dropdown-changes' into 'master'
...
Update CreateItemDropdown class to allow the glDropdown filterRemote option
See merge request gitlab-org/gitlab-ce!21041
2018-08-06 22:21:40 +00:00
a8c9cd41d2
Update CreateItemDropdown class to allow the glDropdown filterRemote option
2018-08-06 22:21:39 +00:00
ac1d83c56b
Merge branch '47156-improve-auto-devops-settings' into 'master'
...
Resolve "Improve Auto DevOps settings flow for admin and project"
Closes #47156
See merge request gitlab-org/gitlab-ce!20946
2018-08-06 21:51:37 +00:00
e3127132a4
Resolve "Improve Auto DevOps settings flow for admin and project"
2018-08-06 21:51:37 +00:00
49dc8215b4
Avoid N+1 on MRs page when metrics merging date cannot be found
2018-08-06 18:13:36 -03:00
7e189a646b
Fix typo and improve formatting
2018-08-06 14:28:00 -04:00
d737abc537
Merge branch 'sh-support-bitbucket-server-import' into 'master'
...
Add support for Bitbucket Server imports
Closes #25393
See merge request gitlab-org/gitlab-ce!20164
2018-08-06 17:32:12 +00:00
0ffd79319f
Merge branch '48419-charts-with-long-label-appear-oversized' into 'master'
...
Resolve "Charts with long label appear oversized"
Closes #48419
See merge request gitlab-org/gitlab-ce!20866
2018-08-06 17:21:29 +00:00
e8b5bbf194
Merge branch 'revert-77c75d2b' into 'master'
...
Revert "Merge branch 'bvl-instance-stats-default' into 'master'"
See merge request gitlab-org/gitlab-ce!21054
2018-08-06 16:58:52 +00:00
ee851e5849
Simplify importer_status.js failed status implementation
2018-08-06 09:52:12 -07:00
1fb648a35b
Merge branch '48657-persist-auto-devops-banner-dismissal-per-user-cookie' into 'master'
...
Persist 'auto devops' banner dismissal globally
Closes #48657
See merge request gitlab-org/gitlab-ce!20540
2018-08-06 16:26:10 +00:00
964d9f431f
Merge branch 'background-migrations-system-load' into 'master'
...
Respond to DB health in background migrations
See merge request gitlab-org/gitlab-ce!20720
2018-08-06 16:16:09 +00:00
b4415c0174
Merge branch 'issue_44821' into 'master'
...
Retrieve merge request closing issues from database cache
Closes #44821
See merge request gitlab-org/gitlab-ce!20911
2018-08-06 15:44:40 +00:00
e96862f211
Revert "Merge branch 'bvl-instance-stats-default' into 'master'"
...
This reverts merge request !21044
2018-08-06 15:44:23 +00:00
fdb5f285f9
Retrieve merge request closing issues from database cache
2018-08-06 11:58:22 -03:00
415b2f943b
Merge branch '49835-increase-width' into 'master'
...
Resolve "Increase width of left column in reports modal"
Closes #49835
See merge request gitlab-org/gitlab-ce!21048
2018-08-06 14:23:05 +00:00
ad570fa6a1
Merge branch 'issue_43602' into 'master'
...
Allow multiple JIRA transitions id split by comma or semicolon
Closes #43602
See merge request gitlab-org/gitlab-ce!20939
2018-08-06 13:45:24 +00:00
1e5192cc8c
Fix interval in NormalizeLdapExternUids spec
...
The background migration interval has been reduced from 5 minutes to 2
minutes, so we have to adjust this migration accordingly.
2018-08-06 15:20:37 +02:00
91b752dce6
Respond to DB health in background migrations
...
This changes the BackgroundMigration worker so it checks for the health
of the DB before performing a background migration. This in turn allows
us to reduce the minimum interval, without having to worry about blowing
things up if we schedule too many migrations.
In this setup, the BackgroundMigration worker will reschedule jobs as
long as the database is considered to be in an unhealthy state. Once the
database has recovered, the migration can be performed.
To determine if the database is in a healthy state, we look at the
replication lag of any replication slots defined on the primary. If the
lag is deemed to great (100 MB by default) for too many slots, the
migration is rescheduled for a later point in time.
The health checking code is hidden behind a feature flag, allowing us to
disable it if necessary.
2018-08-06 15:20:36 +02:00
77c75d2b1b
Merge branch 'bvl-instance-stats-default' into 'master'
...
Hide instance statistics by default
Closes #50000
See merge request gitlab-org/gitlab-ce!21044
2018-08-06 12:17:52 +00:00
bf1ce979e2
Increases title column on modal for reports
2018-08-06 13:12:36 +01:00
baffe82ace
Hide instance statistics on new installations
...
Making the migrations and the default do the right thing in the first
place. This makes 20180806094307 a no-op.
2018-08-06 13:33:07 +02:00
2b78eab1fa
Merge branch '7065-performance-metrics-not-rendered-properly-in-merge-request-widget' into 'master'
...
Add a generic more CSS class to render expandable reports correctly
See merge request gitlab-org/gitlab-ce!21014
2018-08-06 11:09:17 +00:00
f6e6faee68
Merge branch 'jr-archive-hook' into 'master'
...
Trigger `project_update` system hook when archiving projects
See merge request gitlab-org/gitlab-ce!20995
2018-08-06 10:51:37 +00:00
bc1f851fdf
Merge branch '49375-move-help-popover' into 'master'
...
Moves help_popover.vue to a common location
See merge request gitlab-org/gitlab-ce!21011
2018-08-06 10:31:25 +00:00
80c47f8eb4
Merge branch '35952-keep-admin-settings-open-after-submit' into 'master'
...
Keep Admin settings sections expanded after submitting form
See merge request gitlab-org/gitlab-ce!21040
2018-08-06 10:24:23 +00:00
cff3e68584
Merge branch 'leipert-fix-pipelines-view' into 'master'
...
Fix initialization of JS in pipeline `/failures` tab
Closes #49994
See merge request gitlab-org/gitlab-ce!21043
2018-08-06 10:22:55 +00:00
3bdab23c89
Merge branch 'gitaly-0.115.0' into 'master'
...
Use Gitaly 0.115.0
See merge request gitlab-org/gitlab-ce!21013
2018-08-06 09:56:41 +00:00
0f871450cd
Hide for instance statistics by default
...
Changing the default in a new migration and updating the existing
values to change the defaults for instances already exposing the statistics.
2018-08-06 11:50:26 +02:00
c939003d9a
fix `/failures` JS init in pipelines view
2018-08-06 10:16:46 +02:00
313b79d87b
Merge branch '25990-improve-web-terminal' into 'master'
...
Move xterm to a node dependency and remove it from vendor's folder
Closes #49741
See merge request gitlab-org/gitlab-ce!20588
2018-08-06 07:24:18 +00:00
d2f6cd6deb
add CHANGELOG.md entry for !21040
2018-08-06 01:43:28 -05:00
7675475754
ensure all admin settings panels remain open after form submission
2018-08-06 01:43:28 -05:00
2c9f93207e
add CHANGELOG.md entry for !20540
2018-08-06 00:24:39 -05:00
52899e5db3
make auto devops banner dismissal global instead of per-project
2018-08-05 23:03:32 -05:00
30c960d4ee
Merge branch '6860-FE-instance-level-project-templates' into 'master'
...
Backport changes from gitlab-ee!6740
See merge request gitlab-org/gitlab-ce!21012
2018-08-05 16:59:57 +00:00
c2c9b3ddc7
Merge branch 'mg-revert-unneeded-changes-protected-environments' into 'master'
...
Revert some unneeded code changes from environment list
See merge request gitlab-org/gitlab-ce!21026
2018-08-03 23:16:36 +00:00
7e793af321
revert changes from gitlab-org/gitlab-ce!21018
2018-08-03 15:57:07 -05:00
8fbb109dea
Fix locale/gitlab.pot to use capital Import
2018-08-03 13:27:55 -07:00
André Luís
Sean McGivern
Phil Hughes
Dennis Tang
Nick Thomas
gfyoung
Achilleas Pipinellis
Winnie Hellmann
Tim Zallmann
Fatih Acet
Mike Greiling
Clement Ho
Oswaldo Ferreira
James Ramsay
Jose Ivan Vargas
Stan Hu
Bob Van Landuyt
Felipe Artur
Yorick Peterse
Filipa Lacerda
Bob Van Landuyt
Lukas Eipert