b8a96fda9c
Fixed the preview keyboard shortcut focusing wrong tab
...
Closes #31101
2017-04-21 14:19:08 +01:00
f09f753908
Merge branch 'environments-vue-2' into 'master'
...
Refactor into .vue files part 2
See merge request !10791
2017-04-20 09:04:08 +00:00
324aa1413e
Refactor into .vue files part 2
2017-04-20 09:04:06 +00:00
08b2e7cd8f
Merge branch 'plantuml-filter-after-highlight' into 'master'
...
Fix PlantUML integration in GFM
Closes #30557
See merge request !10651
2017-04-20 07:06:05 +00:00
6e1069d57e
Merge branch 'dm-markup-helper-constants' into 'master'
...
Use constants in Gitlab::MarkupHelper
See merge request !10741
2017-04-20 00:39:31 +00:00
3509534a03
Use constants in Gitlab::MarkupHelper
2017-04-20 00:39:29 +00:00
ceb1ebc9d9
Merge branch 'dm-fix-editing-files-on-forks' into 'master'
...
Refactor changing files in web UI
Closes #28711
See merge request !9323
2017-04-20 00:37:47 +00:00
d170133bde
Refactor changing files in web UI
2017-04-20 00:37:44 +00:00
bfb635a4af
Merge branch 'hook_retries' into 'master'
...
Add retries to system hook worker
Closes #31109
See merge request !10801
2017-04-19 23:33:46 +00:00
3fecb4bee9
Merge branch 'sh-issue-29247-fix' into 'master'
...
Don't delete a branch involved in an open merge request in "Delete all merged branches" service
Closes #29427
See merge request !10727
2017-04-19 22:12:27 +00:00
354e37b869
Add retry to system hook worker
...
The default number of Sidekiq retries is 25 over about 21 days.
If an external system is unavailable for a length of time, hooks
can pile up in the Sidekiq queues. If the situation gets bad enough
the retry jobs dropping back into the main queue can slow down
other jobs. Limit the retries to a sane number to avoid this
scenario.
2017-04-19 16:44:49 -05:00
b638e45c6b
Merge branch '30951-start-discussion-toggle-clicking-divider-causes-ui-break' into 'master'
...
Resolve "start discussion toggle clicking divider causes UI break"
Closes #30951
See merge request !10715
2017-04-19 21:18:40 +00:00
16e291b9c6
Resolve "start discussion toggle clicking divider causes UI break"
2017-04-19 21:18:39 +00:00
28c63ce380
Merge branch 'sh-add-index-to-system-note-metadata' into 'master'
...
Add unique index to system note metadata
See merge request !10774
2017-04-19 20:33:49 +00:00
93e23a5d71
Merge branch 'query-users-by-extern-uid' into 'master'
...
Implement search by extern_uid in Users API
See merge request !10509
2017-04-19 19:50:38 +00:00
a4688d9d9a
Merge branch '29977-style-comments-and-system-notes-real-time-updates' into 'master'
...
Add renderNote animation and added spec
Closes #29977
See merge request !10623
2017-04-19 19:48:49 +00:00
0fc1e04f4c
Add renderNote animation and added spec
2017-04-19 19:48:48 +00:00
7125c96668
Merge branch 'right-sidebar-closed-default-mobile' into 'master'
...
Set the issuable sidebar to remain collapsed on mobile devices
Closes #28086
See merge request !10323
2017-04-19 19:10:19 +00:00
a63b18b14f
Set the issuable sidebar to remain collapsed on mobile devices
2017-04-19 19:10:16 +00:00
c57e66bebb
Merge branch 'branches-sort-toggle-empty' into 'master'
...
Fixed branches sort toggle being empty
Closes #30950
See merge request !10764
2017-04-19 18:23:33 +00:00
bb6dcf2d1a
Merge branch 'fix-link-prometheus-opening-outside-gitlab' into 'master'
...
Removed target blank from the environments component
Closes #31029
See merge request !10726
2017-04-19 17:56:07 +00:00
76b602adaa
Removed target blank from the environments component
2017-04-19 17:56:05 +00:00
b739db038b
Merge branch 'patch-7' into 'master'
...
Update groups.md found typo
See merge request !10792
2017-04-19 17:48:37 +00:00
6d71306562
Merge branch 'group-milestone-date-fields-fix' into 'master'
...
Fixed group milestones date pickers not working
Closes #31095
See merge request !10779
2017-04-19 17:02:21 +00:00
bd98ae9cdc
Update groups.md found typo
2017-04-19 16:45:51 +00:00
ab4dbcecac
Merge branch '30484-profile-dropdown-account-name' into 'master'
...
Added profile name to user dropdown
Closes #30484
See merge request !10469
2017-04-19 16:43:59 +00:00
3b2adb5bd7
Added profile name to user dropdown
2017-04-19 16:43:57 +00:00
364050c1f1
Merge branch '29734-prometheus-monitoring-page-displays-button-to-control-manual-actions' into 'master'
...
Remove manual deployment controls from Environment metrics page
Closes #29734
See merge request !10769
2017-04-19 16:36:22 +00:00
51eb2a81a8
Remove manual deployment controls from Environment metrics page
2017-04-19 16:36:21 +00:00
29ddc15f8d
Merge branch '31137-ensure-yarn-installed' into 'master'
...
Remove node modules cache because we already use artifacts
Closes #29226 and #31137
See merge request !10781
2017-04-19 15:55:56 +00:00
6440280285
Remove node modules cache because we already use artifacts
2017-04-19 15:55:55 +00:00
f653ac4489
Merge branch 'project-group-icon-links' into 'master'
...
Fixed project & group icons not being clickable
Closes #31073
See merge request !10778
2017-04-19 15:55:01 +00:00
0945dc4179
Fix PlantUML integration in GFM
...
Fixes #30557
Use "lang" attribute instead of "class" in PlantumlFilter.
2017-04-19 17:54:58 +02:00
d8ac7575b9
Merge branch 'issuable-state-only-notes-and-description' into 'master'
...
Display issuable state only in notes and issuable description
Closes #30964
See merge request !10789
2017-04-19 15:51:55 +00:00
046c0e1e35
Merge branch '30985-cancel-pipelines' into 'master'
...
Destroy tooltip in async buttons and dropdowns
Closes #30985
See merge request !10768
2017-04-19 15:41:21 +00:00
a9446a279a
Merge branch 'add-droplab-docs' into 'master'
...
Added and updated droplab docs
See merge request !10569
2017-04-19 15:16:58 +00:00
daf0592d25
Added and updated droplab docs
2017-04-19 15:16:58 +00:00
11fd2f80b0
Don't delete a branch involved in an open merge request in "Delete all merged branches" service
...
Customers were surprised by the previous behavior, which destroyed branches
even though an open merge request existed for it.
Closes #29427
2017-04-19 07:56:08 -07:00
40a972057d
Merge branch 'usage-ping-port' into 'master'
...
Usage ping port
Closes #27750
See merge request !10481
2017-04-19 14:48:31 +00:00
de71a46594
Display issuable state only in notes and issuable description
...
Closes #30964
2017-04-19 16:38:46 +02:00
2afff60982
Use refs instead of query the DOM
2017-04-19 15:30:47 +01:00
6c3038e871
Merge branch 'master' into 30985-cancel-pipelines
...
* master:
Remove special naming of pipelines folder
remove changelog (not needed)
Fix active user count
add spec and changelog
Add migration to remove orphaned notification settings
Improve container registry repository path specs
Fix duplicated container repository names
update textarea height and refocus when attaching files
Remove IIFEs in filtered_search_bundle.js
Remove IIFEs from diff_notes_bundle.js
2017-04-19 14:48:33 +01:00
3f0054a88c
Add unique index for note_id to system note metadata table
...
In issue 1, the sequential scan was taking 250+ ms.
2017-04-19 06:45:01 -07:00
a9da37434a
Merge branch 'fix/orphan-notification-settings' into 'master'
...
Fix orphaned notification settings
Closes #29688
See merge request !10763
2017-04-19 11:53:04 +00:00
4bb34d52ff
Merge branch 'vue-pipelines' into 'master'
...
Remove special naming of pipelines folder
See merge request !10766
2017-04-19 11:44:40 +00:00
468ff9593a
Remove special naming of pipelines folder
2017-04-19 11:44:37 +00:00
135fc81c34
Merge branch 'fix/user-count' into 'master'
...
Fix active user count
See merge request !10783
2017-04-19 11:34:48 +00:00
8d0cae3f0a
Merge branch 'fix/gb/container-registry-repository-paths' into 'master'
...
Fix duplicated container repository names
Closes #31117
See merge request !10771
2017-04-19 10:58:37 +00:00
6202aff3a0
remove changelog (not needed)
2017-04-19 12:34:50 +02:00
18da66a5d5
Merge branch 'remove-iife-diff-notes-bundle' into 'master'
...
Remove IIFE's in diff_notes_bundle.js
See merge request !10729
2017-04-19 10:32:32 +00:00
Phil Hughes
Filipa Lacerda
Sean McGivern
Robert Speicher
Douwe Maan
Drew Blessing
Alfredo Sumaran
Luke "Jared" Bennett
Clement Ho
Jose Ivan Vargas Lopez
joe d
Annabel Dunstone Gray
Dimitrie Hoekstra
Joshua Lambert
Lin Jen-Shin (godfat)
Adam Niedzielski
Stan Hu
Yorick Peterse
Kamil Trzciński
James Lopez