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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'remove-jquery-ui-sortable' into 'master'	Jacob Schatz	2017-02-08	19	-135/+160
\|\ \| \| \| \| \| \| \| \|	Removed jQuery UI sortable See merge request !8478
\| *	Removed jQuery UI sortableremove-jquery-ui-sortable	Phil Hughes	2017-02-06	19	-135/+160
\| \|
* \|	Merge branch 'dz-fix-route-rename-descendants' into 'master'	Dmitriy Zaporozhets	2017-02-08	2	-11/+28
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix route rename descendants if route.name is blank See merge request !9074
\| * \|	Fix route rename descendants if route.name is blank	Dmitriy Zaporozhets	2017-02-08	2	-11/+28
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Merge branch 'bypass-whitelist-for-external-user' into 'master'	Robert Speicher	2017-02-08	4	-4/+36
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bypass signup domain validation for external users Closes #25279 See merge request !8575
\| * \|	Bypass signup domain validation for external users	Reza Mohammadi	2017-02-08	4	-4/+36
\| \| \| \| \| \| \| \| \| \| \| \|	Fixes #25279
* \| \|	Merge branch 'mr-widget-pipelines' into 'master'	Fatih Acet	2017-02-08	1	-0/+6
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reduce padding of mr widget mini graph See merge request !9071
\| * \| \|	Reduce padding of mr widget mini graph	Annabel Dunstone Gray	2017-02-08	1	-0/+6
\| \| \| \|
* \| \| \|	Merge branch '27756-fix-json-404-response' into 'master'	Clement Ho	2017-02-08	4	-5/+28
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes ajax requests when current URL has a trailing slash Closes #27756 See merge request !9010
\| * \| \| \|	Remove sleep from tests	Clement Ho	2017-02-08	1	-2/+0
\| \| \| \| \|
\| * \| \| \|	Add tests27756-fix-json-404-response	Alfredo Sumaran	2017-02-07	2	-1/+25
\| \| \| \| \|
\| * \| \| \|	Fixes ajax requests when current URL has a trailing slash	Alfredo Sumaran	2017-02-07	3	-5/+6
\| \| \| \| \|
* \| \| \| \|	Merge branch '27880-pipelines-table-not-showing-commit-branch' into 'master'	Clement Ho	2017-02-08	3	-3/+11
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Looks for correct key to pass to commit prop. Adds rspec test. Closes #27880 See merge request !9070
\| * \| \| \| \|	Looks for correct key to pass to commit prop. Adds rspec test.	Filipa Lacerda	2017-02-08	3	-3/+11
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'dz-refactor-full-path' into 'master'	Dmitriy Zaporozhets	2017-02-08	16	-98/+191
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Store group and project full name and full path in routes table See merge request !8979
\| * \| \| \| \| \|	Store group and project full name and full path in routes tabledz-refactor-full-path	Dmitriy Zaporozhets	2017-02-08	16	-98/+191
\| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \|	Merge branch 'widget-spec-failure' into 'master'	Sean McGivern	2017-02-08	1	-2/+0
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed random merge request widget failure Closes #27806 See merge request !9068
\| * \| \| \| \|	Fixed random merge request widget failure	Phil Hughes	2017-02-08	1	-2/+0
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'rename_delete_services' into 'master'	Rémy Coutable	2017-02-08	19	-86/+89
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix inconsistent naming for services that delete things See merge request !5803
\| * \| \| \| \| \|	Fix inconsistent naming for services that delete things	dixpac	2017-02-08	19	-86/+89
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Changed name of delete_user_service and worker to destroy * Move and change delete_group_service to Groups::DestroyService * Rename Notes::DeleteService to Notes::DestroyService
* \| \| \| \| \| \|	Merge branch 'minigraph-fix' into 'master'	Filipa Lacerda	2017-02-08	1	-1/+1
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Listens on document for mini-pipeline graph See merge request !9066
\| * \| \| \| \| \|	Listens on document for mini-pipeline graphminigraph-fix	Phil Hughes	2017-02-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This technically fixes an issue in EE, but to keep code the same this is the CE port
* \| \| \| \| \| \|	Merge branch 'backport-ee-build-fixes' into 'master'	Filipa Lacerda	2017-02-08	3	-1/+15
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport fixes for pipelines_store frontend specs Closes #27871 See merge request !9067
\| * \| \| \| \| \|	backport fixes for pipelines_store frontend specsbackport-ee-build-fixes	Mike Greiling	2017-02-08	3	-1/+15
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'patch-12' into 'master'	Rémy Coutable	2017-02-08	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix link in CONTRIBUTING.md See merge request !8859
\| * \| \| \| \| \| \|	Fix link in CONTRIBUTING.md	Carlos Galarza	2017-01-28	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '20495-plus-icon-button' into 'master'	Alfredo Sumaran	2017-02-08	3	-6/+6
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove plus icon from compare view Closes #20495 See merge request !9056
\| * \| \| \| \| \| \|	Remove plus icon in commits view MR button	Annabel Dunstone Gray	2017-02-08	1	-3/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add changelog20495-plus-icon-button	Annabel Dunstone Gray	2017-02-07	1	-0/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Remove plus icon from compare view	Annabel Dunstone Gray	2017-02-07	1	-3/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '23104-remove-public-param-for-projects' into 'master'	Douwe Maan	2017-02-08	4	-70/+17
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: remove `public` param for projects Closes #23104 See merge request !8736
\| * \| \| \| \| \| \| \|	Use VisibilityLevel constants in spec23104-remove-public-param-for-projects	Toon Claes	2017-02-07	1	-4/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	API: remove `public` param for projects	Toon Claes	2017-02-07	4	-67/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The create and edit actions for projects had these parameters: - `public` (optional) - if true same as setting `visibility_level = 20` - `visibility_level` (optional) Remove the `public` parameter to avoid contradiction.
* \| \| \| \| \| \| \| \|	Merge branch 'dz-limit-nested-groups' into 'master'	Douwe Maan	2017-02-08	2	-12/+36
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Limit level of nesting for groups See merge request !9000
\| * \| \| \| \| \| \| \|	Limit level of nesting for groupsdz-limit-nested-groups	Dmitriy Zaporozhets	2017-02-08	2	-12/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \|	Merge branch 'pages-0.3.0' into 'master'	Robert Speicher	2017-02-08	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update GitLab pages to v0.3.0 See merge request !9043
\| * \| \| \| \| \| \| \| \|	Update GitLab pages to v0.3.0	Nick Thomas	2017-02-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '26705-filter-todos-by-manual-add' into 'master'	Sean McGivern	2017-02-08	4	-8/+61
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Filter todos by manual add Closes #26705 See merge request !8861
\| * \| \| \| \| \| \| \| \| \|	Filter todos by manual add	Jacopo	2017-01-28	4	-8/+61
\| \| \|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added the option to filter todo by Added and Pipelines
* \| \| \| \| \| \| \| \| \|	Merge branch 'patch-10' into 'master'	Rémy Coutable	2017-02-08	1	-17/+18
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show how to reference a line within a repository file. See merge request !8249
\| * \| \| \| \| \| \| \| \| \|	Shows how to reference a line within a repository file.	Marcel Huber	2016-12-22	1	-17/+18
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix-api-delete-file-example' into 'master'	Rémy Coutable	2017-02-08	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix the curl command for deleting files (DELETE instead of PUT) See merge request !8245
\| * \| \| \| \| \| \| \| \| \| \|	Fix the curl command for deleting files (DELETE instead of PUT)	Bruno Melli	2016-12-21	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'feature/gb/paginated-environments-api' into 'master'	Rémy Coutable	2017-02-08	9	-34/+282
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expose paginated environments list API endpoint See merge request !8928
\| * \| \| \| \| \| \| \| \| \| \| \|	Make headers asserts explicit in pagination specsfeature/gb/paginated-environments-api	Grzegorz Bizon	2017-02-07	1	-5/+8
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Use `#present?` instead of `defined?` in serializers	Grzegorz Bizon	2017-02-07	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Simplify implementation of environments serializer	Grzegorz Bizon	2017-02-07	1	-5/+4
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into feature/gb/paginated-environments-api	Filipa Lacerda	2017-02-07	305	-1117/+10648
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|/ / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (301 commits) added missed commit in rebase update Grape routes to work with current version of Grape adds changelog fixes cursor issue on pipeline pagination Use random group name to prevent conflicts List all groups/projects for admins on explore pages Fix indentation More backport Fix filtered search user autocomplete for gitlab instances that are hosted on a subdirectory Fixed variables_controller_spec.rb test Backport of the frontend view, including tests Updated the #create action to render the show view in case of a form error Improved code styling on the variables_controller_spec Added tests for the variables controller #update action Added a variable_controller_spec test to test for flash messages on the #create action Modified redirection logic in the variables cont. Added redirections to the index actions for the variables and triggers controllers Added a flash message to the creation of triggers Fixed tests, renamed files and methods Changed the controller/route name to 'ci/cd' and renamed the corresponding files ...
\| * \| \| \| \| \| \| \| \| \| \| \|	Add specs for standalone pagination for serializers	Grzegorz Bizon	2017-02-06	4	-5/+61
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Move serializers pagination class to separate module	Grzegorz Bizon	2017-02-06	4	-25/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This helps to avoid conflicts with `Paginator` class that seems to be used by some bundled libs.