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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix broken link in docszj-fix-broken-link-docs	Z.J. van de Weg	2017-01-11	1	-1/+1
\| \| \| \|	[ci skip]
*	Merge branch 'update-templates-8-16' into 'master'	Rémy Coutable	2017-01-11	33	-53/+294
\|\ \| \| \| \| \| \| \| \|	Update templates - 8.16 RC1 See merge request !8505
\| *	add missing openshift templateupdate-templates-8-16	James Lopez	2017-01-10	1	-0/+76
\| \|
\| *	update templates	James Lopez	2017-01-09	33	-127/+292
\| \|
* \|	Merge branch 'fix/rubocop-configuration-files' into 'master'	Sean McGivern	2017-01-11	2	-410/+85
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix Rubocop configuration files to avoid CE to EE merge problems See merge request !8525
\| * \|	Fix Rubocop YAML config files to avoid CE->EE issues	Grzegorz Bizon	2017-01-11	2	-410/+85
\|/ /
* \|	Merge remote-tracking branch 'dev/master'	Robert Speicher	2017-01-10	2	-4/+20
\|\ \
\| * \|	Update CHANGELOG.md for 8.13.11	Douglas Barbosa Alexandre	2017-01-10	1	-0/+5
\| \| \| \| \| \| \| \| \|	[ci skip]
\| * \|	Update CHANGELOG.md for 8.14.6	Douglas Barbosa Alexandre	2017-01-10	1	-0/+5
\| \| \| \| \| \| \| \| \|	[ci skip]
\| * \|	Update CHANGELOG.md for 8.15.4	Douglas Barbosa Alexandre	2017-01-09	2	-4/+10
\| \| \| \| \| \| \| \| \|	[ci skip]
* \| \|	Merge branch 'patch-turbolinks' into 'security'	Robert Speicher	2017-01-10	3	-9/+53
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated Turbolinks to patched version of turbolinks-classic See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2048
* \| \|	Merge branch 'patch-8' into 'master'	Achilleas Pipinellis	2017-01-10	1	-0/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify instructions for importing Wiki/Merge Request data See merge request !8075
\| * \| \|	Update html link to markdown linkpatch-8	Lee Matos	2016-12-15	1	-1/+1
\| \| \| \|
\| * \| \|	applying style guide fixes	Lee Matos	2016-12-15	1	-1/+2
\| \| \| \|
\| * \| \|	Clarify instructions for importing Wiki/Merge Request data	Lee Matos	2016-12-13	1	-0/+2
\| \| \| \|
* \| \| \|	Merge branch '26435-show-project-avatars-on-mobile' into 'master'	Annabel Dunstone Gray	2017-01-10	3	-4/+20
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Display project avatars on Admin Area and Projects pages for mobile views See merge request !8506
\| * \| \| \|	Adjusted widths on Admin Area projects page to prevent misaligned floats	Ryan Harris	2017-01-09	1	-0/+16
\| \| \| \| \|
\| * \| \| \|	Display project avatars on Admin Area and Projects pages for mobile views	Ryan Harris	2017-01-09	2	-4/+4
\| \| \| \| \|
* \| \| \| \|	Merge branch '26504-mr-discussion-btn' into 'master'	Annabel Dunstone Gray	2017-01-10	3	-7/+10
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	26504 Fix styling of MR jump to discussion button Closes #26504 See merge request !8511
\| * \| \| \| \|	26504 Fix styling of MR jump to discussion button26504-mr-discussion-btn	tauriedavis	2017-01-10	3	-7/+10
\|/ / / / /
* \| \| \| \|	Merge branch 'fix/rubocop-offenses-on-master' into 'master'	Sean McGivern	2017-01-10	3	-5/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Rubocop offenses on `master` See merge request !8516
\| * \| \| \| \|	Update Gemfile.lock to reflect Rubocop gem version	Grzegorz Bizon	2017-01-10	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Fix Rubocop offenses in LDAP related code and spec	Grzegorz Bizon	2017-01-10	2	-4/+4
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'patch-9' into 'master'	Robert Schilling	2017-01-10	1	-1/+1
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix changelog entry for !8425 See merge request !8512
\| * \| \| \| \|	fix changelog entry for !8425	Elan Ruusamäe	2017-01-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the author and mr fields got swapped, see https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8425#note_21021254
* \| \| \| \| \|	Merge branch 'update-rubocop' into 'master'	Sean McGivern	2017-01-10	4	-141/+534
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update rubocop and rubocop-rspec to fix build errors See merge request !8466
\| * \| \| \| \| \|	Update rubocop and rubocop-rspec to fix build errorsupdate-rubocop	Brian Neel	2017-01-06	4	-141/+534
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'restore-backup-when-env-variable-is-passed' into 'master'	Sean McGivern	2017-01-10	8	-41/+150
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Restore backup correctly when "BACKUP" environment variable is passed Closes #26090 See merge request !8477
\| * \| \| \| \| \|	Restore backup correctly when "BACKUP" environment variable is passedrestore-backup-when-env-variable-is-passed	Adam Niedzielski	2017-01-09	5	-36/+136
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Introduce "stub_env" test helper for safely stubbing environment variables	Adam Niedzielski	2017-01-09	3	-5/+14
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch '24139-production-wildcard-for-cycle-analytics' into 'master'	Sean McGivern	2017-01-10	4	-7/+31
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Treat environments matching `production/*` as Production for Cycle Analytics Closes #24139 See merge request !8500
\| * \| \| \| \| \|	Treat environments matching `production/*` as Production24139-production-wildcard-for-cycle-analytics	Toon Claes	2017-01-09	4	-7/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For Cycle Analytics, the environment `production` is treated as a special case, and used to update the `first_deployed_to_production_at` metric. With the Review Apps changes, slash syntax is used to group related environments in the list. This is mostly used for `review/<branch>` environments, but it's possible for people to have multiple production environments, and someone might then want to group them like `production/eu`, `production/us`, or even just make it look prettier with `production/www.example.com`. In any of these cases, the first deploy to one of these `production/*` environments now is treated as a Production deploy.
* \| \| \| \| \| \|	Merge branch '26129-add-link-to-branches-page' into 'master'	Clement Ho	2017-01-10	2	-1/+6
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Add link to Branches page help text?" Closes #26129 See merge request !8377
\| * \| \| \| \| \| \|	squash 3 commits	Ken Ding	2017-01-10	2	-1/+6
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'auto-pipelines-vue' into 'master'	Fatih Acet	2017-01-09	43	-242/+2091
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pipelines Vue See merge request !7196
\| * \| \| \| \| \| \| \|	fix eslint for spec global needed in pagination spec for 'fixture'auto-pipelines-vue	Regis	2017-01-09	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	format duration in vue: time_ago computed property in a dynamic fashion	Regis	2017-01-09	1	-2/+11
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'master' into auto-pipelines-vue	Regis	2017-01-09	186	-611/+2105
\| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|/ / / \| \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	move param helper to common utils	Regis	2017-01-09	4	-23/+16
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	use Turbolinks instead of window.pushState for pagination	Regis	2017-01-09	2	-10/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	namespace getParametersByName to gl.utils instead of just gl	Regis	2017-01-09	4	-10/+13
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	use Object.assign instead of Vue.set - change duration to computed prop	Regis	2017-01-07	2	-7/+7
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	remove bitwise disable on pipelines.js.es6	Regis	2017-01-06	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	remove disabled rules - not needed anymore	Regis	2017-01-06	1	-1/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	remove parenthesis around returned objects in pipelines.js.es6	Regis	2017-01-06	1	-3/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	change 'pipelines.length' logic for spinner	Regis	2017-01-06	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	fix flash and request logic in stage	Regis	2017-01-06	1	-3/+5
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	fix cssClasses in status component	Regis	2017-01-06	1	-2/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	add param_helper to utils - fix switch statement in pagination	Regis	2017-01-06	2	-9/+11
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	remove white space	Regis	2017-01-06	1	-3/+0
\| \| \| \| \| \| \| \| \|