- 11 Jan, 2018 40 commits
-
-
https://gitlab.com/gitlab-org/gitlab-eeLuke Bennett authored
Merge branch 'ce-to-ee-2018-01-11' of https://gitlab.com/gitlab-org/gitlab-ee into ce-to-ee-2018-01-11
-
Luke Bennett authored
-
Luke Bennett authored
-
Luke Bennett authored
-
Luke Bennett authored
-
Luke Bennett authored
-
Luke Bennett authored
-
Luke Bennett authored
-
Luke Bennett authored
-
Filipa Lacerda authored
-
Filipa Lacerda authored
-
Filipa Lacerda authored
-
Filipa Lacerda authored
-
Filipa Lacerda authored
-
Luke Bennett authored
-
Luke Bennett authored
-
Grzegorz Bizon authored
-
GitLab Bot authored
# Conflicts: # app/assets/javascripts/boards/components/board_card.vue # app/assets/javascripts/clusters/components/application_row.vue # app/assets/javascripts/commit/pipelines/pipelines_table.vue # app/assets/javascripts/cycle_analytics/components/stage_code_component.vue # app/assets/javascripts/cycle_analytics/components/stage_component.vue # app/assets/javascripts/cycle_analytics/components/stage_plan_component.vue # app/assets/javascripts/cycle_analytics/components/stage_review_component.vue # app/assets/javascripts/cycle_analytics/components/stage_staging_component.vue # app/assets/javascripts/cycle_analytics/components/stage_test_component.vue # app/assets/javascripts/dispatcher.js # app/assets/javascripts/environments/components/environment_actions.vue # app/assets/javascripts/environments/components/environment_external_url.vue # app/assets/javascripts/environments/components/environment_item.vue # app/assets/javascripts/environments/components/environment_monitoring.vue # app/assets/javascripts/environments/components/environment_rollback.vue # app/assets/javascripts/environments/components/environment_stop.vue # app/assets/javascripts/environments/components/environment_terminal_button.vue # app/assets/javascripts/environments/components/environments_table.vue # app/assets/javascripts/environments/folder/environments_folder_view.vue # app/assets/javascripts/groups/components/app.vue # app/assets/javascripts/groups/components/item_actions.vue # app/assets/javascripts/groups/components/item_stats_value.vue # app/assets/javascripts/ide/components/ide_project_branches_tree.vue # app/assets/javascripts/ide/components/ide_side_bar.vue # app/assets/javascripts/ide/components/repo_editor.vue # app/assets/javascripts/ide/components/repo_preview.vue # app/assets/javascripts/ide/components/repo_tab.vue # app/assets/javascripts/issue_show/components/app.vue # app/assets/javascripts/monitoring/components/dashboard.vue # app/assets/javascripts/monitoring/components/graph.vue # app/assets/javascripts/monitoring/components/graph/flag.vue # app/assets/javascripts/notebook/cells/markdown.vue # app/assets/javascripts/notes/components/comment_form.vue # app/assets/javascripts/notes/components/note_attachment.vue # app/assets/javascripts/notes/components/note_form.vue # app/assets/javascripts/notes/components/noteable_note.vue # app/assets/javascripts/pipelines/components/async_button.vue # app/assets/javascripts/pipelines/components/graph/action_component.vue # app/assets/javascripts/pipelines/components/graph/graph_component.vue # app/assets/javascripts/pipelines/components/graph/stage_column_component.vue # app/assets/javascripts/pipelines/components/header_component.vue # app/assets/javascripts/pipelines/components/pipelines_table_row.vue # app/assets/javascripts/pipelines/components/stage.vue # app/assets/javascripts/projects/permissions/components/settings_panel.vue # app/assets/javascripts/registry/components/table_registry.vue # app/assets/javascripts/sidebar/components/confidential/confidential_issue_sidebar.vue # app/assets/javascripts/sidebar/components/lock/edit_form.vue # app/assets/javascripts/sidebar/components/lock/lock_issue_sidebar.vue # app/assets/javascripts/sidebar/components/subscriptions/sidebar_subscriptions.vue # app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue # app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue # app/assets/javascripts/vue_shared/components/ci_icon.vue # app/assets/javascripts/vue_shared/components/header_ci_component.vue # app/assets/javascripts/vue_shared/components/issue/issue_warning.vue # app/assets/javascripts/vue_shared/components/loading_button.vue # app/assets/javascripts/vue_shared/components/markdown/field.vue # app/assets/javascripts/vue_shared/components/markdown/toolbar.vue # app/assets/javascripts/vue_shared/components/modal.vue # app/assets/javascripts/vue_shared/components/recaptcha_modal.vue # app/assets/javascripts/vue_shared/components/table_pagination.vue # app/views/layouts/header/_default.html.haml # db/schema.rb # doc/development/fe_guide/style_guide_js.md # doc/topics/git/index.md # doc/user/project/clusters/index.md # features/support/env.rb # qa/qa/page/menu/admin.rb # qa/qa/scenario/test/sanity/selectors.rb # yarn.lock [ci skip]
-
Rémy Coutable authored
Make it possible to populate QA factory product with a data from a browser See merge request gitlab-org/gitlab-ce!16384
-
Marin Jankovski authored
CE upstream - Wednesday Closes gitaly#873 and gitaly#903 See merge request gitlab-org/gitlab-ee!3994
-
Rémy Coutable authored
Add docs about QA page objects and pages DSL See merge request gitlab-org/gitlab-ce!16357
-
Rémy Coutable authored
Resolve ""New branch" and "New tag" actions are pointless on an empty repository" Closes #39988 See merge request gitlab-org/gitlab-ce!16332
-
Nick Thomas authored
Resolve "Geo secondary can't query geo node status from primary" Closes #4518 See merge request gitlab-org/gitlab-ee!3997
-
Grzegorz Bizon authored
-
Grzegorz Bizon authored
Remove call to ProjectTeam#<< in MR API spec See merge request gitlab-org/gitlab-ce!16388
-
Yorick Peterse authored
Resolve "Store the number of merge request commits in merge_request_diffs.commits_count" Closes #38068 See merge request gitlab-org/gitlab-ce!16164
-
Sean McGivern authored
-
Filipa Lacerda authored
Make modal dialog common for Groups tree app Closes #41613 See merge request gitlab-org/gitlab-ce!16311
-
Grzegorz Bizon authored
Fixed tiny typo in end_to_end_tests.md See merge request gitlab-org/gitlab-ce!16386
-
Andrew Newdigate authored
-
Grzegorz Bizon authored
Resolve "Incorrect default merge request title when Jira activated" Closes #36669 See merge request gitlab-org/gitlab-ce!16356
-
Sean McGivern authored
added missing content-type header to POST/PUT requests See merge request gitlab-org/gitlab-ee!4014
-
Sean McGivern authored
apply documentation changes from EE to CE See merge request gitlab-org/gitlab-ce!16381
-
Sean McGivern authored
Resolve 'Rebase fails with "something went wrong" and huge ugly conflict error.' Closes #41820 See merge request gitlab-org/gitlab-ce!16326
-
Sean McGivern authored
Add `pipelines` endpoint to merge requests API Closes #39214 See merge request gitlab-org/gitlab-ce!15454
-
Filipa Lacerda authored
EE port of admin-dispatcher See merge request gitlab-org/gitlab-ee!3970
-
Kamil Trzciński authored
Fix GCP redirect Closes #41867 See merge request gitlab-org/gitlab-ce!16355
-
Grzegorz Bizon authored
-
Rémy Coutable authored
Exclude sast job from being run in docs only changes Closes #41818 See merge request gitlab-org/gitlab-ce!16344
-
Rémy Coutable authored
Validate GitLab QA selectors Closes gitlab-qa#58 See merge request gitlab-org/gitlab-ce!16109
-