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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Improve resiliency of build pickingimprove-ci-redis-queueing	Kamil Trzcinski	2017-03-21	5	-17/+59
\| \| \| \| \| \| \| \|	Every time we pick a new build, or we get into conflict we force runner to retry the operation to make sure that all builds are being picked. It makes us to loose one request, but also makes sure that we are consistent. It is fair trade, as number of generated builds is relatively small 0.1% compared to the traffic.
*	Merge branch 'fix/gb/pipeline-intermittent-running-status' into 'master'	Kamil Trzciński	2017-03-21	2	-0/+19
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix pipeline status for transition between stages Closes #29699 See merge request !10094
\| *	Extend compound status for manual actions specs	Grzegorz Bizon	2017-03-20	1	-1/+11
\| \|
\| *	Fix pipeline status for transition between stages	Grzegorz Bizon	2017-03-20	2	-0/+9
\| \|
* \|	Merge branch ↵	Sean McGivern	2017-03-21	7	-23/+87
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'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	7	-23/+87
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 'dz-improve-rename-projects-migration' into 'master'	Yorick Peterse	2017-03-21	1	-30/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve rename projects migration Closes #29556 See merge request !10009
\| * \| \|	Improve rename projects migration	Dmitriy Zaporozhets	2017-03-20	1	-30/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \|	Merge branch 'sh-fix-admin-application-settings' into 'master'	Robert Speicher	2017-03-21	5	-2/+67
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-12/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	With the changes in Gitlab::VisibilityLevel it is no longer needed to explicit conversion to Integer in the controller itself.
\| * \| \| \|	Make level_value accept string integers	Toon Claes	2017-03-20	2	-2/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When a VisibilityLevel is an integer formatted as a string, convert it to an integer, instead of looking it up in the hash map. When the value is not recognized, default to PRIVATE.
\| * \| \| \|	Make feature spec more robust	Toon Claes	2017-03-20	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure the correct "Public" radio is selected by choosing it on ID.
\| * \| \| \|	Fix Error 500 when application settings are saved	Stan Hu	2017-03-18	3	-0/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-4/+52
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-4/+49
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'perf/add-index-to-user-ghost' into 'master'	Douwe Maan	2017-03-21	2	-3/+28
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add an index to the ghost column See merge request !9910
\| * \| \| \| \| \|	add an index to the ghost column	http://jneen.net/	2017-03-20	2	-3/+28
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'fix-typos-in-v3-to-v4-doc' into 'master'	Douwe Maan	2017-03-21	1	-30/+30
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make the v3_to_v4.md more consistent See merge request !10092
\| * \| \| \| \| \| \|	Make the v3_to_v4.md more consistent	Rémy Coutable	2017-03-20	1	-30/+30
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \|	Merge branch '29671-remove-useless-options' into 'master'	Douwe Maan	2017-03-21	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove useless options from db/fixtures/development/17_cycle_analytics.rb Closes #29671 See merge request !10086
\| * \| \| \| \| \| \|	Remove useless options from db/fixtures/development/17_cycle_analytics.rb	Rémy Coutable	2017-03-20	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \|	Merge branch 'bugfix/systemhook' into 'master'	Douwe Maan	2017-03-21	3	-5/+11
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-5/+11
\| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'rs-issue-29592' into 'master'	Stan Hu	2017-03-21	2	-3/+11
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-3/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	50	-54/+258
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Merge branch 'render-json-leak' into 'security'	DJ Mountney	2017-03-20	4	-2/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix for render json include leaks See merge request !2074
\| * \| \| \| \| \| \| \| \|	Merge branch 'ssrf' into 'security'	Rubén Dávila	2017-03-20	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	nil check for url_blocker? See merge request !2076
\| * \| \| \| \| \| \| \| \|	Merge branch 'ssrf' into 'security'	Douwe Maan	2017-03-20	8	-1/+140
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	30	-36/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	7	-15/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only show public emails in atom feeds See merge request !2066
\| * \| \| \| \| \| \| \| \|	Update CHANGELOG.md for 8.17.4	James Lopez	2017-03-19	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \| \|	Update CHANGELOG.md for 8.16.8	James Lopez	2017-03-19	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \| \|	Update CHANGELOG.md for 8.15.8	James Lopez	2017-03-19	1	-0/+5
\| \| \|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \| \|	Merge branch '29730-9-0-upgrade-documentation-should-include-yarn' into ↵	Filipa Lacerda	2017-03-21	1	-4/+4
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "9.0 upgrade documentation should include Yarn" Closes #29730 See merge request !10101
\| * \| \| \| \| \| \| \| \|	fix recompile assets step in 9.0 upgrade guide to use yarn	Mike Greiling	2017-03-20	1	-4/+4
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	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
\| \| \|_\|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'reset-filters-after-click' into 'master'	Alfredo Sumaran	2017-03-20	2	-1/+22
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reset filters after click Closes #28463 See merge request !10024
\| * \| \| \| \| \| \| \| \| \| \|	Reset filters after click	Clement Ho	2017-03-20	2	-1/+22
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge branch '28499-fix-large-text-tooltip-in-diff-file-name' into 'master'	Filipa Lacerda	2017-03-20	2	-0/+10
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch '28660-fix-dismissable-error-close-not-visible-enough' into ↵	Filipa Lacerda	2017-03-20	2	-0/+16
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'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	2	-0/+16
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch '29559-issue-count' into 'master'	Filipa Lacerda	2017-03-20	2	-3/+20
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	handle commas in Issue total count Closes #29559 See merge request !10028
\| * \| \| \| \| \| \| \| \| \| \| \| \|	handle commas in Issue total count	Simon Knox	2017-03-21	2	-3/+20
\| \| \|_\|_\|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \|