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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch '42730-close-rugged-repository' into 'master'	Douwe Maan	2018-02-06	1	-0/+4
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "ProjectCacheWorker leaks file descriptors" Closes #42730 See merge request gitlab-org/gitlab-ce!16930
\| *	Close low level rugged repository in project cache worker	Bastian Blank	2018-02-06	1	-0/+4
\| \| \| \| \| \| \| \|	Signed-off-by: Bastian Blank <waldi@debian.org>
* \|	Merge branch 'zj/gitlab-ce-zj-wiki-page-versions'	Douwe Maan	2018-02-06	2	-9/+49
\|\ \
\| * \	Merge branch 'master' into 'zj-wiki-page-versions'	Douwe Maan	2018-02-06	164	-939/+2527
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # Gemfile # Gemfile.lock
\| * \| \|	Allow pagination for WikiVersions on Gitaly request	Zeger-Jan van de Weg	2018-01-22	2	-41/+17
\| \| \| \|
\| * \| \|	Client implementation for WikiPageVerion	Zeger-Jan van de Weg	2018-01-22	2	-15/+79
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Part of gitlab-org/gitaly#639
* \| \| \|	Merge branch 'gitaly-lfs-client-prep' into 'master'	Robert Speicher	2018-02-06	5	-54/+50
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor Gitlab::Git code related to LFS changes for Gitaly migration Closes gitaly#980 See merge request gitlab-org/gitlab-ce!16835
\| * \| \| \|	Refactor Gitlab::Git code related to LFS changes for Gitaly migrationgitaly-lfs-client-prep	Alejandro Rodríguez	2018-02-02	5	-54/+50
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We stop relying on Gitlab::Git::Env for the RevList class, and use Gitlab::Git::Repository#run_git methods inteaad. The refactor also fixes another issue, since we now top using "path_to_repo" (which is a Repository model method).
* \| \| \| \|	Merge branch '42669-allow-order_by-users-in-gitlab-api' into 'master'	Douwe Maan	2018-02-06	1	-1/+18
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add sorting options for /users API Closes #42669 See merge request gitlab-org/gitlab-ce!16945
\| * \| \| \| \|	Add sorting options for /users API (admin only)42669-allow-order_by-users-in-gitlab-api	Dmitriy Zaporozhets	2018-02-06	1	-1/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \|	Merge branch 'jej/upload-file-tracks-lfs' into 'master'	Sean McGivern	2018-02-06	2	-0/+30
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	File upload UI obeys LFS filter Closes #29876 See merge request gitlab-org/gitlab-ce!16412
\| * \| \| \| \|	File upload UI obeys LFS filters	James Edwards-Jones	2018-02-06	2	-0/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Uses Lfs::FileModificationHandler to coordinate LFS detection, creation of LfsObject, etc Caveats: 1. This isn't used by the multi-file editor / Web IDE 2. This isn't used on rename. We'd need to be able to download LFS files and add them to the commit if they no longer match so not as simple. 3. We only check the root .gitattributes file, so this should be improved to correctly check for nested .gitattributes files in subfolders.
* \| \| \| \| \|	Merge branch 'bump-workhorse' into 'master'	Nick Thomas	2018-02-06	1	-0/+12
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade GitLab Workhorse to v3.6.0 See merge request gitlab-org/gitlab-ce!16946
\| * \| \| \| \| \|	Upgrade GitLab Workhorse to v3.6.0	Kamil Trzciński	2018-02-06	1	-0/+12
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Rename CreateArtifactsTraceService to CreateTraceArtifactService	Shinya Maeda	2018-02-06	1	-8/+0
\| \| \| \| \| \|
* \| \| \| \| \|	Revert live-trace path	Shinya Maeda	2018-02-06	1	-24/+12
\| \| \| \| \| \|
* \| \| \| \| \|	Add CreateArtifactsTraceWorker	Shinya Maeda	2018-02-06	2	-16/+7
\| \| \| \| \| \|
* \| \| \| \| \|	Expose current_path	Shinya Maeda	2018-02-06	1	-6/+6
\| \| \| \| \| \|
* \| \| \| \| \|	Check existance of the file when trace_artifact is read	Shinya Maeda	2018-02-06	1	-2/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Move default_path to legacy_default_path. Switch to the new path for live-trace	Shinya Maeda	2018-02-06	1	-10/+28
\| \| \| \| \| \|
* \| \| \| \| \|	Remove unnecessary changes	Shinya Maeda	2018-02-06	1	-6/+10
\| \| \| \| \| \|
* \| \| \| \| \|	Trace as artifacts	Shinya Maeda	2018-02-06	2	-9/+24
\|/ / / / /
* \| \| \| \|	Added ldap config setting to lower case usernames	Francisco Javier López	2018-02-05	3	-1/+13
\| \|_\|_\|/ \|/\| \| \|
* \| \| \|	Allow moving wiki pages from the UI	Francisco Javier López	2018-02-05	1	-5/+19
\| \| \| \|
* \| \| \|	Merge branch 'fix/gitaly-wiki-encoding-issues' into 'master'	Robert Speicher	2018-02-05	1	-0/+5
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Encode GitalyClient::WikiPage attributes to UTF-8 See merge request gitlab-org/gitlab-ce!16925
\| * \| \| \|	Encode GitalyClient::WikiPage attributes to UTF-8fix/gitaly-wiki-encoding-issues	Ahmad Sherif	2018-02-05	1	-0/+5
\| \| \| \| \|
* \| \| \| \|	Merge branch '42547-upload-store-mount-point' into 'master'	Sean McGivern	2018-02-05	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Store uploader context in uploads Closes #42547 See merge request gitlab-org/gitlab-ce!16779
\| * \| \| \| \|	add the uploader context to the upload model	Micaël Bergeron	2018-02-02	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Enable Prometheus metrics for deployed Ingresses	Joshua Lambert	2018-02-05	1	-2/+6
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'api-guard' into 'master'	Rémy Coutable	2018-02-05	1	-1/+5
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make find_user_from_sources extensible for EE See merge request gitlab-org/gitlab-ce!16924
\| * \| \| \| \| \|	Make find_user_from_sources extensible for EE	Lin Jen-Shin	2018-02-05	1	-1/+5
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'gitaly-user-squash' into 'master'	Rémy Coutable	2018-02-05	2	-26/+63
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Incorporate OperationService.UserSquash Gitaly RPC Closes gitaly#991 See merge request gitlab-org/gitlab-ce!16899
\| * \| \| \| \| \|	Incorporate OperationService.UserSquash Gitaly RPCgitaly-user-squash	Alejandro Rodríguez	2018-02-02	2	-26/+63
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'zj-fix-flay' into 'master'	Rémy Coutable	2018-02-05	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix flay not detecting identical code Closes #42628 See merge request gitlab-org/gitlab-ce!16828
\| * \| \| \| \| \| \|	Fix flay not detecting identical code	Zeger-Jan van de Weg	2018-01-31	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously the script checked only for 'Similar code', but flay will tell users when IDENTICAL code is detected too. This should create a commit will create a failing pipeline, and to check that it does this commit is pushed. Fixes #42628
* \| \| \| \| \| \| \|	Merge branch 'query-counts' into 'master'	Rémy Coutable	2018-02-05	16	-0/+223
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Track and act upon the number of executed SQL queries See merge request gitlab-org/gitlab-ce!16466
\| * \| \| \| \| \| \| \|	Track and act upon the number of executed queriesquery-counts	Yorick Peterse	2018-02-01	16	-0/+223
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This ensures that we have more visibility in the number of SQL queries that are executed in web requests. The current threshold is hardcoded to 100 as we will rarely (maybe once or twice) change it. In production and development we use Sentry if enabled, in the test environment we raise an error. This feature is also only enabled in production/staging when running on GitLab.com as it's not very useful to other users.
* \| \| \| \| \| \| \| \|	Merge branch '25327-coverage-badge-rounding' into 'master'	Rémy Coutable	2018-02-05	2	-3/+3
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change rounding on code coverage badge to be consistent with other displays See merge request gitlab-org/gitlab-ce!10083
\| * \| \| \| \| \| \| \|	Change coverage badge rounding for other CI system consistency	Jeff Stubler	2018-02-01	2	-3/+3
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'zj-ref-contains' into 'master'	Douwe Maan	2018-02-04	4	-16/+63
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Client changes for Tag,BranchNamesContainingCommit See merge request gitlab-org/gitlab-ce!16789
\| * \ \ \ \ \ \ \	Merge branch 'master' into 'zj-ref-contains'zj-ref-contains	Douwe Maan	2018-02-01	3	-1/+27
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # lib/gitlab/git/repository.rb
\| * \| \| \| \| \| \| \| \|	Remove intermediate methods on Branch and Tag classes	Zeger-Jan van de Weg	2018-02-01	4	-28/+17
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix encoding issues when name is not UTF-8	Zeger-Jan van de Weg	2018-02-01	1	-2/+8
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Client changes for Tag,BranchNamesContainingCommit	Zeger-Jan van de Weg	2018-02-01	4	-21/+73
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As part of gitlab-org/gitaly#884, this commit contains the client implementation for both TagNamesContaintingCommit and BranchNamesContainingCommit. The interface in the Repository model stays the same, but the implementation on the serverside, e.g. Gitaly, uses `for-each-ref`, as opposed to `branch` or `tag` which both aren't plumbing command. The result stays the same. On the serverside, we have the opportunity to limit the number of names to return. However, this is not supported on the front end yet. My proposal to use this ability: gitlab-org/gitlab-ce#42581. For now, this ability is not used as that would change more behaviours on a feature flag which might lead to unexpected changes on page refresh for example.
* \| \| \| \| \| \| \| \|	Use %r around multi-line regular expressions	Douwe Maan	2018-02-02	1	-4/+4
\| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '24167__color_label' into 'master'	Douwe Maan	2018-02-02	4	-0/+77
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Colors to GitLab Flavored Markdown Closes #24167 See merge request gitlab-org/gitlab-ce!16095
\| * \| \| \| \| \| \| \|	Fix minors	Tony Rom	2018-02-01	1	-14/+8
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add Colors to GitLab Flavored Markdown	Tony Rom	2018-01-29	4	-0/+83
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'rd-40552-gitlab-should-check-if-keys-are-valid-before-saving' ↵	Douwe Maan	2018-02-02	1	-6/+22
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Sanitize extra blank spaces used when uploading a SSH key Closes #40552 See merge request gitlab-org/gitlab-ce!16821
\| * \| \| \| \| \| \| \| \|	Sanitize extra blank spaces used when uploading a SSH key	Rubén Dávila	2018-02-01	1	-6/+22
\| \| \| \| \| \| \| \| \| \|