delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update to jQuery 3.	Jacob Schatz	2018-02-20	1	-0/+5
\|
*	Move spinach project network graph tests to RSpec	Semyon Pupkov	2018-02-16	1	-0/+108
\| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
*	Merge branch 'move-profile-to-rspec' into 'master'	Rémy Coutable	2018-02-15	5	-19/+231
\|\ \| \| \| \| \| \| \| \|	Move spinach profile tests to RSpec See merge request gitlab-org/gitlab-ce!17068
\| *	Move spinach profile tests to RSpec	Semyon Pupkov	2018-02-15	5	-19/+231
\| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* \|	Move spinach group milestones test to RSpec	Semyon Pupkov	2018-02-15	1	-37/+114
\| \|
* \|	Move feature group members search test to RSpec	Semyon Pupkov	2018-02-15	1	-0/+29
\|/ \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
*	Merge branch '41722-track-gcp-billing-enabled-project-changes' into 'master'	Kamil Trzciński	2018-02-14	1	-2/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Track GCP Billing enabled project changes" Closes #41722 See merge request gitlab-org/gitlab-ce!16962
\| *	Fix GCP cluster feature spec	Matija Čupić	2018-02-12	1	-2/+2
\| \|
* \|	Merge branch '37050-ext-issue-tracker' into 'master'	Sean McGivern	2018-02-14	2	-9/+114
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \|	Display a link to external issue tracker when enabled Closes #37050 See merge request gitlab-org/gitlab-ce!17030
\| *	Display a link to external issue tracker when enabled	Jarka Kadlecová	2018-02-14	2	-9/+114
\| \|
* \|	Merge branch 'fix-mermaid-xss' into 'security-10-4'	Douwe Maan	2018-02-09	5	-0/+46
\|/ \| \| \|	[10.4] Fix stored XSS in code blocks
*	Merge branch '40744-hashed-storage-specs' into 'master'	Sean McGivern	2018-02-08	1	-3/+3
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Use hashed storage in the specs Closes #40744 See merge request gitlab-org/gitlab-ce!15681
\| *	Use hashed storage in the specs40744-hashed-storage-specs	Nick Thomas	2018-02-07	1	-3/+3
\| \|
* \|	Added 'clear' button to ci lint editor	Lin Jen-Shin	2018-02-08	1	-8/+26
\| \|
* \|	Resolve "New design for user deletion confirmation in admin area"	Shah El-Rahman	2018-02-08	1	-4/+4
\| \|
* \|	Merge branch '41297-new-design-for-cancel-stop-pipeline-confirmation' into ↵	Clement Ho	2018-02-08	1	-2/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "New design for cancel / stop pipeline confirmation" Closes #41297 See merge request gitlab-org/gitlab-ce!16813
\| * \|	Add modal for stopping and retrying pipelines41297-new-design-for-cancel-stop-pipeline-confirmation	Shah El-Rahman	2018-02-07	1	-2/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix tests Address code review feedback Fix tests
* \| \|	Replace $.ajax in profile.js with axios	Clement Ho	2018-02-07	1	-0/+9
\| \| \|
* \| \|	Removing gitaly flags	Francisco Javier López	2018-02-07	2	-246/+263
\| \|/ \|/\|
* \|	Merge branch '38175-add-domain-field-to-auto-devops-application-setting' ↵	Kamil Trzciński	2018-02-07	1	-0/+10
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Add domain field to Auto DevOps application setting" Closes #38175 See merge request gitlab-org/gitlab-ce!16604
\| * \|	Use Gitlab::CurrentSettings instead of current_application_settings	Matija Čupić	2018-02-03	1	-2/+2
\| \| \|
\| * \|	Merge branch 'master' into ↵	Matija Čupić	2018-02-03	1	-14/+16
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	38175-add-domain-field-to-auto-devops-application-setting
\| * \ \	Merge branch 'master' into ↵	Matija Čupić	2018-02-02	5	-10/+18
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	38175-add-domain-field-to-auto-devops-application-setting
\| * \ \ \	Merge branch 'master' into ↵	Matija Čupić	2018-02-02	10	-55/+87
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	38175-add-domain-field-to-auto-devops-application-setting
\| * \ \ \ \	Merge branch 'master' into ↵	Matija Čupić	2018-01-28	8	-10/+134
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	38175-add-domain-field-to-auto-devops-application-setting
\| * \| \| \| \| \|	Expose auto_devops_domain in admin settings view	Matija Čupić	2018-01-22	1	-0/+10
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'ce-39118-dynamic-pipeline-variables-fe' into 'master'	Kamil Trzciński	2018-02-07	3	-210/+22
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Dynamic CI secret variables -- CE backport See merge request gitlab-org/gitlab-ce!16842
\| * \| \| \| \| \| \|	Use dynamic variable list in scheduled pipelines and group/project CI secret ↵	Eric Eastwood	2018-02-05	3	-210/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
* \| \| \| \| \| \| \|	Merge branch 'winh-kubernetes-clusters' into 'master'	Phil Hughes	2018-02-06	4	-29/+29
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace "cluster" with "Kubernetes cluster" Closes #41963 See merge request gitlab-org/gitlab-ce!16778
\| * \| \| \| \| \| \| \|	Replace "cluster" with "Kubernetes cluster"winh-kubernetes-clusters	Winnie Hellmann	2018-02-06	4	-29/+29
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'feature/sm/artifacts-trace' into 'master'	Kamil Trzciński	2018-02-06	1	-10/+26
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE: Trace as artifacts (FileStorage only) Closes gitlab-ee#4180 See merge request gitlab-org/gitlab-ce!16702
\| * \| \| \| \| \| \| \|	Refactor :trace to :trace_live in spec	Shinya Maeda	2018-02-06	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Remove unnecessary changes for job features spec	Shinya Maeda	2018-02-06	1	-5/+5
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Finish all tests	Shinya Maeda	2018-02-06	1	-14/+30
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge branch '39550-group-labels-redesign' into 'master'	Tim Zallmann	2018-02-06	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Group label list page redesign" Closes #39550 See merge request gitlab-org/gitlab-ce!16592
\| * \| \| \| \| \| \|	Fix labels specs	Annabel Dunstone Gray	2018-01-30	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Allow moving wiki pages from the UI	Francisco Javier López	2018-02-05	2	-2/+75
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Fix export removal for hashed-storage projects within a renamed or deleted ↵	Nick Thomas	2018-02-05	1	-25/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	namespace
* \| \| \| \| \| \| \|	Merge branch '25327-coverage-badge-rounding' into 'master'	Rémy Coutable	2018-02-05	1	-2/+2
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change rounding on code coverage badge to be consistent with other displays See merge request gitlab-org/gitlab-ce!10083
\| * \| \| \| \| \| \|	Change coverage badge rounding for other CI system consistency	Jeff Stubler	2018-02-01	1	-2/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'refactor-ci-variable-list-for-future-usage-in-4110' into 'master'	Filipa Lacerda	2018-02-02	1	-14/+16
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor CI variable list code for usage with CI/CD settings page secret variables See merge request gitlab-org/gitlab-ce!16729
\| * \| \| \| \| \| \|	Refactor CI variable list code for usage with CI/CD settings page secret ↵refactor-ci-variable-list-for-future-usage-in-4110	Eric Eastwood	2018-01-31	1	-14/+16
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	variables Part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4110
* \| \| \| \| \| \|	Merge branch '24167__color_label' into 'master'	Douwe Maan	2018-02-02	1	-0/+8
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Colors to GitLab Flavored Markdown Closes #24167 See merge request gitlab-org/gitlab-ce!16095
\| * \| \| \| \| \| \|	Add Colors to GitLab Flavored Markdown	Tony Rom	2018-01-29	1	-0/+8
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	use Gitlab::UserSettings directly as a singleton instead of ↵	Mario de la Ossa	2018-02-02	4	-10/+10
\| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	including/extending it
* \| \| \| \| \|	Merge branch 'master' into fl-mr-widget-1	Filipa Lacerda	2018-02-01	5	-42/+65
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 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 ...
\| * \ \ \ \ \	Merge branch '36009-user-default-project-creator-in-factories' into 'master'	Robert Speicher	2018-02-01	2	-11/+13
\| \|\ \ \ \ \ \ \| \| \|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make user/author use project.creator in most factories Closes #36009 See merge request gitlab-org/gitlab-ce!13321
\| \| * \| \| \| \|	Make user/author use project.creator in most factories	Rémy Coutable	2018-01-31	2	-11/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \|	Merge branch '30106-group-issues' into 'master'	Sean McGivern	2018-02-01	1	-24/+45
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	View all issues of all subgroups on the group issue page Closes #30106 and #39388 See merge request gitlab-org/gitlab-ce!16706
\| \| * \| \| \| \| \|	Include subgroup issuables on the group page30106-group-issues	Jarka Kadlecová	2018-02-01	1	-24/+45
\| \| \| \| \| \| \| \|