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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix typos in IDE props	George Tsiolis	2018-10-30	5	-7/+12
\|
*	Merge branch 'qa-filter-comments-in-issues' into 'master'	Grzegorz Bizon	2018-10-30	3	-15/+55
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Adding tests for filtering activities/comments in issues Closes #51889 See merge request gitlab-org/gitlab-ce!22564
\| *	Adding tests for filtering activities/comments in issues	Ramya Authappan	2018-10-30	3	-15/+55
\|/
*	Merge remote-tracking branch 'origin/master' into dev-master	Jan Provaznik	2018-10-30	23	-59/+66
\|\
\| *	Merge branch 'bw-fix-spec-in-merge' into 'master'	Stan Hu	2018-10-30	1	-1/+1
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix problem with spec that showed up in EE merge See merge request gitlab-org/gitlab-ce!22675
\| \| *	Fix problem with spec that showed up in EE merge	Brett Walker	2018-10-29	1	-1/+1
\| \| \|
\| * \|	Merge branch 'docs-add_deprecation_notice_for_renamed_licensed_feature-ce' ↵	Evan Read	2018-10-30	1	-0/+6
\| \|\ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' docs: Add deprecation notice for renamed licensed feature See merge request gitlab-org/gitlab-ce!22575
\| \| *	Add deprecation notice for renamed licensed featuredocs-add_deprecation_notice_for_renamed_licensed_feature-ce	Olivier Gonzalez	2018-10-24	1	-0/+6
\| \| \|
\| * \|	Merge branch 'patch-31' into 'master'	Evan Read	2018-10-30	1	-0/+3
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added a note about machine types See merge request gitlab-org/gitlab-ce!22572
\| \| * \|	Added a note about machine types	Mark Veenstra	2018-10-30	1	-0/+3
\| \|/ /
\| * \|	Merge branch 'update-gitlab-ui' into 'master'	Mike Greiling	2018-10-29	16	-51/+51
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update gitlab-ui to 1.9.0 See merge request gitlab-org/gitlab-ce!22632
\| \| * \|	Update gitlab-ui to 1.9.0	Clement Ho	2018-10-29	16	-51/+51
\| \|/ /
\| * \|	Merge branch '53270-remove-mousetrap-rails' into 'master'	Mike Greiling	2018-10-29	4	-7/+5
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove mousetrap-rails gem Closes #53270 See merge request gitlab-org/gitlab-ce!22647
\| \| * \|	Remove mousetrap-rails gem	Takuya Noguchi	2018-10-28	4	-7/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* \| \| \|	Merge remote-tracking branch 'origin/master' into dev-master	DJ Mountney	2018-10-29	406	-3204/+6889
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge branch 'blackst0ne-update-push-new-merge-request-url' into 'master'	Douwe Maan	2018-10-29	25	-47/+55
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make new merge request URL more friendly when pushing code Closes #53012 See merge request gitlab-org/gitlab-ce!22526
\| \| * \| \|	Revert _diffs.html.hamlblackst0ne-update-push-new-merge-request-url	blackst0ne	2018-10-27	1	-1/+0
\| \| \| \| \|
\| \| * \| \|	Fix specs	blackst0ne	2018-10-26	8	-16/+17
\| \| \| \| \|
\| \| * \| \|	Update other links	blackst0ne	2018-10-26	14	-23/+25
\| \| \| \| \|
\| \| * \| \|	Make new merge request URL more friendly when pushing code	blackst0ne	2018-10-23	6	-9/+15
\| \| \| \| \|
\| * \| \| \|	Merge branch 'ml-qa-push-private-token' into 'master'	Dan Davison	2018-10-29	2	-1/+33
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add e2e test to push using a private token See merge request gitlab-org/gitlab-ce!22628
\| \| * \| \| \|	Add e2e test to push using a private tokenml-qa-push-private-token	Mark Lapierre	2018-10-29	2	-1/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Tests pushing over HTTP(S) using a personal access token
\| * \| \| \| \|	Merge branch '53273-update-moment-to-2-22-2' into 'master'	Mike Greiling	2018-10-29	2	-6/+6
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update moment to 2.22.2 Closes #53273 See merge request gitlab-org/gitlab-ce!22648
\| \| * \| \| \| \|	Update moment to 2.22.2	Takuya Noguchi	2018-10-28	2	-6/+6
\| \| \| \|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
\| * \| \| \| \|	Merge branch 'pages-1-3-0' into 'master'	Robert Speicher	2018-10-29	1	-1/+1
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update GitLab Pages to v1.3.0 See merge request gitlab-org/gitlab-ce!22666
\| \| * \| \| \| \|	Update GitLab Pages to v1.3.0	Nick Thomas	2018-10-29	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'rails5-deprecated-uniq' into 'master'	Robert Speicher	2018-10-29	6	-6/+11
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace deprecated uniq on a Relation with distinct See merge request gitlab-org/gitlab-ce!22625
\| \| * \| \| \| \| \|	Replace deprecated uniq on a Relation with distinct	Jasper Maes	2018-10-26	6	-6/+11
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch '5979_rename_sast_container_gitlab_features-ce' into 'master'	Kamil Trzciński	2018-10-29	1	-1/+1
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename 'sast_container' licensed feature See merge request gitlab-org/gitlab-ce!22662
\| \| * \| \| \| \| \| \|	Rename 'sast_container' licensed feature5979_rename_sast_container_gitlab_features-ce	Kamil Trzciński	2018-10-29	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'sh-bump-whitequark-parser' into 'master'	Robert Speicher	2018-10-29	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade whitequark/parser to 2.5.3.0 See merge request gitlab-org/gitlab-ce!22652
\| \| * \| \| \| \| \| \| \|	Upgrade whitequark/parser to 2.5.3.0sh-bump-whitequark-parser	Stan Hu	2018-10-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This squelches the following warning: warning: parser/current is loading parser/ruby24, which recognizes warning: 2.4.4-compliant syntax, but you are running 2.4.5. warning: please see https://github.com/whitequark/parser#compatibility-with-ruby-mri.
\| * \| \| \| \| \| \| \| \|	Merge branch 'winh-delete-job-spec' into 'master'	Filipa Lacerda	2018-10-29	1	-265/+0
\| \|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Delete job_spec.js See merge request gitlab-org/gitlab-ce!22664
\| \| * \| \| \| \| \| \| \|	Delete job_spec.js	Winnie Hellmann	2018-10-29	1	-265/+0
\| \| \| \|_\|_\|/ / / / \| \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'gt-truncate-milestone-title-on-collapsed-sidebar' into 'master'	Clement Ho	2018-10-29	2	-1/+6
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Truncate milestone title on collapsed sidebar See merge request gitlab-org/gitlab-ce!22624
\| \| * \| \| \| \| \| \|	Truncate milestone title on collapsed sidebar	George Tsiolis	2018-10-26	2	-1/+6
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch '52122-fix-broken-whitespace-button' into 'master'	Phil Hughes	2018-10-29	4	-7/+178
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken "Show whitespace changes" button on MR "Changes" tab Closes #52122 See merge request gitlab-org/gitlab-ce!22539
\| \| * \| \| \| \| \| \| \|	Fix broken "Show whitespace changes" button on MR "Changes" tab	Jacques Erasmus	2018-10-29	4	-7/+178
\| \|/ / / / / / / /
\| * \| \| \| \| \| \| \|	Merge branch '45669-table-in-jobs-on-pipeline' into 'master'	Nick Thomas	2018-10-29	6	-52/+64
\| \|\ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove all tables from Pipeline page when there is no job for the Pipeline Closes #45669 See merge request gitlab-org/gitlab-ce!18540
\| \| * \| \| \| \| \| \|	Remove all tables from Pipeline page when there is no job for the Pipeline	Takuya Noguchi	2018-10-29	6	-52/+64
\| \|/ / / / / / /
\| * \| \| \| \| \| \|	Merge branch 'extract-ee-specific-lines-for-issues-and-mr-controllers' into ↵	Nick Thomas	2018-10-29	3	-4/+34
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Extract ee specific lines for issues and mr controllers See merge request gitlab-org/gitlab-ce!22569
\| \| * \| \| \| \| \| \|	Extract EE-specific lines from MRs controllerextract-ee-specific-lines-for-issues-and-mr-controllers	Sean McGivern	2018-10-26	2	-1/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move access checks to their own method so they can be overridden, and port an EE-only method to exist in CE too, with an EE-specific override.
\| \| * \| \| \| \| \| \|	Extract EE-specific lines from issues controller	Sean McGivern	2018-10-24	1	-3/+16
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch '53155-structured-logs-params-array' into 'master'	Sean McGivern	2018-10-29	3	-2/+15
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix open-ended params for api_json.log Closes #53155 See merge request gitlab-org/gitlab-ce!22623
\| \| * \| \| \| \| \| \| \|	Fix open-ended params for api_json.log	Andrew Newdigate	2018-10-29	3	-2/+15
\| \|/ / / / / / / /
\| * \| \| \| \| \| \| \|	Merge branch 'lyle-master-patch-08152' into 'master'	Achilleas Pipinellis	2018-10-29	1	-1/+18
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	adds warning against Postgres across NFS See merge request gitlab-org/gitlab-ce!22278
\| \| * \| \| \| \| \| \| \|	adds warning against Postgres across NFS	Lyle Kozloff	2018-10-29	1	-1/+18
\| \|/ / / / / / / /
\| * \| \| \| \| \| \| \|	Merge branch 'ce-7103-show-milestone-dates-within-tooltips' into 'master'	Phil Hughes	2018-10-29	4	-36/+52
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE Backport: Show actual Milestone dates within tooltips for Milestones in Epics sidebar See merge request gitlab-org/gitlab-ce!22653
\| \| * \| \| \| \| \| \| \|	Update tooltip for when no date is present, port back EE changesce-7103-show-milestone-dates-within-tooltips	Kushal Pandya	2018-10-29	4	-36/+52
\| \| \| \|_\|/ / / / / \| \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'ac-post-merge-pipeline' into 'master'	Nick Thomas	2018-10-29	22	-118/+588
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	post merge pipeline and environments status Closes #47799 See merge request gitlab-org/gitlab-ce!22292