df7eaa85cb
Merge branch 'es-module-copy_as_gfm' into 'master'
...
Convert copy_as_gfm into ES module and move to behaviors
See merge request gitlab-org/gitlab-ce!14859
2017-11-06 22:55:30 +00:00
243530360e
Merge branch '34768-fix-issuable-header-wrapping' into 'master'
...
34768 Fix problem with issuable header wrapping when content is too long
Closes #34768
See merge request gitlab-org/gitlab-ce!15192
2017-11-06 22:44:20 +00:00
b22f4d2aad
Merge branch '20666-404-error-issue-assigned-with-issues-disabled' into 'master'
...
Fixes 404 error to `Issues assigned to me` and `Issues I've created` when issues are disabled
Closes #20666
See merge request gitlab-org/gitlab-ce!15021
2017-11-06 22:39:07 +00:00
c71cf908cd
Merge branch 'refactor-clusters' into 'master'
...
Refactor Clusters to be consisted from GcpProvider and KubernetesPlatform
See merge request gitlab-org/gitlab-ce!14879
2017-11-06 21:21:27 +00:00
4da03e9977
Merge branch 'pawel/metrics-to-prometheus-33643' into 'master'
...
Add all InfluxDB metrics to prometheus
See merge request gitlab-org/gitlab-ce!13891
2017-11-06 21:17:24 +00:00
c3d15fa620
Merge branch 'rc-qa-tags-mistake' into 'master'
...
Fixup rspec tag misuse
See merge request gitlab-org/gitlab-ce!15227
2017-11-06 21:01:52 +00:00
d4a9aedf55
Fixes 404 error to `Issues assigned to me` and `Issues I've created` when issues are disabled
...
The dropdown options `Issues assigned to me` and `Issues I've created` in project search are now
hidden when issues are disabled on the project.
2017-11-06 21:30:18 +01:00
21d8ec1537
Merge branch 'fix-md-form-tabs-double-click-toggle' into 'master'
...
Fix md form tab double click toggle
Closes #39624
See merge request gitlab-org/gitlab-ce!15119
2017-11-06 20:20:28 +00:00
50e8fe348c
Merge branch '38385-gpg-tooltips-not-working-in-safari' into 'master'
...
Resolve "GPG tooltips not working in Safari"
Closes #38385
See merge request gitlab-org/gitlab-ce!15228
2017-11-06 20:01:51 +00:00
e459deec85
add CHANGELOG.md entry for !15228
2017-11-06 12:59:51 -06:00
63834c9cac
fix GPG signature popover trigger for Safari and Firefox
2017-11-06 12:58:25 -06:00
9de635bd95
Merge branch '39757-border-zero-of-scss-lint' into 'master'
...
Enable BorderZero rule in scss-lint
Closes #39757
See merge request gitlab-org/gitlab-ce!15168
2017-11-06 18:39:53 +00:00
74d6b8a211
Fixup rspec tag misuse
...
In !14818 we added the ability to specify the example groups that should
run via the `-t` (tag) option to rspec. It was assumed that the
inclusion filter generated `{:core => true, :mattermost => true}` would
run examples tagged :core OR :mattermost, when instead it means :core
AND :mattermost.
Here in order to assure at least some tests run, we specify that
the :mattermost tagged examples are the only ones we care about.
2017-11-06 17:54:21 +00:00
d035bdbe3c
Merge branch '38589-internationalize-tags-page' into 'master'
...
Resolve "Internationalize tags page"
Closes #38589
See merge request gitlab-org/gitlab-ce!15165
2017-11-06 17:43:45 +00:00
045795d0d9
Merge branch 'remove-ensure-ref-fetched-from-controllers' into 'master'
...
removed the #ensure_ref_fetched from all controllers
Closes #36061
See merge request gitlab-org/gitlab-ce!15129
2017-11-06 17:10:18 +00:00
2ea90ffcf1
Merge branch 'revert-unintentional-changes-in-mr-12810' into 'master'
...
Revert unintentional changes in !12810
Closes #39816
See merge request gitlab-org/gitlab-ce!15198
2017-11-06 17:05:55 +00:00
cc058de8df
Merge branch 'pawel/show_empty_page_when_prometheus_metrics_are_disabled-35639' into 'master'
...
Make Prometheus metrics endpoint return empty response when metrics are disabled
Closes #35639
See merge request gitlab-org/gitlab-ce!14490
2017-11-06 17:02:22 +00:00
c76426fc64
Merge branch '27375-dashboard-activity-performance' into 'master'
...
Resolve "DashboardController#activity.json is slow due to SQL"
Closes #27375
See merge request gitlab-org/gitlab-ce!14985
2017-11-06 16:52:59 +00:00
bf0331dc72
Resolve "DashboardController#activity.json is slow due to SQL"
2017-11-06 16:52:56 +00:00
21ec0b1413
consistency fixes
2017-11-06 10:30:06 -06:00
34a205b308
Merge branch 'add-reconfigure-logs' into 'master'
...
Add reconfigure docs to CE
See merge request gitlab-org/gitlab-ce!15224
2017-11-06 16:15:01 +00:00
a48d0595ab
Merge branch 'jej/fs-prevent-push-when-missing-objects' into 'master'
...
Prevent git push when LFS objects are missing
Closes #24564
See merge request gitlab-org/gitlab-ce!13837
2017-11-06 16:10:25 +00:00
1400ffae1b
Add reconfigure docs to CE
2017-11-06 17:49:54 +02:00
ad118080cf
Merge branch 'dm-block-group-and-project-creation-when-external-by-default' into 'master'
...
Make sure group and project creation is blocked for new users that are external by default
Closes #39664
See merge request gitlab-org/gitlab-ce!15212
2017-11-06 15:48:08 +00:00
8a26706141
Merge branch '39668-tooltip-safari' into 'master'
...
Remove native title tooltip in pipeline jobs dropdown in Safari
Closes #39668
See merge request gitlab-org/gitlab-ce!15213
2017-11-06 15:27:37 +00:00
892de12db0
Internationalized the tags page
2017-11-06 09:27:25 -06:00
d934d6504a
updated the ignore_column concern to support multiple columns
...
This method is an ActiveRecord extension and it should behave
like one. I expected this to work.
2017-11-06 10:20:20 -05:00
0d18f35fbd
Merge branch 'winh-skip-parsePikadayDate-test' into 'master'
...
Temporarily remove parsePikadayDate test
Closes #39834
See merge request gitlab-org/gitlab-ce!15217
2017-11-06 15:01:11 +00:00
ef2c5e321d
Merge branch 'dm-reallow-project-path-ending-in-period' into 'master'
...
Reallow project paths ending in periods
Closes #39695
See merge request gitlab-org/gitlab-ce!15190
2017-11-06 14:58:14 +00:00
05f41253a9
Add Changelog
2017-11-06 15:43:38 +01:00
2bfde53d32
Merge branch '38247-hide-create-mr-button-in-issue-show' into 'master'
...
Remove create MR button from issues when MRs are disabled
Closes #38247
See merge request gitlab-org/gitlab-ce!15071
2017-11-06 14:33:38 +00:00
4c31455a6b
Remove create MR button from issues when MRs are disabled
2017-11-06 14:33:37 +00:00
df75643334
Replaced subject with subject.exec in spec/lib/gitlab/checks/change_access_spec.rb
2017-11-06 14:33:10 +00:00
a7b7a2253c
Prevent git push when LFS objects are missing
2017-11-06 14:33:10 +00:00
5ab3ed7a9a
align with the comments
2017-11-06 09:23:41 -05:00
634a152760
Make sure group and project creation is blocked for new users that are external by default
2017-11-06 15:19:15 +01:00
1e94172e38
Merge branch 'winh-use-vue-warnhandler' into 'master'
...
Use Vue warnhandler
Closes #33849
See merge request gitlab-org/gitlab-ce!15152
2017-11-06 14:10:33 +00:00
a99ad59e65
Remove 10.3 comments (Tracked by a tech debts issue). Refactor spec factory name. Use ArgumentError
2017-11-06 23:06:10 +09:00
bb0543ef47
ignore the column before the migration
...
reword the changelog
remove dead code in the specs
2017-11-06 09:03:11 -05:00
19737aeaa9
Remove parsePikadayDate test
2017-11-06 14:54:33 +01:00
a10925e1c3
Reallow project paths ending in periods
2017-11-06 14:46:53 +01:00
cfc932cad1
Merge branch 'jk-delete-epic-backport' into 'master'
...
Refactor issuable destroy action
See merge request gitlab-org/gitlab-ce!15203
2017-11-06 13:32:54 +00:00
a6fad00c16
Merge branch '39790-use-the-parallel-rubocop-option-in-the-static-analysis-ci-job' into 'master'
...
Resolve "Use the `--parallel` Rubocop option in the static-analysis CI job"
Closes #39790
See merge request gitlab-org/gitlab-ce!15183
2017-11-06 13:24:36 +00:00
cfd09fe883
Merge branch 'ignore-legacy-routes-in-routing-spec' into 'master'
...
Ignore routes matching legacy_*_redirect in route specs
See merge request gitlab-org/gitlab-ce!15208
2017-11-06 12:53:54 +00:00
51f73b86ad
Use Vue warnhandler
2017-11-06 13:36:07 +01:00
68e3c41571
Revert unintentional changes in !12810
2017-11-06 21:22:26 +09:00
d77b971540
Merge branch '38597-editor-icons' into 'master'
...
Resolve "Editor icons"
Closes #38597
See merge request gitlab-org/gitlab-ce!15169
2017-11-06 12:04:56 +00:00
57497f6f30
Resolve "Editor icons"
2017-11-06 12:04:55 +00:00
906d2f03d1
Refactor issuable destroy action
2017-11-06 13:02:50 +01:00
db6a125d4d
Merge branch 'docs/add-link-to-brand-ai' into 'master'
...
Add link to GitLab brand.ai page in docs
See merge request gitlab-org/gitlab-ce!15161
2017-11-06 11:55:31 +00:00
Filipa Lacerda
Annabel Dunstone Gray
Clement Ho
Grzegorz Bizon
Jacopo
Jacob Schatz
Mike Greiling
Richard Clamp
Tim Zallmann
Sean McGivern
Douwe Maan
Francisco Javier López
Jose Ivan Vargas
Stan Hu
micael.bergeron
Pawel Chojnacki
Rémy Coutable
George Andrinopoulos
James Edwards-Jones
Douwe Maan
Phil Hughes
Shinya Maeda
Winnie Hellmann
Takuya Noguchi
Jarka Kadlecova
Achilleas Pipinellis