Commit Graph

52947 Commits

Author SHA1 Message Date
Douwe Maan b3b6c78112 Merge branch '32748-emails-are-being-sent-with-the-wrong-language' into 'master'
Bugfix: Always use the default language when generating emails.

Closes #32748

See merge request !11662
2017-05-25 18:05:06 +00:00
Mike Greiling 643a10fcc8 update webpack to v2.6.1 patch release to fix "Can't find variable: Promise" error 2017-05-25 12:55:49 -05:00
Mike Greiling de451a8cdc update webpack-bundle-analyzer past v2.4.1 to support NamedChunksPlugin 2017-05-25 12:52:14 -05:00
Mike Greiling 5270edb701 name all webpack chunks to improve long term cacheability 2017-05-25 12:51:11 -05:00
Mike Greiling 5c0f506deb add NameAllModulesPlugin to cover shortcomings of NamedModulesPlugin 2017-05-25 12:50:24 -05:00
Mike Greiling 4f6ca7bc9c upgrade to latest webpack version 2017-05-25 12:50:18 -05:00
Nick Thomas eb21f93267 Only use DROP INDEX CONCURRENTLY on postgreql 9.2+ 2017-05-25 18:12:42 +01:00
winh f565c4393e Provide default for calculating label text color (!11681) 2017-05-25 19:08:37 +02:00
winh e63d27d83b Add failing test for #32728 2017-05-25 19:08:37 +02:00
Robert Speicher 43c3614ebf Merge branch '32762-gitaly-should-be-recompiled-when-gitaly_server_version-changes' into 'master'
Recompile test env Gitaly when `GITALY_SERVER_VERSION` fails

Closes #32762

See merge request !11664
2017-05-25 16:53:51 +00:00
Bryce Johnson 08a7073eb8 Fallback to false when remove_source_branch is null. 2017-05-25 12:47:06 -04:00
Bryce Johnson 8b746c22f7 Merge branch '32447-remove-source-branch-is-displayed-to-mergers-who-cannot-actually-delete-the-source-branch-from-a-forked-project' of gitlab.com:gitlab-org/gitlab-ce into 32447-remove-source-branch-is-displayed-to-mergers-who-cannot-actually-delete-the-source-branch-from-a-forked-project 2017-05-25 12:46:04 -04:00
Bryce Johnson 8d2a1591fb Update shouldRemoveSourceBranch against API entity changes. 2017-05-25 12:38:16 -04:00
Annabel Dunstone Gray 41441445a0 Merge branch '32801-fix-discussion-header-wrapping-in-parallel-diff' into 'master'
Fix note header author and time ago wrapping in parallel diff

Closes #32801

See merge request !11702
2017-05-25 16:24:04 +00:00
Grzegorz Bizon d9835145f9 Merge branch 'dm-more-dependency-linkers' into 'master'
Autolink package names in more dependency files

See merge request !11226
2017-05-25 16:23:21 +00:00
Phil Hughes d70f7f5d25 Merge branch 'fix-filtered-search-issuable-empty-state-exception' into 'master'
Fix filtered search issuable empty state exception

Closes #31455

See merge request !11347
2017-05-25 16:22:29 +00:00
Annabel Dunstone Gray 0fccbdbc69 Merge branch 'add-back-margin-to-note-text' into 'master'
Remove 0 margin bottom for last paragraph on note text

See merge request !11699
2017-05-25 16:20:13 +00:00
Ruben Davila 5c921809cd Bugfix: Always use the default language when generating emails.
There was a race condition issue when the application was generating an
email and was using a language that was previously being used in other
request.
2017-05-25 10:22:45 -05:00
Robert Speicher 516e3532c6 Merge branch 'revert-b0498c17' into 'master'
Refactor `DynamicPathValidator` and `GitLab::Regex` some more

See merge request !11693
2017-05-25 15:14:16 +00:00
Felipe Artur 0054963544 Remove unecessary commit pattern check 2017-05-25 12:13:32 -03:00
Phil Hughes 83060667b0 Fixed locale frontend not picking up regions
This was caused by a webpack config issue that would only look in folders that only had lower case letters. This has been changed to include any word character

Closes #32913
2017-05-25 16:03:21 +01:00
Douwe Maan 41e4072393 Add regexp_for_value helper method 2017-05-25 09:39:18 -05:00
Luke "Jared" Bennett 56797a84c8
Remove shared example and improve sub_group_issuables_spec.rb 2017-05-25 15:26:18 +01:00
Luke "Jared" Bennett e048304456
Remove 'should' from scenario in has_subgroup_title_spec.rb 2017-05-25 15:20:21 +01:00
Grzegorz Bizon 6a88f187be Merge branch 'fix-kubernetes-namespace' into 'master'
Fix terminals support for Kubernetes service

Closes #31754

See merge request !11653
2017-05-25 13:49:39 +00:00
Douwe Maan 5b67839bc3 Merge branch 'grpc-1.3.4' into 'master'
Use grpc 1.3.4

See merge request !11645
2017-05-25 13:46:26 +00:00
Douwe Maan 4ba547809f Cartfile git and binary methods cannot take a GitHub repo 2017-05-25 08:43:47 -05:00
Dmitriy Zaporozhets 1ed7b7629a Merge branch '17848-web-hook-logging' into 'master'
Implement Web Hooks calls logging

Closes #17848

See merge request !11027
2017-05-25 13:26:12 +00:00
Kamil Trzcinski 911e1c2d07 Fix terminals support for Kubernetes service
It was broken, because we introduced a default namespace, which was not used by terminal methods.
2017-05-25 15:03:39 +02:00
Balasankar C 88811a7733
Pass EE variable if needed 2017-05-25 17:01:15 +05:30
Marin Jankovski 78de1c059a Merge branch 'zj-faster-image-trigger-builds' into 'master'
Use smaller image when triggering a build

See merge request !11674
2017-05-25 11:19:02 +00:00
Grzegorz Bizon 6ece979266 Merge branch 'correct-compare_spec-transient' into 'master'
Fix transient error clicking dropdown items in compare_spec.rb

See merge request !11582
2017-05-25 10:00:15 +00:00
Phil Hughes ed6bf343c8 Fixed create new label form in issue form not working for sub-group projects
Closes #32906
2017-05-25 10:09:16 +01:00
Achilleas Pipinellis b216739748 Merge branch 'update-helm-source-ip-docs' into 'master'
Add notes to the kubernetes install docs regarding source IPs

Closes #32890

See merge request !11697
2017-05-25 09:04:20 +00:00
Achilleas Pipinellis 1086a3bdbd Merge branch 'mrchrisw-add-mr-stats' into 'master'
Add docs on milestone percentage stats

See merge request !11428
2017-05-25 09:02:27 +00:00
Luke "Jared" Bennett d3655fe56f
Add review comments to compare_spec.rb 2017-05-25 09:21:52 +01:00
Luke "Jared" Bennett 4497ca87c4
Fix transient error clicking dropdown items in compare_spec.rb 2017-05-25 09:21:06 +01:00
Phil Hughes 7c7fe22c27 Merge branch '32850-award-emoji-off' into 'master'
Fix alignment of hover state on emoji button

Closes #32850

See merge request !11691
2017-05-25 07:47:18 +00:00
Phil Hughes 7737ef52a9 Merge branch '32807-company-icon' into 'master'
Use briefcase icon for company

Closes #32807

See merge request !11692
2017-05-25 07:39:58 +00:00
Grzegorz Bizon 2c33ee9e22 Dockerize headless chrome browser for GitLab QA 2017-05-25 09:36:39 +02:00
Grzegorz Bizon 6984c2eede Use headless chrome instead of webkit via QtWebkit 2017-05-25 09:36:39 +02:00
Phil Hughes 7ea9c5ce9a Merge branch 'fix-raven-jquery-dep' into 'master'
Use non-global jQuery reference within raven bundle

Closes #32662

See merge request !11581
2017-05-25 07:12:36 +00:00
Luke "Jared" Bennett 710e35378a Use non-global jQuery reference within raven bundle 2017-05-25 07:12:36 +00:00
Alexander Randa 330789c23c Implement web hooks logging
* implemented logging of project and system web hooks
* implemented UI for user area (project hooks)
* implemented UI for admin area (system hooks)
* implemented retry of logged webhook
* NOT imeplemented log remover
2017-05-25 10:07:52 +03:00
Eric Eastwood 068e5e21b3 Fix note header author and time ago wrapping in parallel diff
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32801
2017-05-25 00:02:58 -05:00
Chris Wilson 2e98f5bcbc Add docs on milestone percentage stats
Clarify how the milestone percentage is calculated in the docs.
Include example image of milestone.
2017-05-25 14:31:12 +10:00
tauriedavis e2f4e288e6 Remove 0 margin bottom for last paragraph on note text 2017-05-24 18:39:47 -07:00
Oswaldo Ferreira 33923a49f8 Expose remove_source_branch boolean/null 2017-05-24 21:54:57 -03:00
Douwe Maan ec2130bea8 Merge branch 'feature/rss-scoped-token' into 'master'
Use rss token for atom access

See merge request !11647
2017-05-24 23:47:12 +00:00
Robert Speicher d893b8970a Merge branch '32799-remove-no_turbolink-attribute-from-haml' into 'master'
Remove redundant data-turbolink attributes from links

Closes #32799

See merge request !11672
2017-05-24 23:43:22 +00:00