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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' into feature/multi-level-container-registry-images	Grzegorz Bizon	2017-03-21	2771	-20505/+25386
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (1327 commits) Merge branch 'render-json-leak' into 'security' Merge branch 'ssrf' into 'security' Merge branch 'ssrf' into 'security' Merge branch 'fix-links-target-blank' into 'security' Merge branch '28058-hide-emails-in-atom-feeds' into 'security' Fix karma test Reset filters after click Handle Route#name being nil after an update Only add frontend code coverage instrumentation when generating coverage report fix recompile assets step in 9.0 upgrade guide to use yarn Undo explicit conversion to Integer Make level_value accept string integers Make feature spec more robust Removed d3.js from the main application.js bundle Extend compound status for manual actions specs Update css to be nice and tidy. Fix pipeline status for transition between stages add an index to the ghost column Return 404 in project issues API endpoint when project cannot be found Improve rename projects migration ... Conflicts: doc/ci/docker/using_docker_build.md spec/lib/gitlab/import_export/all_models.yml
\| *	Merge branch 'fix/gb/pipeline-intermittent-running-status' into 'master'	Kamil Trzciński	2017-03-21	1	-0/+1
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix pipeline status for transition between stages Closes #29699 See merge request !10094
\| \| *	Fix pipeline status for transition between stages	Grzegorz Bizon	2017-03-20	1	-0/+1
\| \| \|
\| * \|	Merge branch ↵	Sean McGivern	2017-03-21	2	-8/+7
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'29685-wrong-number-of-arguments-calling-http_url_to_repo-on-cloning-project-wikis' into 'master' Fix ProjectWiki#http_url_to_repo signature Closes #29685 See merge request !10079
\| \| * \|	Fix ProjectWiki#http_url_to_repo signature	Rémy Coutable	2017-03-20	2	-8/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	New Gitlab::UrlSanitizer.http_credentials_for_user method responsible for generating a credentials hash from a user. Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \|	Merge branch 'sh-fix-admin-application-settings' into 'master'	Robert Speicher	2017-03-21	1	-0/+9
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Error 500 when application settings are saved Closes #29674 and #29115 See merge request !10070
\| \| * \| \|	Undo explicit conversion to Integer	Toon Claes	2017-03-20	1	-12/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	With the changes in Gitlab::VisibilityLevel it is no longer needed to explicit conversion to Integer in the controller itself.
\| \| * \| \|	Fix Error 500 when application settings are saved	Stan Hu	2017-03-18	2	-0/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Due to a Rails bug, fetching the application settings from Redis may prevent the attribute methods from being loaded for the `ApplicationSetting` model. More details here: https://github.com/rails/rails/issues/27348 There was also a secondary problem introduced by overriding these association methods which caused all default visibility levels to be set to `nil`. Before, the previous implementation allowed the string "20" to be saved as an integer, while now a table lookup happens before that. We fix this by enforcing the integer value in the controller and default to PRIVATE. Closes #29674
\| * \| \| \|	Merge branch 'add-filter-focus-style' into 'master'	Alfredo Sumaran	2017-03-21	2	-4/+40
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add filter focus for filtered search visual tokens See merge request !9875
\| \| * \| \| \|	Fix karma test	Clement Ho	2017-03-20	1	-3/+2
\| \| \| \| \| \|
\| \| * \| \| \|	Add additional check for when inputContainer does not exist	Clement Ho	2017-03-20	1	-1/+5
\| \| \| \| \| \|
\| \| * \| \| \|	Add filter focus for filtered search visual tokens	Clement Ho	2017-03-17	2	-4/+37
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'bugfix/systemhook' into 'master'	Douwe Maan	2017-03-21	1	-5/+4
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bug when system hook for create deploy key Closes #29175 See merge request !9796
\| \| * \| \| \| \|	Fix bug when system hook for deploy key	billy.lb	2017-03-16	1	-5/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'rs-issue-29592' into 'master'	Stan Hu	2017-03-21	1	-1/+1
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Handle Route#name being nil after an update Closes #29592 See merge request !10102
\| \| * \| \| \| \| \|	Handle Route#name being nil after an update	Robert Speicher	2017-03-20	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It was possible for the `routes.name` field to be `NULL`, causing `name_was` to be `nil` after a rename, resulting a bad first argument to `sub` when attempting to rename descendants. This change adds a condition to make sure `name_was` is present before attempting the descendant update.
\| * \| \| \| \| \| \|	Merge remote-tracking branch 'dev/master'	DJ Mountney	2017-03-20	37	-41/+57
\| \|\ \ \ \ \ \ \
\| \| * \| \| \| \| \| \|	Merge branch 'render-json-leak' into 'security'	DJ Mountney	2017-03-20	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix for render json include leaks See merge request !2074
\| \| * \| \| \| \| \| \|	Merge branch 'ssrf' into 'security'	Douwe Maan	2017-03-20	3	-1/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Protect server against SSRF in project import URLs See merge request !2068
\| \| * \| \| \| \| \| \|	Merge branch 'fix-links-target-blank' into 'security'	Jacob Schatz	2017-03-20	28	-34/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds rel="noopener noreferrer" to all links with target="_blank" See merge request !2071
\| \| * \| \| \| \| \| \|	Merge branch '28058-hide-emails-in-atom-feeds' into 'security'	Rémy Coutable	2017-03-20	4	-4/+6
\| \| \| \|_\|/ / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only show public emails in atom feeds See merge request !2066
\| * \| \| \| \| \| \|	Merge branch 'clear-page-param-after-filter-in-add-issues-modal' into 'master'	Alfredo Sumaran	2017-03-21	1	-0/+4
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reset issue boards add issues modal page when filtering Closes #29616 See merge request !10039
\| \| * \| \| \| \| \| \|	Reset issue boards add issues modal page when filteringclear-page-param-after-filter-in-add-issues-modal	Phil Hughes	2017-03-17	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The page param is reset when filtering or when opening, previously it was possible to get the page param stuck on a high number making it impossible to either filter or to close & open the modal and get the issues you want to see. Closes #29616
\| * \| \| \| \| \| \| \|	Merge branch 'token-bug-fixes' into 'master'	Clement Ho	2017-03-20	1	-2/+1
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Align filtered search visual tokens with input field text Closes #29167 See merge request !10095
\| \| * \| \| \| \| \| \| \|	Update css to be nice and tidy.	Jacob Schatz	2017-03-20	1	-2/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Reset filters after click	Clement Ho	2017-03-20	1	-1/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch '28499-fix-large-text-tooltip-in-diff-file-name' into 'master'	Filipa Lacerda	2017-03-20	1	-0/+6
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixes large text tooltip in diff file name Closes #28499 See merge request !9529
\| \| * \| \| \| \| \| \| \| \|	fixes large text tooltip in diff file name	Nur Rony	2017-03-20	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch '28660-fix-dismissable-error-close-not-visible-enough' into ↵	Filipa Lacerda	2017-03-20	1	-0/+12
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' dismissable error close is not visible enough Closes #28660 See merge request !9516
\| \| * \| \| \| \| \| \| \| \| \|	dismissable error close is not visible enough28660-fix-dismissable-error-close-not-visible-enough	Nur Rony	2017-03-02	1	-0/+12
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch '29559-issue-count' into 'master'	Filipa Lacerda	2017-03-20	1	-3/+5
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	handle commas in Issue total count Closes #29559 See merge request !10028
\| \| * \| \| \| \| \| \| \| \| \| \|	handle commas in Issue total count	Simon Knox	2017-03-21	1	-3/+5
\| \| \| \|_\|_\|_\|/ / / / / / \| \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix-input-token-spacing' into 'master'	Annabel Dunstone Gray	2017-03-20	1	-4/+6
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix input token spacing See merge request !10090
\| \| * \| \| \| \| \| \| \| \| \| \|	Fix input token spacing	Clement Ho	2017-03-20	1	-4/+6
\| \| \| \|_\|_\|_\|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Removed d3.js from the main application.js bundle	Jose Ivan Vargas Lopez	2017-03-20	4	-20/+26
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'issue-filter-bar-alignment' into 'master'	Annabel Dunstone Gray	2017-03-20	2	-3/+8
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed filter bar alignment issues Closes #29543 See merge request !10049
\| \| * \| \| \| \| \| \| \| \| \| \|	Fixed mobile alignment issues	Phil Hughes	2017-03-17	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Fixed filter bar alignment issues	Phil Hughes	2017-03-17	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #29543
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch ↵	Sean McGivern	2017-03-20	4	-42/+39
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'20204-new-issue-button-redirects-you-to-create-a-new-issue-after-logging-in' into 'master' Redirect to signin when New Issue for not logged in Closes #20204 See merge request !9743
\| \| * \| \| \| \| \| \| \| \| \| \|	Redirect to signin when New Issue for not logged in	Sam Rose	2017-03-20	4	-42/+39
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'issue_27212' into 'master'	Sean McGivern	2017-03-20	1	-0/+8
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add closed_at field to issues Closes #27212 See merge request !9977
\| \| * \| \| \| \| \| \| \| \| \| \|	Add closed_at field to issues	Felipe Artur	2017-03-17	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'routes-lower-case' into 'master'	Yorick Peterse	2017-03-20	1	-4/+6
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove repeated routes.path check for postgresql database See merge request !10063
\| \| * \| \| \| \| \| \| \| \| \| \|	Remove repeated routes.path check for postgresql database	mhasbini	2017-03-18	1	-4/+6
\| \| \| \|_\|_\|/ / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Fix Project Wiki update	Dongqing Hu	2017-03-20	3	-4/+8
\| \| \|_\|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch '29534-todos-performance' into 'master'	Sean McGivern	2017-03-20	4	-8/+21
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Todos performance: Include associations in Finder See merge request !10076
\| \| * \| \| \| \| \| \| \| \| \|	Todos performance: Include associations in Finder	Jarka Kadlecova	2017-03-20	4	-8/+21
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix/regressions-in-ci-v4-api' into 'master'	Kamil Trzciński	2017-03-20	1	-0/+10
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix regressions introduced while adding CI endpoints in API v4 See merge request !9952
\| \| * \| \| \| \| \| \| \| \| \|	Simplify Ci::Build#dependencies method	Tomasz Maczukin	2017-03-20	1	-8/+3
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Send only defined dependencies	Tomasz Maczukin	2017-03-20	1	-0/+15
\| \| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In APIv1 we've been sending all jobs from previous stages and a `dependencies` list with names of jobs that user want to download artifacts from. This was selected on Runners side. In APIv1 we've planned to send only jobs that were defined (if any; and all previous jobs by default). However I've missed the fact that it was Runner who selected jobs, not GitLab. And now current version of APIV4 sends all jobs everytime. This commit fixes this. If user will define `dependencies` in his job, then GitLab will send only selected jobs.