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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Bump jira-ruby gem to 1.4.1 to fix issues with HTTP proxiessh-bump-jira-gem	Stan Hu	2017-08-16	3	-3/+9
\| \| \| \| \| \| \| \|	Previous versions of jira-ruby gem would generate erroneous URLs when an HTTP proxy were confused via the `http_proxy` environment variables: https://github.com/sumoheavy/jira-ruby/issues/250 Closes gitlab-org/gitlab-ee#3125
*	Merge branch 'dm-gpg-signature-performance' into 'master'	Robert Speicher	2017-08-16	12	-104/+160
\|\ \| \| \| \| \| \| \| \|	Only create commit GPG signature when necessary See merge request !13561
\| *	Only create commit GPG signature when necessarydm-gpg-signature-performance	Douwe Maan	2017-08-16	12	-104/+160
\| \|
* \|	Merge branch '36450_second_touch_up' into 'master'	Clement Ho	2017-08-16	2	-2/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Change 'This issue is not confidential' to 'Not confidential' See merge request !13607
\| * \|	change to 'Not confidential'36450_second_touch_up	Regis	2017-08-16	2	-2/+2
\| \| \|
* \| \|	Merge branch 'repo-fixes-flex-solution1' into 'master'	Jacob Schatz	2017-08-16	2	-18/+32
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Repo editor with flex layout See merge request !13571
\| * \| \|	Repo editor with flex layout	Eric Eastwood	2017-08-16	2	-18/+32
\|/ / /
* \| \|	Merge branch 'commits-list-page-limit' into 'master'	Tim Zallmann	2017-08-16	2	-1/+6
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix commit list request appending 40 to offset Closes #36569 and #36563 See merge request !13603
\| * \|	Fix commit list request appending 40 to offset	Phil Hughes	2017-08-16	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \|	Closes #36569
* \| \|	Merge branch 'charlock-holmes-0.7.5' into 'master'	Douwe Maan	2017-08-16	2	-3/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use charlock_holmes 0.7.5 See merge request !13602
\| * \| \|	Use charlock_holmes 0.7.5	Jacob Vosmaer	2017-08-16	2	-3/+3
\| \| \| \|
* \| \| \|	Merge branch 'docs/database-development' into 'master'	Rémy Coutable	2017-08-16	7	-1/+220
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add more database development related docs See merge request !13466
\| * \| \| \|	Document not using database hash indexes	Yorick Peterse	2017-08-16	2	-0/+21
\| \| \| \| \|
\| * \| \| \|	Document how to handle different DB (versions)	Yorick Peterse	2017-08-16	2	-0/+27
\| \| \| \| \|
\| * \| \| \|	State that comma separated data is serialised data	Yorick Peterse	2017-08-16	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Comma separated values really are a form of serialised data so we should clarify that we shouldn't store such data in the DB.
\| * \| \| \|	Add more database development related docs	Yorick Peterse	2017-08-16	4	-0/+170
\| \| \| \| \|
* \| \| \| \|	Merge branch 'icon-sidebar-expanded-margin' into 'master'	Clement Ho	2017-08-16	1	-2/+4
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes icon sidebar expanding causing a jump in padding Closes #36456 See merge request !13568
\| * \| \| \|	Fixes icon sidebar expanding causing a jump in paddingicon-sidebar-expanded-margin	Phil Hughes	2017-08-15	1	-2/+4
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \|	Closes #36456
* \| \| \|	Merge branch ↵	Phil Hughes	2017-08-16	1	-0/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'36442-images-in-issue-descriptions-no-longer-scale-to-the-width-of-their-container' into 'master' Resolve "Images in issue descriptions no longer scale to the width of their container" Closes #36442 See merge request !13586
\| * \| \| \|	Set Description Image to max-width 100%36442-images-in-issue-descriptions-no-longer-scale-to-the-width-of-their-container	Tim Zallmann	2017-08-16	1	-0/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'winh-navcontrols-dropdown-style' into 'master'	Clement Ho	2017-08-16	2	-1/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make sort by dropdown style consistent See merge request !13253
\| * \| \| \| \|	Make sort by dropdown style consistent	Winnie Hellmann	2017-08-16	2	-1/+3
\|/ / / / /
* \| \| \| \|	Merge branch 'jej/document-pick-into-backports' into 'master'	Sean McGivern	2017-08-16	1	-6/+10
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document "Pick into Backports" label in PROCESS.md See merge request !13565
\| * \| \| \| \|	Document "Pick into Backports" label processjej/document-pick-into-backports	James Edwards-Jones	2017-08-10	1	-6/+10
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'bvl-circuitbreaker-settings-to-avoid-failures' into 'master'	Rémy Coutable	2017-08-16	4	-13/+58
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Circuitbreaker settings to avoid spec-failures Closes #36324 See merge request !13519
\| * \| \| \| \| \|	Use better higher threshold settings for storage access in tests	Bob Van Landuyt	2017-08-16	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`failure_count_threshold`: We should never need this, but we don't want to block access in tests because of this. `failure_wait_time`: Setting it to 0 now allows each storage attempt `storage_timeout`: Try a bit longer to access storage on CI in case the slow machines take a bit longer to spin up the process to perfom the check
\| * \| \| \| \| \|	Allow a `failure_wait_time` of 0 for storage access	Bob Van Landuyt	2017-08-16	3	-13/+55
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows testing every storage attempt after a failure. Which could be useful for tests
* \| \| \| \| \| \|	Merge branch '36430-edit-milestone-link' into 'master'	Grzegorz Bizon	2017-08-16	3	-4/+29
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix edit milestone path from group milestones list Closes #36430 See merge request !13581
\| * \| \| \| \| \|	Fix edit milestone path from group milestones list	Jarka Kadlecova	2017-08-16	3	-4/+29
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'dispatcher-race-condition-fix' into 'master'	Tim Zallmann	2017-08-16	8	-14/+20
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix race condition with dispatcher.js See merge request !13377
\| * \| \| \| \| \| \|	Fix race condition with dispatcher.jsdispatcher-race-condition-fix	Phil Hughes	2017-08-15	8	-14/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The dispatcher was trying to create a new instance of a class that is loaded in a file after main.js which would cause the filtered search to not work on issues. This would only happen on the first load when the JS is not cached. If the JS is cached, then everything will be fine.
* \| \| \| \| \| \| \|	Merge branch 'safari-overscroll-sticky-fix' into 'master'	Tim Zallmann	2017-08-16	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes sticky class being removed when over-scrolling in Safari Closes #36457 See merge request !13556
\| * \| \| \| \| \| \| \|	Fixes sticky class being removed when over-scrolling in Safarisafari-overscroll-sticky-fix	Phil Hughes	2017-08-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #36457
* \| \| \| \| \| \| \| \|	Merge branch 'search-spec' into 'master'	Rémy Coutable	2017-08-16	11	-147/+209
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change find to within for detecting bad search specs Closes #35460 See merge request !13383
\| * \| \| \| \| \| \| \| \|	Change find to within for detecting bad search specs	Clement Ho	2017-08-16	11	-147/+209
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'rs-more-public-send-whitelists' into 'master'	Rémy Coutable	2017-08-16	61	-88/+128
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Whitelist or fix additional `Gitlab/PublicSend` cop violations See merge request !13467
\| * \| \| \| \| \| \| \|	Whitelist or fix additional `Gitlab/PublicSend` cop violationsrs-more-public-send-whitelists	Robert Speicher	2017-08-14	61	-88/+128
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	An upcoming update to rubocop-gitlab-security added additional violations.
* \| \| \| \| \| \| \| \|	Merge branch '34049-public-commits-should-not-require-authentication' into ↵	Rémy Coutable	2017-08-16	2	-100/+117
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Commits API: Listing commits for public repo doesn't require authentication Closes #34049 See merge request !13287
\| * \| \| \| \| \| \| \| \|	Added tests for commits API with an unauthenticated user and a ↵	Jacopo	2017-08-10	2	-100/+117
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	public/private project Added test to API commits in order to handle cases for authenticated/unauthenticated user in a private and public project.
* \| \| \| \| \| \| \| \| \|	Merge branch 'update-git-to-2.13.0' into 'master'	Rémy Coutable	2017-08-16	2	-3/+3
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Git version for source installs to match Omnibus See merge request !13351
\| * \| \| \| \| \| \| \| \| \|	Update Git version for source installs to match Omnibus	Andrew Newdigate	2017-08-16	2	-3/+3
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'rs-trailingwhitespace-cop' into 'master'	Rémy Coutable	2017-08-16	52	-99/+96
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable Layout/TrailingWhitespace cop and auto-correct offenses See merge request !13573
\| * \| \| \| \| \| \| \| \| \|	Fix two additional violations caused by previous changesrs-trailingwhitespace-cop	Robert Speicher	2017-08-15	2	-2/+0
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Enable Layout/TrailingWhitespace cop and auto-correct offenses	Robert Speicher	2017-08-15	53	-100/+99
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch '34643-fix-project-path-slugify' into 'master'	Rémy Coutable	2017-08-16	6	-7/+39
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix CI_PROJECT_PATH_SLUG slugify Closes #34643 See merge request !13350
\| * \| \| \| \| \| \| \| \| \| \|	Fix CI_PROJECT_PATH_SLUG slugify	vanadium23	2017-08-15	6	-7/+39
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'rs-redis-config-paths' into 'master'	Douwe Maan	2017-08-16	5	-16/+19
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't depend on `Rails` for Redis configuration file paths Closes #36514 See merge request !13575
\| * \| \| \| \| \| \| \| \| \| \| \|	Don't depend on `Rails` for Redis configuration file pathsrs-redis-config-paths	Robert Speicher	2017-08-15	5	-16/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The `Rails` object was not always available in all tasks that require Redis access, such as `mail_room`, so the constant pointing to the configuration path was never defined, but we still attempted to access it in `config_file_name`, resulting in a `NameError` exception. Further, there was no benefit to defining these paths in a constant to begin with -- they're only accessed in one place, and it was within the class where they were being defined. We can just provide them at run-time instead. Further _still_, we were calling `File.expand_path` on the absolute path returned by `Rails.root.join`, which was rather pointless.
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch '34533-speed-up-project-creation' into 'master'	Douwe Maan	2017-08-16	4	-15/+55
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Speed up project creation by inlining repository creation Closes #34533 See merge request !13529
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Speed up project creation by inlining repository creation	Nick Thomas	2017-08-15	4	-15/+55
\| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \|