Commit Graph

96415 Commits

Author SHA1 Message Date
Evan Read e8bb778ff2 Merge branch 'patch-68' into 'master'
Add brackets escape example to LDAP doc

See merge request gitlab-org/gitlab-ce!29285
2019-06-25 01:21:26 +00:00
Blair Lunceford ffbdbcee8e Add brackets escape example to LDAP doc 2019-06-25 01:21:26 +00:00
Evan Read db6fbee83f Merge branch 'docs-blunceford-before-sha-fix' into 'master'
Updated explanation of CI_COMMIT_BEFORE_SHA variable

See merge request gitlab-org/gitlab-ce!29913
2019-06-25 01:19:11 +00:00
Blair Lunceford 18c155012e Updated explanation of CI_COMMIT_BEFORE_SHA variable 2019-06-25 01:19:10 +00:00
Stan Hu db9783f782 Merge branch 'refactor_deployment_cluster' into 'master'
Refactor Deployment#cluster to #deployment_platform_cluster

See merge request gitlab-org/gitlab-ce!29961
2019-06-24 22:23:18 +00:00
Nick Thomas 30eb7448de Merge branch 'fix-50834' into 'master'
Change HTTP Status Code when repository disabled

Closes #50834

See merge request gitlab-org/gitlab-ce!29585
2019-06-24 22:12:43 +00:00
Sam Battalio 3457695b1e Change HTTP Status Code when repository disabled 2019-06-24 22:12:42 +00:00
GitLab Release Tools Bot 9e6c3f56fd Update CHANGELOG.md for 12.0.1
[ci skip]
2019-06-24 21:15:32 +00:00
Nick Thomas 1cffafbfd4 Merge branch 'pages-domains-certificates-auto-renew-mysql' into 'master'
Renew pages domain's certificates through Let's Encrypt

See merge request gitlab-org/gitlab-ce!29363
2019-06-24 20:35:13 +00:00
Vladimir Shushlin a7764d0e84 Renew Let's Encrypt certificates
Add index for pages domain ssl auto renewal
Add PagesDomain.needs_ssl_renewal scope
Add cron worker for ssl renewal
Add worker for ssl renewal
Add pages ssl renewal worker queues settings
2019-06-24 20:35:12 +00:00
Kamil Trzciński bf8f5b8f44 Merge branch '62722-move-derailed-benchmarks-to-global-gem-section' into 'master'
Move `derailed_benchmarks` gem to :default group

See merge request gitlab-org/gitlab-ce!29975
2019-06-24 19:11:57 +00:00
Tim Zallmann 2b2d2911ab Merge branch 'vue-i18n-js-jobs-directory' into 'master'
Vue-i18n: autofix for app/assets/javascripts/jobs directory

See merge request gitlab-org/gitlab-ce!29969
2019-06-24 19:01:39 +00:00
Douglas Barbosa Alexandre 07aa4bcfce Merge branch 'sh-optimize-todos-controller' into 'master'
Eliminate N+1 queries in Dashboard::TodosController

Closes #43042

See merge request gitlab-org/gitlab-ce!29954
2019-06-24 18:58:36 +00:00
Jan Provaznik 2b327c1b4d Merge branch '63656-runner-tags-search-dropdown-is-empty' into 'master'
Resolve "Runner tags search dropdown is empty"

Closes #63656

See merge request gitlab-org/gitlab-ce!29985
2019-06-24 18:43:54 +00:00
Stan Hu f2d932268d Rename Todos.with_api_entity_associations to with_entity_associations
Since this scope is used in both the controller and the API, we rename
it to make it clear that it's used for both.
2019-06-24 10:49:13 -07:00
Stan Hu a949cc3518 Merge branch 'revert-868da1d6' into 'master'
Revert "Fix copying a single line from Firefox"

See merge request gitlab-org/gitlab-ce!29993
2019-06-24 17:29:55 +00:00
Kamil Trzciński e11feff929 Revert "Merge branch..."
This reverts merge request !29832
2019-06-24 17:29:54 +00:00
Achilleas Pipinellis 1f2387c4ff Merge branch '62356-service-response-docs' into 'master'
Add doc for ServiceResponse

Closes #62356

See merge request gitlab-org/gitlab-ce!29992
2019-06-24 17:24:26 +00:00
Lin Jen-Shin b32f7d4891 Add doc for ServiceResponse 2019-06-24 17:24:25 +00:00
Stan Hu 211a00473b Eliminate N+1 queries in Dashboard::TodosController
This appears to bring down the number of SQL queries on GitLab.com for
my Todos page from 672 to 100.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/43042
2019-06-24 09:57:38 -07:00
Achilleas Pipinellis 7f6de7fe29 Merge branch 'ab-codereview-db' into 'master'
Require database reviews for migrations

See merge request gitlab-org/gitlab-ce!29895
2019-06-24 16:53:17 +00:00
Andreas Brandl 942b38d5af Require database reviews for migrations 2019-06-24 16:53:16 +00:00
Mike Greiling e5d8d15da0 Merge branch 'leipert-upgrade-jquery' into 'master'
Upgrade jquery to 3.4.1

See merge request gitlab-org/gitlab-ce!29980
2019-06-24 16:46:29 +00:00
Mike Greiling c64e5848ae Merge branch 'jivanvl-add-column-chart-monitoring-dashboard' into 'master'
Add column chart component to the monitoring bundle

See merge request gitlab-org/gitlab-ce!29293
2019-06-24 16:45:16 +00:00
Annabel Dunstone Gray f53a6d63a4 Merge branch '63559-remove-avatar-from-sign-in' into 'master'
Resolve "Avatar in "Please sign in" pattern too large"

Closes #63559

See merge request gitlab-org/gitlab-ce!29944
2019-06-24 15:27:50 +00:00
Marcel van Remmerden b574285210 Resolve "Avatar in "Please sign in" pattern too large" 2019-06-24 15:27:49 +00:00
Filipa Lacerda f53b05cfde Merge branch 'divergence-graph-fe-rendering' into 'master'
Render branch divergence graph with Vue

See merge request gitlab-org/gitlab-ce!29743
2019-06-24 14:40:18 +00:00
Phil Hughes 108c3cf16b Merge branch 'ce-mw-onboarding-mvc-tour' into 'master'
(CE Port) New user onboarding (Guided Tour)

See merge request gitlab-org/gitlab-ce!29927
2019-06-24 14:30:04 +00:00
Martin Wortschack e978df014c Add identifiers for onboarding popovers
- Add button styles for onboarding welcome page
- Fix qa selector (due to additional class)
2019-06-24 14:30:03 +00:00
Kamil Trzciński 6a71eea9ac Merge branch 'sh-remove-token-from-profiling-docs' into 'master'
Remove requirement for personal access token in profiling

See merge request gitlab-org/gitlab-ce!29972
2019-06-24 13:56:26 +00:00
Dmitriy Zaporozhets f928c22ff0
Return all runner tags when search is empty
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2019-06-24 16:44:04 +03:00
Kamil Trzciński 0e6e924b8b Merge branch 'search-blob-basenames' into 'master'
Build correct basenames for title search results

See merge request gitlab-org/gitlab-ce!29898
2019-06-24 12:23:35 +00:00
Kamil Trzciński 2dcf96629a Merge branch 'patch-65' into 'master'
Add name & search parameters to project environments API

See merge request gitlab-org/gitlab-ce!29385
2019-06-24 12:18:41 +00:00
Lee Tickett ec66f1b5ca Add name & search parameters to project environments API 2019-06-24 12:18:40 +00:00
Phil Hughes cf137da316 Merge branch '52366-improved-group-lists-ui' into 'master'
Resolve "Improved group lists UI"

Closes #52366

See merge request gitlab-org/gitlab-ce!26542
2019-06-24 12:14:20 +00:00
Kamil Trzciński 77b2e8a2e4 Merge branch 'ci-pipeline-build-seed-spec-refactor' into 'master'
RSpec::Parameterized syntax for CI pipeline build seed specs

See merge request gitlab-org/gitlab-ce!29947
2019-06-24 12:11:22 +00:00
Phil Hughes 039117deac
Render branch divergance graph with Vue 2019-06-24 12:52:00 +01:00
Dennis Tang 7a4b15214a Improve group list UI
This updates the groups list UI to match the style of the project list:

- New layout
- Improve loading state when loading group children
- Larger, responsive text
- Icon and text colors changed to secondary
- Smaller button sizes
- Content list description colors were standardized to body text
2019-06-24 13:05:21 +02:00
Ash McKenzie 88c8d177f8 Merge branch 'fix-labels-in-hooks' into 'master'
Fix label serialisation in issue and note hooks

Closes #63473

See merge request gitlab-org/gitlab-ce!29850
2019-06-24 10:56:19 +00:00
Bob Van Landuyt aae391a965 Merge branch 'show-confidential-merge-request-button' into 'master'
Show create merge request button on confidential issues

See merge request gitlab-org/gitlab-ce!29688
2019-06-24 10:42:07 +00:00
Lukas Eipert f8b28ac029
Upgrade jquery to 3.4.1 2019-06-24 12:34:04 +02:00
Kushal Pandya e64031af07 Merge branch 'update-tar-to-2.2.2' into 'master'
Update tar to 2.2.2

See merge request gitlab-org/gitlab-ce!29949
2019-06-24 09:54:37 +00:00
Jan Provaznik 4189ffe214 Added labels_hook_attrs method
Based on review comment fetching labels hook_attrs is now
wrapped in an issue's model method.
2019-06-24 11:51:34 +02:00
Phil Hughes d9242f206b
Show create merge request button on confidential issues
https://gitlab.com/gitlab-org/gitlab-ce/issues/58583
2019-06-24 10:50:08 +01:00
Lin Jen-Shin 733f384ba8 Merge branch 'fix-pipeline-schedule-edge-case' into 'master'
FIX: Scheduled pipelines scheduled to run at the same time as pipeline_schedule_worker gets pushed to the next run

Closes #63469

See merge request gitlab-org/gitlab-ce!29848
2019-06-24 09:38:33 +00:00
Douwe Maan 7821defab3 Merge branch 'sync-merge-ref-upon-mergeability-check' into 'master'
Automatically update MR merge-ref along merge status

See merge request gitlab-org/gitlab-ce!29569
2019-06-24 09:31:46 +00:00
Filipa Lacerda 833cb6e9f1 Merge branch 'gt-remove-tooltip-directive-on-project-avatar-image-component' into 'master'
Remove tooltip directive on project avatar image component

Closes #51990

See merge request gitlab-org/gitlab-ce!29631
2019-06-24 09:21:25 +00:00
Filipa Lacerda 6e8640a0b8 Merge branch 'services-form-ee-differences' into 'master'
Fix EE differences in services/_form.html.haml

Closes gitlab-ee#11032

See merge request gitlab-org/gitlab-ce!29931
2019-06-24 09:20:19 +00:00
Douwe Maan 480eb370a4 Merge branch 'fix-notes-emails-with-group-settings' into 'master'
Fix notes email with group-level notification email

Closes #63355

See merge request gitlab-org/gitlab-ce!29889
2019-06-24 09:20:11 +00:00
Sean McGivern e6532ca203 Fix notes email with group-level notification email
A Noteable doesn't have a group directly, unless it's an epic - we need
to look for the project's group to find the right email address.
2019-06-24 09:20:10 +00:00