8906bbae38
Merge branch '34810-vue-pagination' into 'master'
...
Prevent default click since we change the url manually
Closes #34810
See merge request !12721
2017-07-10 08:08:54 +00:00
b2b527a690
Update tests to test what the component renders and what the clicks calls
2017-07-07 22:23:13 +01:00
5f8f555a66
Merge branch '30281-report-abusive-content-from-an-issue-or-merge-request' into 'master'
...
Resolve "Report abusive content from an issue or merge request"
Closes #30281
See merge request !11786
2017-07-07 20:23:27 +00:00
9803579e25
Prevent default click since we change the url manually
...
Adds tests
2017-07-07 18:09:02 +01:00
a77158ff31
Merge branch 'feature/intermediate/32568-adding-variables-to-pipelines-schedules' into 'master'
...
Add variables to pipelines schedules
Closes #32568
See merge request !12372
2017-07-07 15:17:02 +00:00
f28cd19dde
Fix MR and issue specs
2017-07-07 16:05:17 +01:00
c88739ffa6
Merge branch 'es-class-syntax' into 'master'
...
Refactor several javascript files to ES module syntax
See merge request !12683
2017-07-07 14:24:05 +00:00
848d868b9b
Fixed issue_spec and merge_request_spec for report toggle changes
2017-07-07 14:57:28 +01:00
d7c383a0ee
Fixed MR single button submit failure and attempted to tidy up close_reopen partials using issuable_helpers and setDisable will use true as default bool
2017-07-07 14:57:28 +01:00
001c904f28
Remove inclusive JS imports
2017-07-07 14:57:00 +01:00
421e41c9ce
Added specs
2017-07-07 14:57:00 +01:00
08fba1327f
merge from master
2017-07-07 16:12:13 +09:00
60a1118f16
refactor SigninTabsMemoizer class to ES module syntax
2017-07-06 13:59:52 -05:00
5c52ca9a0c
refactor SingleFileDiff class to ES module syntax
2017-07-06 13:39:28 -05:00
d990df7481
refactor TaskList class to ES module syntax
2017-07-06 13:05:58 -05:00
571de11eb6
refactor Todos class to ES module syntax
2017-07-06 12:57:01 -05:00
55ceeda85c
Merge branch '34655-label-field-for-setting-a-chart-s-legend-text-is-not-working' into 'master'
...
Resolve "`label` field for setting a chart's legend text is not working"
Closes #34655
See merge request !12628
2017-07-06 16:38:10 +00:00
6149c2e230
refactor VisibilitySelect class to ES module syntax
2017-07-06 10:10:02 -05:00
5d34237854
refactor ZenMode to ES module syntax
2017-07-06 10:10:01 -05:00
bb918a2fd9
Merge branch 'revert-018f7e46' into 'master'
...
Revert "Merge branch 'winh-mr-widget-no-pipeline' into 'master'"
See merge request !12674
2017-07-06 13:14:33 +00:00
a33fb2132c
Merge branch '18000-remember-me-for-oauth-login' into 'master'
...
Fix `migration:path` build for "Honor the 'Remember me' parameter for OAuth-based login"
Closes #34713
See merge request !12668
2017-07-06 12:59:21 +00:00
42d4b013ea
Added test for the chart legend
2017-07-06 06:59:01 -05:00
9786e4fb0a
Revert "Merge branch 'winh-mr-widget-no-pipeline' into 'master'"
...
This reverts merge request !12127
2017-07-06 10:45:24 +00:00
8d49a9fd58
Add Jasmine tests for `OAuthRememberMe`
2017-07-06 06:30:07 +00:00
f040336545
Handles realtime with 2 states for environments table
2017-07-05 16:08:53 +00:00
8a3022a698
Revert "Merge branch '18000-remember-me-for-oauth-login' into 'master'"
...
This reverts merge request !11963
2017-07-05 16:01:40 +00:00
6df61942e9
Merge branch '18000-remember-me-for-oauth-login' into 'master'
...
Honor the "Remember me" parameter for OAuth-based login
Closes #18000
See merge request !11963
2017-07-05 12:41:06 +00:00
5576214d0f
Schedule pipelines with variables
...
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32568
2017-07-05 18:36:19 +09:00
2ae8158c8c
Add Jasmine tests for `OAuthRememberMe`
2017-07-04 12:29:39 +00:00
2a829d0f53
Fixed the y_label not setting correctly for each graph on the monitoring dashboard
2017-07-03 10:43:56 -05:00
e48f54b5b2
Merge branch 'enable-webpack-code-splitting' into 'master'
...
Enable webpack code splitting
Closes #32989
See merge request !12032
2017-06-30 20:55:09 +00:00
8513072e96
Merge branch 'winh-issue-show-aftereach' into 'master'
...
Remove empty afterEach() from issue_show app_spec.js
See merge request !12577
2017-06-30 20:12:04 +00:00
9e3ef082be
Remove placeholder note when award emoji slash command is applied
2017-06-30 14:10:09 +00:00
553346a4f4
Remove empty afterEach() from issue_show app_spec.js
2017-06-29 22:31:58 +00:00
88c60307bd
Merge branch 'dm-merge-request-creations-controller' into 'master'
...
Split up MergeRequestsController
See merge request !12150
2017-06-29 11:57:06 +00:00
70b05a8377
Split up MergeRequestsController
2017-06-28 18:17:44 -05:00
f26d477865
dynamically import emoji helpers for AwardsHandler class
2017-06-28 13:04:34 -05:00
500d3a990e
Merge branch 'winh-no-current-user-search-bar' into 'master'
...
Add condition if there is a current user to DropdownUser
See merge request !12415
2017-06-28 16:16:46 +00:00
5870fc5daf
Merge branch 'cherry-pick-5ea675be' into 'master'
...
Merge branch 'additional-metrics-dashboard' into '28717-additional-metrics-review-branch'
See merge request !12454
2017-06-28 15:49:42 +00:00
08ad0af49c
Merge branch 'refactor-emoji-utils' into 'master'
...
Refactor emoji helpers in preparation for async loading
See merge request !12432
2017-06-28 05:51:30 +00:00
6ab12777bc
Introduce addClassIfElementExists utility
2017-06-27 20:37:30 +02:00
2da314212f
Slightly refactor pipeline schedules form in preparation for additions
2017-06-27 16:52:13 +00:00
64b0a799f3
Resolve "Submitting reply to existing diff discussion using Cmd/Ctrl+Enter submits twice and refreshes page"
2017-06-27 16:06:38 +00:00
abfb59109d
Add failing test for #34141
2017-06-27 16:31:01 +02:00
99bdfd189b
Merge branch 'issue-form-multiple-line-markdown' into 'master'
...
Fixed multi-line markdown in issue edit form
Closes #34318
See merge request !12458
2017-06-27 11:34:21 +00:00
018f7e46c7
Merge branch 'winh-mr-widget-no-pipeline' into 'master'
...
Handle missing pipeline in merge request widget
Closes #32987
See merge request !12127
2017-06-27 08:33:47 +00:00
28c45b047d
Polish sidebar toggle
2017-06-27 08:06:35 +00:00
9d6bbc92c9
move glEmojiTag method to emoji helper
2017-06-27 00:54:34 -05:00
27a1348f20
split emoji support methods from the async module
2017-06-27 00:10:17 -05:00
9cc3500e25
Fix endpoint not being update correctly
2017-06-26 16:50:58 +00:00
1fc9262e3d
Handle Promise rejections in mr_widget_pipeline_spec.js
2017-06-26 17:43:29 +02:00
2c95411737
Fixed multi-line markdown in issue edit form
...
Closes #34318
2017-06-26 16:23:06 +01:00
871bf96c9b
Merge branch 'additional-metrics-dashboard' into '28717-additional-metrics-review-branch'
...
Additional metrics dashboard
See merge request !11740
2017-06-26 14:44:03 +00:00
47face0175
Merge branch 'winh-karma-suppress-vue-tips' into 'master'
...
Suppress Vue tips when running Karma
See merge request !12379
2017-06-26 13:19:14 +00:00
27b98beac9
Merge branch 'issue-inline-edit-quick-submit' into 'master'
...
Fixes ctrl+enter not submit issue edit form
Closes #33758
See merge request !12422
2017-06-26 09:28:43 +00:00
ae5a020773
Merge branch '33223-multiple-tooltips-on-the-same-vue-component' into 'master'
...
Add support for multiple tooltips in the same Vue component
Closes #33223
See merge request !11954
2017-06-26 08:44:00 +00:00
6d4e8154b0
Fixes ctrl+enter not submit issue edit form
...
Closes #33758
2017-06-24 13:32:31 +01:00
f0a4b4875f
update import locations for karma specs
2017-06-23 15:25:21 -05:00
925eea2672
Make JavaScript tests fail for unhandled Promise rejections
2017-06-23 09:28:19 +00:00
6cb575d612
Add support for multiple tooltips in the same Vue component
...
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33223
2017-06-23 02:12:45 -05:00
1a58170bd4
Suppress Vue tips when running Karma
2017-06-22 20:21:54 +02:00
8fe5602c1a
Merge branch '28717-additional-metrics-review-branch' into 'master'
...
Support additional prometheus metrics - review branch
Closes #28717
See merge request !11712
2017-06-22 16:35:05 +00:00
13bb887bf9
Merge branch '34010-fix-linking-to-parallel-diff-line-number-creating-gray-box' into 'master'
...
Fix linking to line number on parallel diff creating empty discussion box
Closes #34010
See merge request !12332
2017-06-22 16:27:48 +00:00
db86a993e3
Resolve "Can't sort Groups"
2017-06-22 16:08:48 +00:00
97c42df3b8
Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-review-branch
2017-06-22 15:05:52 +02:00
07742c0254
Add failing test for #32987
2017-06-22 10:06:58 +02:00
9f0b85bf26
Revert to using links instead of buttons in Issuable Index tabs.
2017-06-21 12:50:59 -04:00
5145e39ef7
Fix linking to line number on parallel diff creating empty discussion
...
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/34010
2017-06-21 10:16:06 -05:00
40eb825368
Revert "Merge branch 'winh-merge-request-related-issues' into 'master'"
...
This reverts commit 6ac777a759025cbc2ad4
2017-06-21 15:25:11 +02:00
b2e1d32e7a
Merge branch '33868-fix-mr-changes-diff-note-up-arrow-editing' into 'master'
...
Fix pressing up-arrow on a MR "Changes" diff discussion edits your last note
Closes #33868
See merge request !12297
2017-06-20 19:31:02 +00:00
05cfba6f6d
Uniformize code between both pipelines tables
2017-06-20 14:54:55 +00:00
5dc253f138
Stop showing task status if no tasks are present
...
Previously the task status would be visible even if there where no tasks
in the description. This fixes that by changing the regex to check for
tasks without 0.
This also fixes a bug where update the description inline would not
update the task status text on screen.
Closes #33880
2017-06-20 10:58:07 +01:00
2955e95604
Clean up Vue warnings in tests
2017-06-20 08:05:55 +00:00
a67130655a
Resolve "Transient karma failure on master for `Date time utils timeFor returns remaining time when in the future`"
2017-06-20 07:56:48 +00:00
bcc5fc857a
Merge branch '33916-make-note-highlight-toggle-boolean-explcit' into 'master'
...
Fix note highlight being added when you don't have a URL fragment hash #note_xxx
Closes #33916
See merge request !12293
2017-06-20 07:45:28 +00:00
27664b7d9f
Merge branch '33877-fix-issue-description-highlight-and-math' into 'master'
...
Fix issue description syntax highlighting and math rendering
Closes #33877
See merge request !12282
2017-06-20 07:35:15 +00:00
f7ad9e5abb
Fix MR "Changes" diff note up arrow to edit last note
...
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33868
While in a MR "Changes" tab looking at some diff note discussions.
Clicking reply and pressing the up-arrow should edit your last comment in
that discussion.
I suspect this regressed in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11173/diffs#f4bb984ec495c5cb58516785c62978f5209c39b4_179_178
where we changed the selector
2017-06-20 00:31:21 -05:00
19e12aac02
Fix note highlight being added to new notes
...
Always use a explicit true/false value to set highlight because jQuery
assumes `null` means toggle from whatever state and doesn't force false.
Regressed in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12098
2017-06-19 18:52:19 -05:00
ef4bc6df04
Adjust position and wording for related issues in merge requests
2017-06-19 22:17:00 +00:00
84e23ae06c
Fix issue description syntax highlighting and math rendering
...
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33877
Regressed in
5a95d6f8da (3a15290e7696397415523e0b664aceb3dd4010ae_0_46)
2017-06-19 15:29:46 -05:00
e5a91870fd
Increase karma socket timeout
2017-06-16 20:40:28 +00:00
352a9ed562
Merge branch '27070-rename-slash-commands-to-quick-actions' into 'master'
...
Rename "Slash commands" to "Quick actions"
Closes #27070
See merge request !11811
2017-06-16 16:32:53 +00:00
be5f665557
Fix prometheus service frontend fixture
2017-06-16 18:26:40 +02:00
9f2c992ff1
Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-review-branch
2017-06-16 18:19:41 +02:00
64bb0d37d4
cleanup wip
2017-06-16 16:53:02 +02:00
1d448a66d7
Create responsive mobile view for pipelines table
2017-06-16 12:00:28 +00:00
a0f13d2f52
Expose correct path to group
2017-06-16 08:54:20 +00:00
446f37872f
Merge branch 'karma-headless-chrome-redux' into 'master'
...
Replace PhantomJS with Chrome in Karma test runner (2nd attempt)
Closes #33633
See merge request !12144
2017-06-16 07:06:39 +00:00
132be812d1
fix frontend test failures after jasmine upgrade
2017-06-15 16:21:53 -05:00
ea090291bb
Rename "Slash commands" to "Quick actions"
...
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/27070
Deprecate "chat commands" in favor of "slash commands"
We looked for things like:
- `slash commmand`
- `slash_command`
- `slash-command`
- `SlashCommand`
2017-06-15 09:01:56 -05:00
d32de82196
Merge branch '33483-fix-note-highlight-being-lost-on-note-update' into 'master'
...
Fix note highlight being lost after real time update
Closes #33483
See merge request !12098
2017-06-15 07:46:43 +00:00
4182e3fa63
Fix autocomplete not working on note edit form
...
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33529
Bug introduced in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11278
2017-06-14 11:55:34 -05:00
82181f6c0a
Fix note highlight being lost after real time update
...
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33483
2017-06-14 11:32:12 -05:00
8868efd0f3
Move vue components to vue files and match docs
2017-06-14 13:04:50 +00:00
8b069dbb64
remove phantomjs-specific test hacks
2017-06-14 04:07:20 -05:00
60f7a43f28
fix incorrect equals assertion
2017-06-14 04:07:20 -05:00
a90b18b97f
Merge branch '33642-timeago-update' into 'master'
...
Remove js classes from vue component that are not needed in vue component
Closes #33642
See merge request !12133
2017-06-13 16:47:50 +00:00
a526e619d9
Revert "Merge branch 'karma-headless-chrome' into 'master'"
...
This reverts merge request !12036
2017-06-13 15:20:26 +00:00
aeabd307ba
Remove js classes from vue component that are not needed in vue component
2017-06-13 15:33:57 +01:00
037b070653
remove phantomjs-specific test hacks
2017-06-13 00:23:39 -05:00
0ff932cdce
fix incorrect equals assertion
2017-06-13 00:23:39 -05:00
452202e36d
Improve Job detail view to make it refreshed in real-time instead of reloading
2017-06-12 09:20:19 +00:00
5279a39e97
Use vue files for navigation tabs and buttons
2017-06-12 07:48:54 +00:00
b38c74d696
Revert 'New file from interface on existing branch'
2017-06-09 10:10:47 -05:00
288e8c7c42
Merge branch 'issuable-sidebar-edit-button-field-focus' into 'master'
...
Fixed dropdown filter input not focusing after transition
Closes #33216
See merge request !12020
2017-06-09 08:36:56 +00:00
b1bf6d88fc
Merge branch 'master-security-update' into 'master'
...
Master security update
See merge request !12025
2017-06-08 20:06:09 +00:00
dfa4a440f0
Fixed dropdown filter input not focusing after transition
...
Closes #33216
2017-06-08 18:06:47 +01:00
b55bd9ef95
Merge branch 'master' into 25426-group-dashboard-ui
2017-06-08 10:15:27 -05:00
c24b706824
Add tests when user has no direct acces to a group
2017-06-08 03:45:18 -05:00
1d1363e2bb
Bring in security changes from the 9.2.5 release
...
Ran:
- git format-patch v9.2.2..v9.2.5 --stdout > patchfile.patch
- git checkout -b 9-2-5-security-patch origin/v9.2.2
- git apply patchfile.patch
- git commit
- [Got the sha ref for the commit]
- git checkout -b upstream-9-2-security master
- git cherry-pick <SHA of the patchfile commit>
- [Resolved conflicts]
- git cherry-pick --continue
2017-06-07 21:16:20 -07:00
7ff17980ce
Display user access type for each group
...
Also adds unit tests for this
2017-06-07 23:00:03 -05:00
bdebe849b8
Translate project & repository pages
2017-06-07 20:13:44 +00:00
3ec37e2622
Merge branch 'master' into 25426-group-dashboard-ui
2017-06-07 14:45:57 -05:00
986eff1cf2
Merge branch 'auto-search-when-state-changed' into 'master'
...
Perform filtered search when state tab is changed
Closes #27261
See merge request !11917
2017-06-07 17:14:34 +00:00
60d2a7c355
Use data attributes instead of class
2017-06-07 10:54:54 -05:00
0601ac5d0b
Merge branch '32587-fix-horse-racing-emoji-codepointat-npe' into 'master'
...
Fix NPE with horse racing emoji check
Closes #32587
See merge request !11872
2017-06-07 15:12:04 +00:00
0bcb1d35ec
Merge branch 'expand-backlog-closed-lists-issue-boards' into 'master'
...
Expand/collapse close & backlog lists in issue boards
Closes #23917
See merge request !11820
2017-06-07 15:05:37 +00:00
a65f07a256
Address feedback
2017-06-07 10:05:17 -05:00
ee0e3ffc05
Merge branch '3191-deploy-keys-update' into 'master'
...
Implement ability to update deploy keys
Closes #3191
See merge request !10383
2017-06-07 14:37:50 +00:00
f5dfd98856
Address feedback
2017-06-07 04:27:53 -05:00
dbb3c28088
Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-review-branch
...
# Conflicts:
# app/models/project_services/prometheus_service.rb
# app/views/projects/services/_form.html.haml
2017-06-07 10:27:52 +02:00
9c2f82842b
Merge branch '31633-animate-issue' into 'master'
...
animate adding issue to boards
Closes #31633
See merge request !11785
2017-06-07 07:41:24 +00:00
d565b30ce6
Add jasmine spec for searchState
2017-06-06 18:18:31 -05:00
d1c2d36f03
Merge branch 'fix_commits_page' into 'master'
...
Fix duplication of commits header on commits page
Closes #13879
See merge request !11006
2017-06-06 19:57:07 +00:00
196a3c546c
Change from double click to single click to open dropdown
2017-06-06 10:52:50 -05:00
bd95138414
Remove non existent bundle
2017-06-06 09:02:29 -05:00
d8403ec18f
Minor visual adjustments
2017-06-06 09:01:42 -05:00
c9a67266d2
Move issuable bulk edit form into a new sidebar.
2017-06-06 09:16:27 -04:00
7a9c9a259e
Responsive environment tables
2017-06-06 12:58:29 +00:00
67d3d0a488
Fix header component spec
2017-06-05 16:25:59 -05:00
c34107608e
Merge branch 'fix-realtime-edited-text-for-issues-9-3' into 'master'
...
Port fix-realtime-edited-text-for-issues 9-2-stable fix to master.
See merge request !11478
2017-06-05 10:42:33 +00:00
7abe27b425
Improve user experience around slash commands in instant comments
2017-06-05 09:12:15 +00:00
78f131c051
Fix duplication of commits header on commits page
2017-06-03 12:40:20 +11:00
c88d9cf34c
Fix NPE with horse racing emoji check
...
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32587
2017-06-02 15:44:14 -05:00
a9e0218cc5
32118 Make New environment empty state btn lowercase
2017-06-02 13:00:21 -07:00
3d70eeb5bb
Implement ability to update deploy keys
2017-06-02 19:44:36 +03:00
51c196160a
Merge branch 'winh-styled-people-search-bar' into 'master'
...
Style people in issuable search bar
Closes #30468
See merge request !11402
2017-06-02 16:40:57 +00:00
a980a4f638
added tests for collapsing
2017-06-02 17:25:18 +01:00
5a4a082490
Merge remote-tracking branch 'origin/master' into fix-realtime-edited-text-for-issues-9-3
2017-06-02 17:17:54 +01:00
0583916d2d
Style people in issuable search bar ( !11402 )
2017-06-02 16:30:37 +02:00
dab2662194
Merge branch '31511-jira-settings' into 'master'
...
Simplify test&save actions when setting a service integration
Closes #31511
See merge request !11599
2017-06-02 14:03:15 +00:00
228b73d5e9
Pipeline show view real time header section
2017-06-02 13:24:42 +00:00
b22970648e
Add frontend fixture for issue list
2017-06-02 14:42:03 +02:00
67e5235e79
Simplify filtered_search_visual_tokens_spec.js
2017-06-02 14:42:03 +02:00
ea531e1eff
Merge remote-tracking branch 'origin/master' into 25426-group-dashboard-ui
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2017-06-02 11:05:38 +03:00
f2b34fb208
Show current user immediately in issuable filters
2017-06-02 07:42:18 +00:00
8d131eb85d
Merge branch 'zj-realtime-env-list' into 'master'
...
Realtime env list
Closes #31701
See merge request !11333
2017-06-01 20:38:46 +00:00
0880094455
Make GroupsStore.store method non-static
2017-06-01 13:40:22 -05:00
3f0eff8259
Update as per review feedback
2017-06-01 21:25:45 +05:30
4c58fd82df
Tests for `PrometheusMetrics` class
2017-06-01 15:05:27 +05:30
f74f03383f
Merge branch 'notebook-katex-fixes' into 'master'
...
Fixes multi-line math in notebooks
Closes #30900 and #33074
See merge request !11789
2017-06-01 09:23:31 +00:00
00b00f1ede
Merge branch 'master' into zj-realtime-env-list
2017-06-01 10:31:33 +02:00
854e9de935
animate adding issue to boards
...
fix some false positive tests for board_new_issue
2017-06-01 17:14:08 +10:00
73af7178a5
Update as per review
2017-06-01 07:47:16 +02:00
dc3de71fb7
Update tests based on source changes
2017-06-01 07:47:16 +02:00
325c55fb24
Remove extra new line
2017-06-01 07:47:16 +02:00
a678f42ebb
Tests for `integration_settings_form`
2017-06-01 07:47:16 +02:00
76543bce90
Fix karma tests
2017-05-31 21:37:56 -05:00
f06daa26ef
Merge branch 'rename-builds-controller' into 'master'
...
Rename BuildsController to JobsController
Closes #30699
See merge request !11407
2017-05-31 19:11:48 +00:00
bfa46a9eab
Merge branch 'task-list-2' into 'master'
...
Update task_list to version 2.0.0
Closes #22470
See merge request !11525
2017-05-31 16:35:54 +00:00
882a591dca
Merge branch 'issue-edit-inline' into 'master'
...
Issue inline editing
Closes #24873
See merge request !11322
2017-05-31 16:35:47 +00:00
c3c644c722
Prometheus Service Fixture Generator
2017-05-31 17:10:30 +05:30
07c984d81c
Port fix-realtime-edited-text-for-issues 9-2-stable fix to master.
2017-05-31 11:35:05 +01:00
6c72d8a219
Merge remote-tracking branch 'upstream/master' into rename-builds-controller
...
* upstream/master: (116 commits)
Revert "Merge branch 'grpc-1.3.4' into 'master'"
Return nil when looking up config for unknown LDAP provider
Avoid crash when trying to parse string with invalid UTF-8 sequence
Enable Gitaly by default in GitLab 9.3
Don’t create comment on JIRA if link already exists
Disable sub_group_issuables_spec.rb for mysql
Fix math rendering on blob pages
Add changelog
Don't allow to pass a user to ProjectWiki#http_url_to_repo
Revert "Merge branch '1937-https-clone-url-username' into 'master'
"
Fix bottom padding for build page
Fix /unsubscribe slash command creating extra todos
Fix omniauth-google-oauth2 dependencies in Gemfile.lock
Update looks job log
'New issue'/'New merge request' dropdowns should show only projects with issues/merge requests feature enabled
Fix spec for Members::AuthorizedDestroyService
31616-add-uptime-of-gitlab-instance-in-admin-area
Set head pipeline when creating merge requests
Create a separate helper to check if we show particular tab on a search page
Add performance deltas between app deployments on Merge Request widget
...
2017-05-31 18:14:11 +08:00
c65a8a6e3a
added tests
2017-05-30 16:00:57 +01:00
15a833d2d4
Merge branch 'back-port-locked-milestones-to-ce' into 'master'
...
`canEdit` changes for conditional remove button on filtered search -- EE backport
Closes gitlab-ee#2433
See merge request !11696
2017-05-30 14:53:57 +00:00
ebd6e5f351
Merge branch '32916-browser-notifications-for-pipeline-running-in-a-mr-is-gone' into 'master'
...
Resolve "Browser notifications for pipeline running in a MR is gone"
Closes #32916
See merge request !11734
2017-05-30 11:40:21 +00:00
df7c90116b
fixed issuable shortcuts not working
...
moved setstate method into store
2017-05-30 11:58:50 +01:00
3465e1e52c
Merge branch 'master' into issue-edit-inline
2017-05-30 10:34:15 +01:00
41203686c3
Fix tests and eslint errors
...
[ci skip]
2017-05-30 04:29:54 -05:00
cd023d42e0
Update looks job log
2017-05-30 08:43:13 +00:00
763a3acd03
Merge branch '31349-pipeline-url-techdeb' into 'master'
...
Use vue file for pipelines tables components
See merge request !11760
2017-05-30 08:22:49 +00:00
a60020e488
Merge branch '31849-pipeline-show-view-realtime' into 'master'
...
Creates a mediator for pipeline details vue in order to mount several vue apps with the same data
Closes #31849
See merge request !11732
2017-05-30 07:48:13 +00:00
069783b5cc
Add performance deltas between app deployments on Merge Request widget
2017-05-29 15:04:47 +00:00
60ceffe479
Merge branch 'fix-up-notes-technical-debt' into 'master'
...
Fix up some notes.js tech debt
See merge request !11283
2017-05-29 13:19:06 +00:00
ad1b37c43f
Use vue file for pipelines tables components
2017-05-29 11:02:06 +01:00
8968171c9e
Merge branch '32447-remove-source-branch-is-displayed-to-mergers-who-cannot-actually-delete-the-source-branch-from-a-forked-project' into 'master'
...
Disable "Remove source branch" in MR Widget for users who can't remove, and re-add checkbox to MR form
Closes #32447 and #32907
See merge request !11558
2017-05-26 19:42:02 +00:00
f4274ca1b1
Creates CI Header component to use in pipelines and job details pages
2017-05-26 17:31:16 +00:00
20bd76da27
Fix up some notes tech debt
...
Fix up tech debt comments from @jschatz1
- https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10837#note_28757436
- https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10837#note_28757905
- https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10837#note_28757952
- https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10837#note_28758013
2017-05-26 11:36:49 -05:00
870005c432
Added specs for handleNotifications in mr_widget_options_spec.js
2017-05-26 16:48:19 +01:00
c94db0c290
Use - as the prefix so we don't conflict with namespaces
...
The decision was made around:
https://gitlab.com/gitlab-org/gitlab-ce/issues/26407#note_30624641
2017-05-26 23:06:20 +08:00
a59165e7fd
Merge branch '32888-fix-error-after-missing-note-hash-fragment-in-dom' into 'master'
...
Fix error thrown with missing note fragment in DOM
Closes #32888
See merge request !11700
2017-05-26 14:26:24 +00:00
cad686cc30
Creates a mediator for pipeline details vue in order to mount several vue apps with the same data
2017-05-26 11:57:40 +01:00
70eb0c6a88
Merge remote-tracking branch 'upstream/master' into rename-builds-controller
...
* upstream/master: (307 commits)
Address feedback
Add small update for the i18n guide.
update webpack to v2.6.1 patch release to fix "Can't find variable: Promise" error
update webpack-bundle-analyzer past v2.4.1 to support NamedChunksPlugin
name all webpack chunks to improve long term cacheability
add NameAllModulesPlugin to cover shortcomings of NamedModulesPlugin
upgrade to latest webpack version
Only use DROP INDEX CONCURRENTLY on postgreql 9.2+
Provide default for calculating label text color (!11681 )
Add failing test for #32728
Bugfix: Always use the default language when generating emails.
Remove unecessary commit pattern check
Add regexp_for_value helper method
Remove shared example and improve sub_group_issuables_spec.rb
Remove 'should' from scenario in has_subgroup_title_spec.rb
Cartfile git and binary methods cannot take a GitHub repo
Fix terminals support for Kubernetes service
Add review comments to compare_spec.rb
Fix transient error clicking dropdown items in compare_spec.rb
Use non-global jQuery reference within raven bundle
...
2017-05-26 18:25:32 +08:00
733eec88e4
Backport canEdit changes for conditional remove button
...
Backport Fix locked milestone in boards being remove-able.
See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1963
Fix https://gitlab.com/gitlab-org/gitlab-ee/issues/2433
Conflicts:
app/assets/javascripts/boards/boards_bundle.js
app/assets/javascripts/boards/filtered_search_boards.js
app/assets/javascripts/filtered_search/filtered_search_manager.js
spec/features/boards/boards_spec.rb
2017-05-26 02:42:13 -05:00
07a3a69ca8
Fix error thrown with missing note fragment in DOM
...
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32888
Reproduction:
1. Visit /namespace/project/merge_requests/x/diffs#note_1234
1. When `#note_1234` isn't in the diff, an error is thrown
2017-05-26 02:11:20 -05:00
b3666a7829
Add tests for Group item component
...
Also adds more tests fro groups folder component
[ci skip]
2017-05-25 19:50:16 -05:00
7ec8969285
Merge branch 'master' into zj-realtime-env-list
2017-05-25 13:57:22 +02:00
3ce6658d8d
Warn before moving issue in inline edit form
...
[ci skip]
2017-05-25 11:58:40 +01:00
625d344206
renamed path to web_url in endpoint
2017-05-25 11:20:52 +01:00
f452cb7733
Merge branch 'master' into issue-edit-inline
2017-05-25 11:17:31 +01:00
710e35378a
Use non-global jQuery reference within raven bundle
2017-05-25 07:12:36 +00:00
30462b8814
Merge branch '32170-assignees-spinner' into 'master'
...
show loading indicator while waiting for assignees first fetch
Closes #32170
See merge request !11434
2017-05-24 18:14:23 +00:00
7598cf62b8
Use import instead of require
2017-05-24 09:19:08 -05:00
a9470c45e4
fixed karma failures
...
[ci skip]
2017-05-24 12:42:23 +01:00
6b8fac9de4
add loading spinner to sidebar assignees
...
store isFetching state to indicate if assignees has initial data
2017-05-24 21:19:50 +10:00
b39b02d4a4
Merge branch 'dm-paste-code-inside-gfm-code' into 'master'
...
Don't wrap pasted code when it's already inside code tags
Closes #32507
See merge request !11524
2017-05-24 10:02:17 +00:00
e78b8223fe
Merge branch 'issue-edit-inline-getdata-after-update' into 'issue-edit-inline'
...
Get new data after inline edit save
See merge request !11601
2017-05-24 09:42:31 +00:00
6cbc69aa7e
Merge branch '32563-remove-duplicated-config-code-for-filtered-search-dropdowns' into 'master'
...
Resolve "Remove duplicated config code for filtered search dropdowns"
Closes #32563
See merge request !11512
2017-05-24 09:00:26 +00:00
e07c75513d
Merge branch 'sentry-clientside-releases' into 'master'
...
Read HEAD commit and use as sentry releases value
Closes #32535
See merge request !11565
2017-05-24 08:17:39 +00:00
Phil Hughes
Filipa Lacerda
Jacob Schatz
Kamil Trzciński
Luke "Jared" Bennett
Tim Zallmann
Shinya Maeda
Mike Greiling
Douwe Maan
Jose Ivan Vargas
Timothy Andrew
Sean McGivern
Eric Eastwood
Clement Ho
Kushal Pandya
Winnie Hellmann
Douwe Maan
Bryce Johnson
Grzegorz Bizon
Alfredo Sumaran
Pawel Chojnacki
Mike Greiling
Annabel Dunstone Gray
Regis Boudinot
DJ Mountney
Bob Van Landuyt
Rémy Coutable
blackst0ne
tauriedavis
Alexander Randa
Dmitriy Zaporozhets
kushalpandya
Z.J. van de Weg
Simon Knox
Lin Jen-Shin
Fatih Acet