27fb64d6a3
Remove deltas_only from DiffCollection
2017-05-11 16:01:10 +02:00
f737a079ce
Merge branch '31781-print-rendered-files-not-possible' into 'master'
...
Include blob content when printing page
Closes #31781
See merge request !11247
2017-05-11 13:40:15 +00:00
2e92c5c458
Merge branch 'docs/complement-tech-articles' into 'master'
...
Complement tech articles guidelines
See merge request !11260
2017-05-11 10:51:41 +00:00
9e8ed540b7
Complement tech articles guidelines
2017-05-11 10:51:39 +00:00
aec53bab05
Merge branch 'patch-18' into 'master'
...
Update getting_started_part_one.md.
See merge request !11020
2017-05-11 10:25:44 +00:00
365cda5702
Merge branch 'docs/fix-broken-link' into 'master'
...
Fix a broken link for the "How to Configure LDAP with GitLab EE" article
See merge request !11114
2017-05-11 10:25:06 +00:00
f07a7993e4
Merge branch 'master' into 'master'
...
Update README.md with Authentication projects example
See merge request !11162
2017-05-11 10:23:23 +00:00
667005d5ac
Merge branch 'dm-fix-mysql-failure' into 'master'
...
Fix MySQL build failure
Closes #32106
See merge request !11277
2017-05-11 09:18:42 +00:00
934e8d1a65
Merge branch '32016-slash-command-strip-fix' into 'master'
...
Fix slash commands detection in comments
Closes #32016
See merge request !11265
2017-05-11 09:05:08 +00:00
5c25629a14
Fix slash commands detection in comments
2017-05-11 09:05:07 +00:00
344fee5a9a
Merge branch '32045-vue-warn-cannot-find-element-issuable-time-tracker' into 'master'
...
Remove sidebar bundle spec
Closes #32045
See merge request !11223
2017-05-11 08:40:12 +00:00
6abd3c62ae
Merge branch 'issue_api_change' into 'master'
...
Issue API change: assignee_id parameter and assignee object in a response
See merge request !11271
2017-05-11 08:32:10 +00:00
1c75e4e6a0
Merge branch 'dm-auxiliary-viewers' into 'master'
...
Implement auxiliary blob viewers
See merge request !11195
2017-05-11 08:26:05 +00:00
4067dd4f84
Merge branch '32087-fix-flickering-system-notes' into 'master'
...
Fix flickering of system notes
Closes #32087
See merge request !11281
2017-05-11 07:57:38 +00:00
226f3bb94f
Merge branch '31625-tag-editor-loses-all-inputs-when-you-try-to-add-a-tag-that-already-exists' into 'master'
...
Resolve "Tag editor loses all inputs when you try to add a tag that already exists"
Closes #31625
See merge request !11155
2017-05-11 07:49:07 +00:00
64d6569c12
Merge branch '32094-custom-notifications-model-aria-labelledby-incorrect' into 'master'
...
Fix aria labels on custom notifications modal
Closes #32094
See merge request !11256
2017-05-11 07:39:26 +00:00
08edfb67b1
Fix flickering of system notes
...
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32087
Easy reproduction:
1. Edit an issue title
1. Notice the system note added
1. Switch to another tab and back (to fire the polling immediately)
1. Notice the flicker (without this fix)
2017-05-10 22:15:03 -05:00
965b41769f
Fix MySQL build failure
2017-05-10 20:33:51 -05:00
1ccf101eef
Merge branch 'fix-shortcuts_spec-explore-page-transient-failure' into 'master'
...
Find the nothing-here-block before asserting page content when on explore page of shortcuts_spec.rb
See merge request !11250
2017-05-11 01:07:16 +00:00
9099750513
Add changelog
2017-05-10 20:07:05 -05:00
77798c6506
Reset Repository#license memo when license file is changed
2017-05-10 20:07:04 -05:00
08706f6837
Implement auxiliary blob viewers
2017-05-10 20:07:04 -05:00
62c93ab912
Merge branch 'docs/hide-gcp-install' into 'master'
...
Hide GCP install guide from index page until our image is released
Closes omnibus-gitlab#2326
See merge request !11213
2017-05-10 22:40:06 +00:00
81df0034f4
Merge branch 'retried-in-database-mysql' into 'master'
...
Retried in database
Closes #25737
See merge request !11115
2017-05-10 22:07:05 +00:00
4086fca0f4
Merge branch 'winh-pending-ajax-cache' into 'master'
...
Track pending requests in AjaxCache
See merge request !11170
2017-05-10 22:01:02 +00:00
b304d41232
Track pending requests in AjaxCache
2017-05-10 22:01:00 +00:00
bae0a060ea
Merge branch 'enforce-current-user-usage-on-entities' into 'master'
...
Make all Serializers receive `current_user` instead `user` [CE]
See merge request !11254
2017-05-10 22:00:52 +00:00
cb2f739d48
Merge branch '27144-enforce-rubocop-trailing_commas-no_comma-style' into 'master'
...
Resolve "Use consistent style for trailing commas"
Closes #27144
See merge request !11063
2017-05-10 21:43:34 +00:00
2434d135d6
Keep input data after creating existing tag
2017-05-10 17:39:50 -04:00
c8bbe191b6
Issue API change: assignee_id parameter and assignee object in a response
2017-05-11 00:00:02 +03:00
000045e664
Merge branch 'fix-api-headings' into 'master'
...
Add "API" to API docs
Closes #32105
See merge request !11261
2017-05-10 20:23:19 +00:00
76ac0e46d8
Remove sidebar bundle spec
2017-05-10 14:32:40 -05:00
9c7d87ef0e
Merge branch 'master' into 'docs/hide-gcp-install'
...
# Conflicts:
# doc/install/README.md
2017-05-10 18:57:19 +00:00
d5eb66663e
update API doc with +API (h1 heading)
2017-05-10 15:48:07 -03:00
180ec7113e
Merge branch 'bvl-security-patches' into 'master'
...
Security patches -> `master`
See merge request !11230
2017-05-10 18:26:02 +00:00
368bf99eb7
Remove unnecessary user hash being passed to DeploymentSerializer
2017-05-10 15:21:31 -03:00
f4b6865aef
Fix aria labels on custom notifications modal
2017-05-10 13:41:47 -04:00
09c4d27ae4
Merge branch '31474-issue-boards-sidebar-milestone-dropdown-should-not-be-multi-select' into 'master'
...
Resolve "Issue boards sidebar milestone dropdown should not be multi select"
Closes #31474
See merge request !11084
2017-05-10 17:15:19 +00:00
05a2ef690b
Merge branch 'tc-clean-pending-delete-projects' into 'master'
...
Post-deploy to clean `pending_delete` projects
Closes #20984
See merge request !11044
2017-05-10 17:11:36 +00:00
0f576b94e1
Merge branch 'cycle-analytics-stage-title-translation-fix' into 'master'
...
Fixed the stage title translation in cycle analytics
See merge request !11252
2017-05-10 17:03:04 +00:00
63b49c3ce9
Merge branch '30949-empty-states' into 'master'
...
Center all empty states
Closes #30949
See merge request !11249
2017-05-10 16:57:40 +00:00
343e37b88e
Center all empty states
2017-05-10 16:57:39 +00:00
f6d8245568
Merge branch 'center-related-merge-request-items-horizontally' into 'master'
...
Center related merge request items horizontally
See merge request !11163
2017-05-10 16:52:35 +00:00
46785604db
Merge branch 'dm-discussion-diff-header-toggle' into 'master'
...
Remove unused toggle from diff discussion diff headers
See merge request !11192
2017-05-10 16:42:34 +00:00
d81794ad49
Merge branch 'dm-async-tree-readme' into 'master'
...
Load tree readme asynchronously
See merge request !11191
2017-05-10 16:41:36 +00:00
9d08dddfdb
Ensure all Serializers receive `current_user` instead `user`
2017-05-10 13:30:54 -03:00
3db37e0562
Enable the Style/TrailingCommaInArguments cop
...
Use the EnforcedStyleForMultiline: no_comma option.
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-05-10 18:25:45 +02:00
d40e1f547e
Enable the Style/TrailingCommaInLiteral cop
...
Use the EnforcedStyleForMultiline: no_comma option.
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-05-10 18:25:45 +02:00
566ee14516
Merge branch 'remove-old-isobject' into 'master'
...
Replace old isObject for underscore methods
Closes #30317
See merge request !11124
2017-05-10 16:17:31 +00:00
269c0fe007
Replace old isObject for underscore methods
2017-05-10 16:17:31 +00:00
Jacob Vosmaer
Annabel Dunstone Gray
Sean Packham (GitLab)
Marcia Ramos
Achilleas Pipinellis
Sean McGivern
Filipa Lacerda
Kushal Pandya
Phil Hughes
Eric Eastwood
Douwe Maan
Douwe Maan
Regis Boudinot
Clement Ho
Winnie Hellmann
Kamil Trzciński
Robert Speicher
Sam Rose
Valery Sizov
Oswaldo Ferreira
Rémy Coutable