d637f87f88
Makes close/reopen issue request to inside the vue app
2018-02-09 18:56:41 +00:00
71c948d637
Replace $.post in importer status with axios
2018-02-09 11:14:48 +00:00
c2f0f8d763
Refactored merge_requests/show path in dispatcher.js
2018-02-08 14:22:31 +00:00
6d7df4f8b1
Merge branch '41297-new-design-for-cancel-stop-pipeline-confirmation' into 'master'
...
Resolve "New design for cancel / stop pipeline confirmation"
Closes #41297
See merge request gitlab-org/gitlab-ce!16813
2018-02-08 05:08:22 +00:00
97f08c651e
Add modal for stopping and retrying pipelines
...
Fix tests
Address code review feedback
Fix tests
2018-02-07 19:28:18 -06:00
2ee08f4770
Resolve "Cancelling a second comment edit doesn't return its state to before the edit"
2018-02-07 21:45:53 +00:00
6441612614
Merge branch '4656-ce-port-filtered-search-bar' into 'master'
...
CE Port: for Filtered search releated changes
See merge request gitlab-org/gitlab-ce!16917
2018-02-07 18:13:11 +00:00
7141344aab
Merge branch 'clear-job-request-timeout' into 'master'
...
Clear the timeout in Jobs class after each test
Closes #42830
See merge request gitlab-org/gitlab-ce!16969
2018-02-07 17:01:45 +00:00
1b748440c2
Merge branch 'pawel/connect_to_prometheus_through_proxy-30480' into 'master'
...
Deploy prometheus through kubernetes and autoconnect to cluster
Closes #30480 and #28916
See merge request gitlab-org/gitlab-ce!16182
2018-02-07 16:56:29 +00:00
bb6895ec6c
Merge branch '3559-ce-port-group-roadmap' into 'master'
...
CE Port for Group Roadmap changes
See merge request gitlab-org/gitlab-ce!16908
2018-02-07 16:52:10 +00:00
239d613839
Clear the timeout in Jobs class after each test
2018-02-07 16:03:53 +00:00
3976368808
Add `convertObjectPropsToCamelCase` helper method
2018-02-07 21:32:38 +05:30
99a5c4b932
Add `convertToCamelCase` helper method
2018-02-07 19:00:11 +05:30
474a0eddfc
Update tests for date helper functions
2018-02-07 19:00:10 +05:30
a55cfc1e63
Merge branch 'ce-39118-dynamic-pipeline-variables-fe' into 'master'
...
Dynamic CI secret variables -- CE backport
See merge request gitlab-org/gitlab-ce!16842
2018-02-07 12:23:36 +00:00
826105dfda
Merge branch 'move-board-list-vue-component' into 'master'
...
Move board list vue component
See merge request gitlab-org/gitlab-ce!16888
2018-02-07 09:08:00 +00:00
95d7281498
Import FilteredSearchTokenKeys, update class initialization syntax
2018-02-07 14:20:59 +05:30
327d73bab9
Import and use `FilteredSearchTokenKeys` independently
2018-02-07 14:20:58 +05:30
47f2754a14
Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480
...
* master: (242 commits)
Validate user namespace before saving so that errors persist on model
Reset Project's column information in spec/lib/gitlab/background_migration/populate_merge_request_metrics_with_events_data_spec.rb
Explicitly set cwd in Sidekiq memory killer instead of depending on getcwd
Downgrade google-protobuf
Close low level rugged repository in project cache worker
File upload UI obeys LFS filters
Resolve "Add a link to documentation on how to get external ip in the Kubernetes cluster details page"
Upgrade GitLab Workhorse to v3.6.0
Add sorting options for /users API (admin only)
improvements from feedback
[ci-skip] add changelog
remove file after `Upload#destroy`
Fix a hardcoded pipeline ID in a spinach step
Override group sidebar links
Replace "cluster" with "Kubernetes cluster"
Reorder async/sync tasks in BuildFinishedWorker to read traces efficiently
Fix tests for Drop filename enforcement
Revert using expand_fixture_path in factory
Revert "Add FixtureHelpers for FactoryGirl"
Refactor :trace to :trace_live in spec
...
2018-02-06 13:28:13 -06:00
ba62493009
Merge branch 'winh-kubernetes-clusters' into 'master'
...
Replace "cluster" with "Kubernetes cluster"
Closes #41963
See merge request gitlab-org/gitlab-ce!16778
2018-02-06 15:57:48 +00:00
914415c79f
Resolve "Add a link to documentation on how to get external ip in the Kubernetes cluster details page"
2018-02-06 14:59:15 +00:00
87ee18c9d1
Move BoardList vue component to vue file
2018-02-06 16:12:04 +02:00
0ecd759d73
Replace "cluster" with "Kubernetes cluster"
2018-02-06 10:05:02 +01:00
bbeb274a25
Refactor :trace to :trace_live in spec
2018-02-06 15:50:08 +09:00
7c8e7a8d1f
Merge branch '41672-emphasize-gke-cluster-to-new-users' into 'master'
...
Add feature highlight blue dot to GKE "Clusters" sidebar item
Closes #41672
See merge request gitlab-org/gitlab-ce!16379
2018-02-05 21:11:07 +00:00
3be32027b6
Use dynamic variable list in scheduled pipelines and group/project CI secret variables
...
See https://gitlab.com/gitlab-org/gitlab-ce/issues/39118
Conflicts:
app/views/ci/variables/_form.html.haml
app/views/ci/variables/_table.html.haml
ee/app/views/ci/variables/_environment_scope.html.haml
spec/javascripts/ci_variable_list/ci_variable_list_ee_spec.js
spec/javascripts/fixtures/projects.rb
2018-02-05 13:09:29 -06:00
2fb167fa3b
Restore feature_highlight code
...
From https://gitlab.com/gitlab-org/gitlab-ce/issues/36760
Was reverted in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14373
2018-02-05 12:10:09 -06:00
39fa83553c
fixed unhandled promise rejection
2018-02-05 09:41:46 +00:00
10cc5d1a80
fixed task list spec
2018-02-05 09:41:46 +00:00
663681f719
fixed notes_spec.js
2018-02-05 09:41:45 +00:00
004158066d
fixed failing karma specs caused by TaskList
2018-02-05 09:41:44 +00:00
015e15f4e8
Converted right_sidebar.js to use axios
2018-02-05 09:41:00 +00:00
e6cd217df6
Converted prometheus_metrics.js to use axios
2018-02-05 09:40:59 +00:00
a3166376bb
Merge branch 'refactor-ci-variable-list-for-future-usage-in-4110' into 'master'
...
Refactor CI variable list code for usage with CI/CD settings page secret variables
See merge request gitlab-org/gitlab-ce!16729
2018-02-02 22:07:58 +00:00
974bb446bf
Merge branch '24167__color_label' into 'master'
...
Add Colors to GitLab Flavored Markdown
Closes #24167
See merge request gitlab-org/gitlab-ce!16095
2018-02-02 19:26:14 +00:00
8fa2932dc5
Merge branch 'ph-axios-2' into 'master'
...
More conversions to axios
See merge request gitlab-org/gitlab-ce!16800
2018-02-02 18:12:12 +00:00
8891fbd0a9
Merge branch 'fl-mr-widget-1' into 'master'
...
Moves more mr widget components into vue files
See merge request gitlab-org/gitlab-ce!16857
2018-02-02 10:25:26 +00:00
756e196945
Merge branch 'fl-mr-widget-2' into 'master'
...
Moves author components into vue files
See merge request gitlab-org/gitlab-ce!16863
2018-02-02 10:20:02 +00:00
cf644fc1ff
Merge branch 'add-confirmation-input-for-modals' into 'master'
...
Add confirmation input component
See merge request gitlab-org/gitlab-ce!16816
2018-02-01 20:03:16 +00:00
f072af2ea4
Add confirmation input component
2018-02-01 13:12:24 -06:00
fb1c6650ab
Fixes after review
2018-02-01 18:07:18 +00:00
e03c85b981
Merge branch 'master' into fl-mr-widget-1
...
* master: (38 commits)
Added more tests and corrected typos
Ban Rugged from Repository
Improve doc/development/automatic_ce_ee_merge.md
fixed infinite loop crashing tests
Converted todos.js to axios
Converted usage_ping.js to use axios
Converted pager.js to axios
Converted notifications_form.js to axios
Converted notes.js to axios
Converted branch_graph.js to axios
Converted mini_pipeline_graph_dropdown.js to axios
Include subgroup issuables on the group page
Remove grpc and google-protobuf platform-specific version markers in Gemfile.lock
Replace $.ajax in find file with axios
Replace $.ajax in activity calendar with axios
Remove namespaced internationalization import
Fix subgroup creation docs
Fix a JSON schema that doesn't include enough fields
Make user/author use project.creator in most factories
Enable RuboCop Style/RegexpLiteral
...
2018-02-01 17:53:26 +00:00
ebc32465b6
Moves more mr widget components into vue files
2018-02-01 17:37:54 +00:00
402f3dfc0a
Merge branch 'ph-axios-3' into 'master'
...
More conversions to axios
See merge request gitlab-org/gitlab-ce!16848
2018-02-01 16:42:43 +00:00
3fed0302cb
Transform `a` tag with button role into a `button`
2018-02-01 16:21:38 +00:00
72be759af1
Merge branch '35779-realtime-update-of-pipeline-status-in-files-view' into 'master'
...
Realtime update of pipeline status in Files view
Closes #35779
See merge request gitlab-org/gitlab-ce!16523
2018-02-01 16:15:42 +00:00
1123d9dc46
Added more tests and corrected typos
2018-02-01 09:41:30 -06:00
135a02cf42
Merge branch 'master' into ph-axios-2
2018-02-01 15:26:59 +00:00
3d89a03e72
Moves widget header into a vue file
2018-02-01 13:05:37 +00:00
fe2e8dba22
fixed infinite loop crashing tests
2018-02-01 12:26:55 +00:00
Filipa Lacerda
Clement Ho
Constance Okoghenun
Shah El-Rahman
Simon Knox
Robert Speicher
Phil Hughes
Kushal Pandya
Kamil Trzciński
Mike Greiling
Fabio Busatto
George Tsiolis
Winnie Hellmann
Shinya Maeda
Eric Eastwood
Douwe Maan
Jose Ivan Vargas