69b4c5c011
Exclude comments from specific docs
2017-11-01 15:56:40 +00:00
5c1459ef0f
Merge branch '35914-merge-request-update-worker-is-slow' into 'master'
...
Add metrics tagging to the sidekiq middleware
See merge request gitlab-org/gitlab-ce!15111
2017-11-01 14:14:17 +00:00
e1f1189993
Merge branch 'refactor/group_links_controller' into 'master'
...
Refactor/group links controller
See merge request gitlab-org/gitlab-ce!15121
2017-11-01 14:08:18 +00:00
af1fb49323
Refactor/group links controller
2017-11-01 14:08:18 +00:00
d5859bb9d5
rework the UpdateMergeRequestsWorker#metrics_tags
2017-11-01 09:07:27 -04:00
713052c725
Merge branch '38869-labels' into 'master'
...
Export logo and labels select as ES6 modules
See merge request gitlab-org/gitlab-ce!15091
2017-11-01 12:32:16 +00:00
1fc4e2b6c6
Export logo and labels select as ES6 modules
2017-11-01 12:32:15 +00:00
b6e69673fd
Merge branch 'backport-workhorse-show-all-refs' into 'master'
...
Support show-all-refs for git over HTTP
See merge request gitlab-org/gitlab-ce!14834
2017-11-01 11:25:51 +00:00
466b776323
Merge branch '39628-bug-in-the-procedure-advised-from-ee_compat_check' into 'master'
...
Resolve "Bug in the procedure advised from ee_compat_check"
Closes #39628
See merge request gitlab-org/gitlab-ce!15110
2017-11-01 11:20:57 +00:00
e457f3fbff
Merge branch 'lazy-load-check-when-has-images' into 'master'
...
Increase lazy loader performance
See merge request gitlab-org/gitlab-ce!15114
2017-11-01 10:03:07 +00:00
7300162727
Merge branch 'feature/migrate-find-wiki-file-to-gitaly' into 'master'
...
Migrate Gitlab::Git::Wiki#file to Gitaly
Closes gitaly#689
See merge request gitlab-org/gitlab-ce!15014
2017-11-01 09:43:21 +00:00
6306e797ac
Merge branch 'rc-qa-mattermost-login' into 'master'
...
Add login mattermost to Test::Integration::Mattermost
See merge request gitlab-org/gitlab-ce!15033
2017-11-01 09:32:30 +00:00
f9a85b0c8c
Merge branch 'go-get-ssh' into 'master'
...
Returns a SSH url for go-get=1
Closes #38858
See merge request gitlab-org/gitlab-ce!14990
2017-11-01 09:30:39 +00:00
405ecbe51b
Merge branch '39633-convert-fuzzaldrin-plus-js-library-to-be-a-yarn-managed-library' into 'master'
...
Resolve "Convert fuzzaldrin-plus.js library to be a Yarn managed library"
Closes #39633
See merge request gitlab-org/gitlab-ce!15097
2017-11-01 08:58:42 +00:00
e148f1f9f2
Resolve "Convert fuzzaldrin-plus.js library to be a Yarn managed library"
2017-11-01 08:58:41 +00:00
1cc92dae77
Returns a ssh url for go-get=1
2017-10-31 19:22:40 -02:00
56e53556c5
Migrate Gitlab::Git::Wiki#file to Gitaly
...
Closes gitaly#689
2017-10-31 20:49:41 +02:00
0134079430
Merge branch 'feature/migrate-find-wiki-page-to-gitaly' into 'master'
...
Migrate Gitlab::Git::Wiki#page to Gitaly
Closes gitaly#677
See merge request gitlab-org/gitlab-ce!14955
2017-10-31 18:38:00 +00:00
85a6779910
Merge branch 'dm-ldap-identity-normalize-dn' into 'master'
...
Normalize LDAP DN when looking up identity
Closes #39559
See merge request gitlab-org/gitlab-ce!15103
2017-10-31 17:36:51 +00:00
2b7e03cf69
reword `targets` to `metric tags`
...
add changelog
2017-10-31 13:21:08 -04:00
1f60cd8cd7
Increase lazy loader performance
...
This stops the checkElementsInView method from running when there aren't any lazy load images on the page. By calling this method we are causing an unnecessary reflow which on large pages is a massive performance issue
2017-10-31 17:18:09 +00:00
01c9549224
Merge branch '39580-bump-carrierwave-to-1-2-1' into 'master'
...
Bump carrierwave to 1.2.1
Closes #39580
See merge request gitlab-org/gitlab-ce!15072
2017-10-31 16:51:58 +00:00
b2373e3d6c
Ensure the ee-compat-check uses the correct patch URL for forks
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-10-31 17:44:07 +01:00
b86c3a7365
Merge branch 'multi-file-editor-vuex' into 'master'
...
Move multi-file editor store to Vuex
See merge request gitlab-org/gitlab-ce!15046
2017-10-31 16:30:56 +00:00
964cbb67da
Migrate Gitlab::Git::Wiki#page to Gitaly
...
Closes gitaly#677
2017-10-31 18:28:54 +02:00
9f198dc38a
Merge branch 'zj/gitlab-ce-zj-ruby-2.3.5' into 'master'
...
Upgrade Ruby to 2.3.5
See merge request gitlab-org/gitlab-ce!15099
2017-10-31 16:20:39 +00:00
979e3a592b
Merge branch 'docs/improve-maintenance' into 'master'
...
Improve the maintenance policy page
See merge request gitlab-org/gitlab-ce!15112
2017-10-31 16:19:03 +00:00
fe80967bfb
Merge branch '23206-load-participants-async' into 'master'
...
Load participants async
Closes #23206
See merge request gitlab-org/gitlab-ce!14836
2017-10-31 16:15:05 +00:00
6dc9028fbb
Load participants async
2017-10-31 16:15:03 +00:00
8399de0c96
Normalize LDAP DN when looking up identity
2017-10-31 17:13:50 +01:00
74a0e855e1
Merge branch 'fix/import-issue-assignees' into 'master'
...
Fix missing issue assignees
Closes #39170
See merge request gitlab-org/gitlab-ce!15109
2017-10-31 16:08:55 +00:00
5390655290
Improve the maintenance policy page
...
Make clear that we may backport bug fixes to the previous stable
release.
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-10-31 17:05:06 +01:00
46ff7e2879
Merge branch '39509-fix-wiki-create-sidebar-overlap' into 'master'
...
Fix overlap of right-sidebar and wiki create page form
Closes #39509
See merge request gitlab-org/gitlab-ce!15075
2017-10-31 15:49:54 +00:00
a479362d51
Merge branch '31454-missing-project-id-pipeline-hook-data' into 'master'
...
Adds project_id to pipeline hook data
Closes #31454
See merge request gitlab-org/gitlab-ce!15044
2017-10-31 15:36:15 +00:00
da17419418
add changelog
2017-10-31 16:29:39 +01:00
3a887c92d0
fix spec failure
2017-10-31 16:13:09 +01:00
bb43bb8f9b
Merge branch 'issue_38777' into 'master'
...
Allow promoting project milestones to group milestones
Closes #38777
See merge request gitlab-org/gitlab-ce!14831
2017-10-31 15:03:53 +00:00
2f8577d45e
Allow promoting project milestones to group milestones
2017-10-31 15:03:52 +00:00
bd33a8290a
Merge branch 'feature/migrate-wiki-delete-page-to-gitaly' into 'master'
...
Migrate Gitlab::Git::Wiki#delete_page to Gitaly
Closes gitaly#673
See merge request gitlab-org/gitlab-ce!14910
2017-10-31 14:35:57 +00:00
568508c7d5
Merge branch '39561-seed_fu-fails-to-load-gitlab-test' into 'master'
...
Handle large values on `MergeRequestDiffCommit` dates
Closes #39561
See merge request gitlab-org/gitlab-ce!15093
2017-10-31 14:34:02 +00:00
7799a9bc44
add metrics tagging to the sidekiq middleware
2017-10-31 09:48:10 -04:00
bfb5107ae7
Merge branch 'patch-29' into 'master'
...
Fix example typo.
See merge request gitlab-org/gitlab-ce!15104
2017-10-31 13:34:59 +00:00
4bce563c6b
fix specs
2017-10-31 14:26:51 +01:00
a7829863c8
Be able to bundle gems with newer rubies
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-10-31 14:19:14 +01:00
2994de7590
Upgrade Ruby to 2.3.5
...
Part of gitlab-org/gitlab-ce#38040
2017-10-31 14:19:14 +01:00
c598283a16
Merge branch '38869-issue' into 'master'
...
Remove issue and issue status select from global namespace
See merge request gitlab-org/gitlab-ce!15090
2017-10-31 13:14:38 +00:00
682923b79b
Merge branch '3674-hashed-storage-attachments' into 'master'
...
Hashed Storage support for Attachments
See merge request gitlab-org/gitlab-ce!15068
2017-10-31 12:18:47 +00:00
de16fb138b
Merge branch '39639-clusters-poll' into 'master'
...
Adds callback function to initial cluster request
Closes #39639
See merge request gitlab-org/gitlab-ce!15105
2017-10-31 12:14:59 +00:00
f2f24f05f8
fixed up upload feature after master merge
2017-10-31 12:13:29 +00:00
19bf710354
Merge branch '39619-cancel-merge-when-pipeline-succeeds-from-the-api-fails' into 'master'
...
Fix namespacing for MergeWhenPipelineSucceedsService in MR API
Closes #39619
See merge request gitlab-org/gitlab-ce!15088
2017-10-31 11:58:38 +00:00
Achilleas Pipinellis
Sean McGivern
Douwe Maan
Francisco Javier López
micael.bergeron
Phil Hughes
Filipa Lacerda
Grzegorz Bizon
Tim Zallmann
Guilherme Vieira
Ahmad Sherif
Rémy Coutable
Stan Hu
Eric Eastwood
Douwe Maan
Annabel Dunstone Gray
James Lopez
Felipe Artur
Zeger-Jan van de Weg