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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add nested groups to the APIdz-nested-groups-api	Dmitriy Zaporozhets	2017-02-08	5	-3/+27
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Merge branch '27785-fix-init-script-after-pages-to-ce' into 'master'	Douwe Maan	2017-02-07	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix syntax error in init.d/gitlab after Pages -> CE Closes #27785 See merge request !9026
\| *	Fix syntax error in init.d/gitlab after Pages -> CE	Drew Blessing	2017-02-07	1	-1/+1
\| \| \| \| \| \|	Cherry-picked ‘Fix syntax error in conditional statement’
* \|	Merge branch 'update-gitignore-templates' into 'master'	James Lopez	2017-02-07	24	-179/+141
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Update .gitignore templates See merge request !9015
\| * \|	Update .gitignore templatesupdate-gitignore-templates	Ruben Davila	2017-02-07	24	-179/+141
\| \| \|
* \| \|	Merge branch 'update-guides' into 'master'	James Lopez	2017-02-07	2	-2/+241
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update guides for 8.17 version See merge request !9014
\| * \| \|	Update guides for 8.17 versionupdate-guides	Ruben Davila	2017-02-06	2	-2/+241
\| \|/ /
* \| \|	Merge branch 'api-remove-snippets-expires-at' into 'master'	Sean McGivern	2017-02-07	12	-88/+416
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove deprecated 'expires_at' from project snippets API Closes #14156 See merge request !8723
\| * \|	Split V3 entities into a separate fileapi-remove-snippets-expires-at	Robert Schilling	2017-02-07	6	-93/+95
\| \| \|
\| * \|	Remove deprecated 'expires_at' from project snippets API	Robert Schilling	2017-02-07	8	-17/+343
\| \| \|
* \| \|	Merge branch 'fix/import-group-members' into 'master'	Rémy Coutable	2017-02-07	10	-13/+124
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix missing group members from Import/Export Closes #25124 See merge request !8923
\| * \| \|	Add missing group members to export for I/Efix/import-group-members	James Lopez	2017-02-07	10	-13/+124
\| \| \| \|
* \| \| \|	Merge branch 'docs/fix-broken-links' into 'master'	Achilleas Pipinellis	2017-02-07	46	-65/+60
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken links to docs See merge request !9022
\| * \| \| \|	Fix broken links to docs	Achilleas Pipinellis	2017-02-06	46	-65/+60
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \|	Merge branch 'fix/grape-routes' into 'master'	James Lopez	2017-02-07	1	-1/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Grape routes to work with current version of Grape See merge request !8992
\| * \| \| \| \|	added missed commit in rebase	James Lopez	2017-02-07	1	-3/+1
\| \| \| \| \| \|
\| * \| \| \| \|	update Grape routes to work with current version of Grape	James Lopez	2017-02-07	1	-1/+7
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'issue_19262' into 'master'	Sean McGivern	2017-02-07	3	-0/+44
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disallow system notes for closed issuables Closes #19262 See merge request !8848
\| * \| \| \| \| \|	Disallow system notes for closed issuablesissue_19262	Felipe Artur	2017-02-06	3	-0/+44
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '26920-hover-cursor-on-pagination-element' into 'master'	Filipa Lacerda	2017-02-07	2	-0/+18
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Mouse text cursor above pagination elements" Closes #26920 See merge request !9003
\| * \| \| \| \| \|	adds changelog26920-hover-cursor-on-pagination-element	Nur Rony	2017-02-07	1	-0/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	fixes cursor issue on pipeline pagination	Nur Rony	2017-02-07	1	-0/+14
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch ↵	Kamil Trzciński	2017-02-07	23	-63/+209
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'26165-combine-runners-and-variables-and-triggers-and-ci-cd-pipelines-settings-pages' into 'master' Merge Triggers, Runners, Variables and Pipelines to a single option called "CI/CD Pipelines" Closes #26165 See merge request !8430
\| * \| \| \| \| \|	Fixed variables_controller_spec.rb test26165-combine-runners-and-variables-and-triggers-and-ci-cd-pipelines-settings-pages	Jose Ivan Vargas	2017-02-06	1	-2/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Updated the #create action to render the show view in case of a form error	Jose Ivan Vargas	2017-02-06	1	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Improved code styling on the variables_controller_spec	Jose Ivan Vargas	2017-02-06	3	-12/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also updated the #update action inside the variables controller as to render the show and not redirect back to the settings route
\| * \| \| \| \| \|	Added tests for the variables controller #update action	Jose Ivan Vargas	2017-02-06	2	-3/+29
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Added a variable_controller_spec test to test for flash messages on the ↵	Jose Ivan Vargas	2017-02-06	2	-0/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	#create action
\| * \| \| \| \| \|	Modified redirection logic in the variables cont.	Jose Ivan Vargas	2017-02-06	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Redirections now show a flash message wether the variable was created correctly or not using a flash message
\| * \| \| \| \| \|	Added redirections to the index actions for the variables and triggers ↵	Jose Ivan Vargas	2017-02-06	2	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	controllers
\| * \| \| \| \| \|	Added a flash message to the creation of triggers	Jose Ivan Vargas	2017-02-06	1	-2/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fixed tests, renamed files and methods	Jose Ivan Vargas	2017-02-06	8	-6/+28
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Changed the controller/route name to 'ci/cd' and renamed the corresponding files	Jose Ivan Vargas	2017-02-06	13	-34/+53
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added tests to verify the access policy to the new controller
\| * \| \| \| \| \|	Added private methods to initialize variables in the ci_cd_pipelines_controller	Jose Ivan Vargas	2017-02-06	2	-5/+17
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Corrected titles on the triggers and pipelines sections	Jose Ivan Vargas	2017-02-06	3	-3/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Corrected tests and changed trigger controller redirects to the ↵	Jose Ivan Vargas	2017-02-06	2	-4/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ci_cd_pipelines_settings controller
\| * \| \| \| \| \|	Removed options from the gear button in the projects and consolidated into one	Jose Ivan Vargas	2017-02-06	2	-14/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added test for the CiCdPipelinesController
\| * \| \| \| \| \|	Fixed badges test	Jose Ivan Vargas	2017-02-06	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	changed pipelines controller name to ci_cd_pipelines	Jose Ivan Vargas	2017-02-06	8	-13/+13
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Converted the views to partials that compose the menu item "pipelines"	Jose Ivan Vargas	2017-02-06	12	-41/+58
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'stewardship-label' into 'master'	Robert Schilling	2017-02-07	1	-0/+16
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add the stewardship label to contributing.md See merge request !8997
\| * \| \| \| \| \|	add the stewardship label to contributing.mdstewardship-label	Job van der Voort	2017-02-06	1	-0/+16
\| \| \|_\|_\|/ / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'ee-1439-read-only-user' into 'master'	Douwe Maan	2017-02-07	15	-80/+265
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport changes from gitlab-org/gitlab-ee!998 See merge request !8984
\| * \| \| \| \| \|	Use random group name to prevent conflicts	Douwe Maan	2017-02-06	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	List all groups/projects for admins on explore pages	Douwe Maan	2017-02-06	2	-2/+14
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix indentationee-1439-read-only-user	Douwe Maan	2017-02-06	1	-4/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	More backport	Douwe Maan	2017-02-06	5	-36/+178
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Backport of the frontend view, including tests	Jose Ivan Vargas	2017-02-06	4	-8/+29
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Backport UI changes from gitlab-org/gitlab-ee!998	Timothy Andrew	2017-02-06	2	-22/+23
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Backport changes from gitlab-org/gitlab-ee!998	Timothy Andrew	2017-02-06	3	-21/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Some changes in EE for the auditor user feature need to be backported to CE to avoid merge conflicts. This commit encapsulates all these backports.