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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Refactor authorized params in Admin::UsersControllerrefactor-admin-controllers-params	Rémy Coutable	2017-01-11	2	-27/+32
\| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
*	Refactor authorized params in Admin::GroupsController	Rémy Coutable	2017-01-11	1	-2/+6
\| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
*	Refactor authorized params in Admin::ApplicationSettingsController	Rémy Coutable	2017-01-11	1	-45/+70
\| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
*	Merge branch 'fix-user-api-confirm-param' into 'master'	Rémy Coutable	2017-01-11	3	-1/+14
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix Users API to accept confirm parameter Closes #26295 See merge request !8531
\| *	Fix Users API to accept confirm parameter	Mark Fletcher	2017-01-11	3	-1/+14
\| \|
* \|	Merge branch 'backup-restore-documentation-tips' into 'master'	Marin Jankovski	2017-01-11	1	-1/+3
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add detail to backup_restore omnibus remote storage docs See merge request !8306
\| * \|	Add detail to backup_restore remote storage docs	Daniel Guilak	2016-12-24	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Location in which to add `gitlab_rails` configurations - Reminder to run `gitlab-ctl reconfigure` after changing gitlab_rails
* \| \|	Merge branch 'side-by-side-fixed-width' into 'master'	Fatih Acet	2017-01-11	3	-3/+52
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Keep max width on MR content on side by side view Closes #25907 See merge request !8467
\| * \| \|	Keep max width on MR content on side by side viewside-by-side-fixed-width	Annabel Dunstone Gray	2017-01-05	3	-3/+52
\| \| \| \|
* \| \| \|	Merge branch '25776-alerts-should-be-responsive' into 'master'	Annabel Dunstone Gray	2017-01-11	4	-4/+23
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Alerts should be responsive" Closes #25776 See merge request !8424
\| * \| \| \|	Removed `hidden-xs` class from alerts	Connor Smallman	2017-01-11	4	-4/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Centered alert text and prevented alert actions links from floating right for viewports below medium width (992px) Centered alert text stopped alert actions from floating right for viewports below medium width (992px) Update styles to use correct screen width variable for max-width media query Added unreleased changelog Added class to alert links wrapper Updated styles for new class, float alert links on larger screens
* \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \|