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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| \| * \| \| \| \| \|	Fix Markdown of release notes	Shinya Maeda	2019-01-30	2	-1/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It was leaings confidential issue titles and MR titles to any users Fix spec Fix spec Fix tests
\| * \| \| \| \| \| \|	Update CHANGELOG.md for 11.7.5	GitLab Release Tools Bot	2019-02-06	8	-35/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \|	Merge branch 'vzagorodny-fix-typo-feat-proposal-comment' into 'master'	Marcia Ramos	2019-02-06	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix comment typo in feature proposal issue template See merge request gitlab-org/gitlab-ce!24927
\| * \| \| \| \| \| \|	Fix comment typo in feature proposal issue template	Victor Zagorodny	2019-02-06	1	-1/+1
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'introduce-environment-search-endpoint' into 'master'	Sean McGivern	2019-02-06	6	-0/+177
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Introduce Internal API for searching environment names See merge request gitlab-org/gitlab-ce!24923
\| * \| \| \| \| \| \|	Inroduce Internal API for searching environment namesintroduce-environment-search-endpoint	Shinya Maeda	2019-02-06	6	-0/+177
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add changelog Rename word to query User hash for limit Do not allow control limit Rename pluck names and add more specs
* \| \| \| \| \| \| \|	Merge branch '30299-discussion-from-individual-note' into 'master'	Phil Hughes	2019-02-06	25	-73/+493
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add reply to notes to turn into discussions See merge request gitlab-org/gitlab-ce!24480
\| * \| \| \| \| \| \|	Add reply to notes to turn into discussions	Heinrich Lee Yu	2019-02-06	25	-73/+493
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'winh-noteable_note_spec-vue-test-utils' into 'master'	Fatih Acet	2019-02-06	1	-23/+70
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Convert noteable_note_spec.js to Vue test utils See merge request gitlab-org/gitlab-ce!24801
\| * \| \| \| \| \|	Convert noteable_note_spec.js to Vue test utils	Winnie Hellmann	2019-01-30	1	-23/+70
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'knative-list' into 'master'	Phil Hughes	2019-02-06	16	-103/+513
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Modify Serverless Listing See merge request gitlab-org/gitlab-ce!24072
\| * \| \| \| \| \| \|	Modified Knative list view to provide more details	Chris Baumbauer	2019-02-05	16	-103/+513
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'adriel-add-metrics-chart-tooltips' into 'master'	Phil Hughes	2019-02-06	2	-3/+39
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add metrics chart tooltips See merge request gitlab-org/gitlab-ce!24651
\| * \| \| \| \| \| \|	Add chart tooltips	Adriel Santiago	2019-02-05	2	-3/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use tooltips for metrics graph data
* \| \| \| \| \| \| \|	Merge branch 'create-svg-wrapper-css-class' into 'master'55312-use-import-export-issues-illustration-from-gitlab-svgs	Phil Hughes	2019-02-06	1	-0/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add square css class See merge request gitlab-org/gitlab-ce!24875
\| * \| \| \| \| \| \| \|	Add square css class	Paul Slaughter	2019-02-04	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Why? This is helpful when needing to wrap the size of an svg with an empty container. Example: ``` <div class="square s-32 d-flex-center"> <svg class="s16">...</svg> </div> ```
* \| \| \| \| \| \| \| \|	Merge branch '28500-empty-states-for-profile-page' into 'master'	Fatih Acet	2019-02-06	9	-14/+126
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Empty states for profile page" Closes #28500 See merge request gitlab-org/gitlab-ce!24549
\| * \| \| \| \| \| \| \|	Resolve "Empty states for profile page"	Dennis Tang	2019-02-06	9	-14/+126
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch '52568-external-mr-diffs' into 'master'	Sean McGivern	2019-02-06	16	-75/+581
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow merge request diffs to be placed into an object store Closes #52568 See merge request gitlab-org/gitlab-ce!24276
\| * \| \| \| \| \| \|	Allow MR diffs to be placed into an object store	Nick Thomas	2019-02-05	16	-75/+581
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'mysql_validate_pre_truncate' into 'master'	Stan Hu	2019-02-06	1	-2/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds validation for schema_migration prior to truncate. See merge request gitlab-org/gitlab-ce!6459
\| * \| \| \| \| \| \| \|	Fix MySQL error when truncating a table that doesn't exist	Jose Torres	2019-02-05	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This adds a conditional statement before truncating the `schema_migrations` table. This comit also ports this code to Rails 5.
* \| \| \| \| \| \| \| \|	Merge branch 'chore/update-js-regex' into 'master'	Stan Hu	2019-02-06	5	-8/+15
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	update js_regex 2.2.1 -> 3.1 See merge request gitlab-org/gitlab-ce!24433
\| * \| \| \| \| \| \| \|	add changelog entry	Roger Rüttimann	2019-02-05	1	-0/+5
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	remove unnuesd global regex flag g	Roger Rüttimann	2019-02-05	2	-2/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	remove newly supported regex feature from validation error test	Roger Rüttimann	2019-01-14	1	-2/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	fix initialization of JsRegex after js_regex gem update change	Roger Rüttimann	2019-01-14	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	update js_regex version	Roger Rüttimann	2019-01-14	2	-5/+9
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'merge-dev-into-master' into 'master'	Stan Hu	2019-02-06	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge dev.gitlab.org master into GitLab.com master Closes #54721, #56663, #2779, #2776, #2772, #2783, #2766, #2784, #2760, #2775, #2777, #2767, #2786, #2780, and #56860 See merge request gitlab-org/gitlab-ce!24935
\| * \| \| \| \| \| \| \| \|	Resolve conflicts in spec/services/members/destroy_service_spec.rb	Stan Hu	2019-02-05	1	-4/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Resolve conflicts in spec/policies/personal_snippet_policy_spec.rb	Stan Hu	2019-02-05	1	-3/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Resolve conflicts in spec/lib/safe_zip/extract_spec.rb	Stan Hu	2019-02-05	1	-4/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Resolve conflicts in spec/features/markdown/math_spec.rb	Stan Hu	2019-02-05	1	-4/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Resolve conflicts in app/policies/personal_snippet_policy.rb	Stan Hu	2019-02-05	1	-3/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Resolve conflicts in config/routes/import.rb	Stan Hu	2019-02-05	1	-4/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Resolve conflict in projects/issues_controller.rb	Brett Walker	2019-02-05	1	-4/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Resolve conflict in email_pipeline.rb	Brett Walker	2019-02-05	1	-4/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Resolve conflict in app/views/layouts/nav/sidebar/_project.html.haml	Francisco Javier López	2019-02-05	1	-4/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix a conflict in GITALY_SERVER_VERSION	Nick Thomas	2019-02-05	1	-4/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GitLab.com master now points at Gitaly v1.17.0. Dev master pointed at 1.14.1 due to a recent security release. That fix is present in 1.17.0 so it is safe to take the .com side here.
\| * \| \| \| \| \| \| \| \|	Merge dev.gitlab.org master into GitLab.com master	Yorick Peterse	2019-02-05	10	-0/+38
\| \|\ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \|	Update CHANGELOG.md for 11.6.9	GitLab Release Tools Bot	2019-02-04	1	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| \| * \| \| \| \| \| \| \| \|	Update CHANGELOG.md for 11.6.8	GitLab Release Tools Bot	2019-01-30	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| \| * \| \| \| \| \| \| \| \|	Merge branch 'fix-rubyzip-require' into 'master'	Yorick Peterse	2019-01-30	1	-1/+1
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[master] Fix requiring the rubyzip Gem See merge request gitlab/gitlabhq!2876
\| \| \| * \| \| \| \| \| \| \| \|	Fix requiring the rubyzip Gem	Yorick Peterse	2019-01-30	1	-1/+1
\| \| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In commit 6fa5fd8515e0f2d5a6341134560021f353d84362 the `require: false` was removed to ensure the Gem was loaded at run time. Unfortunately, the `require` necessary for the rubyzip Gem is "zip" and not "rubyzip". As a result, Bundler would not require the Gem. This meant that we would still run into constant errors when referring to `Zip::File`.
\| \| * \| \| \| \| \| \| \| \|	Merge branch 'dev-master' into 'master'	Yorick Peterse	2019-01-30	3	-2/+7
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[master] Fix uninitialized constant with GitLab Pages deploy See merge request gitlab/gitlabhq!2875
\| \| \| * \| \| \| \| \| \| \|	Fix uninitialized constant with GitLab Pages deploy	Stan Hu	2019-01-29	3	-2/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	pages:deploy step was failing with the following error: ``` unitialized constant SafeZip::Extract::Zip ``` Since license_finder already pulls in rubyzip, we can make it a required gem. We also use the scope operator to make the reference to Zip::File explicit.
\| \| * \| \| \| \| \| \| \| \|	Update CHANGELOG.md for 11.7.2	GitLab Release Tools Bot	2019-01-29	1	-0/+34
\| \| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| \| * \| \| \| \| \| \| \|	Update CHANGELOG.md for 11.5.8	GitLab Release Tools Bot	2019-01-28	1	-0/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| \| * \| \| \| \| \| \| \|	Update CHANGELOG.md for 11.7.1	GitLab Release Tools Bot	2019-01-28	21	-101/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| \| * \| \| \| \| \| \| \|	Merge branch '56860-fix-spec-race-condition-upside-the-head' into 'master'	Douglas Barbosa Alexandre	2019-01-28	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a JS race in a spec Closes #56860 See merge request gitlab-org/gitlab-ce!24684