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
a9e0218cc5
32118 Make New environment empty state btn lowercase
2017-06-02 13:00:21 -07: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
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
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
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
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
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
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
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
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
Clement Ho
Phil Hughes
Kushal Pandya
tauriedavis
Tim Zallmann
Luke "Jared" Bennett
winh
Sean McGivern
Filipa Lacerda
Kamil Trzciński
Z.J. van de Weg
kushalpandya
Lin Jen-Shin
Fatih Acet
Eric Eastwood