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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \|	Added group milestones form spec	Luke "Jared" Bennett	2017-10-20	1	-3/+10
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Remove page-specific GLForm init and add support_autocomplete: false local ↵	Luke "Jared" Bennett	2017-10-20	2	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	to groups/milestones/_form
* \| \| \| \| \| \| \|	Merge branch ↵	Stan Hu	2017-10-30	2	-3/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'pawel/bump_prometheus_gem_to_fix_read_all_values_returning_bad_data-39504' into 'master' Update Prometheus Gem to fix problem caused by using wrong data offsets See merge request gitlab-org/gitlab-ce!15081
\| * \| \| \| \| \| \| \|	Update Prometheus Gem to fix problem caused by reading bad data.	Pawel Chojnacki	2017-10-30	2	-3/+3
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'fix/project-select-js-without-button' into 'master'	Filipa Lacerda	2017-10-30	2	-10/+19
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changed project select to use it independently and not onlt as a combobutton See merge request gitlab-org/gitlab-ce!15043
\| * \| \| \| \| \| \| \| \|	Changed project select to use it independently and not onlt as a combobutton	Francisco Javier López	2017-10-30	2	-10/+19
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'fix-500-on-old-merge-requests' into 'master'	Douwe Maan	2017-10-30	3	-3/+47
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix 500 error for old (somewhat) MRs Closes #36540 See merge request gitlab-org/gitlab-ce!14945
\| * \| \| \| \| \| \| \|	Fix 500 error for old (somewhat) MRs	AlexWayfer	2017-10-30	3	-3/+47
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'an/gitaly-v0.50.0' into 'master'	Sean McGivern	2017-10-30	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade Gitaly to v0.50.0 See merge request gitlab-org/gitlab-ce!15050
\| * \| \| \| \| \| \| \|	Upgrade Gitaly to v0.50.0an/gitaly-v0.50.0	Andrew Newdigate	2017-10-26	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch ↵	Yorick Peterse	2017-10-30	2	-1/+6
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'39054-activerecord-statementinvalid-pg-querycanceled-error-canceling-statement-due-to-statement-timeout' into 'master' Resolve "ActiveRecord::StatementInvalid: PG::QueryCanceled: ERROR: canceling statement due to statement timeout" Closes #39054 See merge request gitlab-org/gitlab-ce!15063
\| * \| \| \| \| \| \| \| \|	Avoid hitting statement timeout finding MR pipelines39054-activerecord-statementinvalid-pg-querycanceled-error-canceling-statement-due-to-statement-timeout	Sean McGivern	2017-10-27	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For MRs with many thousands of commits, `SELECT DISTINCT(sha)` will be very slow. What we can't do to fix this: 1. Add an index. Postgres won't use it for DISTINCT without a lot of ceremony. 2. Do the `uniq` in Ruby. That can still be very slow with hundreds of thousands of commits. 3. Use a subquery. We haven't removed the `st_commits` column yet, but we will soon. Until 3 is available to us, we can just do 2, but also add a limit clause. There is no ordering, so this may return different results, but our goal with these MRs is just to get them to load, so it's not a huge deal.
* \| \| \| \| \| \| \| \| \|	Merge branch '39426-update-fog-google-docs' into 'master'	Achilleas Pipinellis	2017-10-30	1	-33/+90
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add docs for backing up to Google Cloud Storage See merge request gitlab-org/gitlab-ce!15074
\| * \| \| \| \| \| \| \| \| \|	Split S3 and Google Cloud Storage sections in backup doc	Achilleas Pipinellis	2017-10-30	1	-52/+90
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add docs for backing up to Google Cloud Storage39426-update-fog-google-docs	Lin Jen-Shin	2017-10-30	1	-0/+19
\| \| \|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'bvl-add-circuitbreaker-metrics-docs' into 'master'	Achilleas Pipinellis	2017-10-30	1	-1/+3
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add missing circuitbreaker metrics to prometheus documentation See merge request gitlab-org/gitlab-ce!15062
\| * \| \| \| \| \| \| \| \|	Add missing circuitbreaker metrics to prometheus documentationbvl-add-circuitbreaker-metrics-docs	Bob Van Landuyt	2017-10-27	1	-1/+3
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'zj-tag-trait-ci-build' into 'master'	Grzegorz Bizon	2017-10-30	2	-9/+9
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ci::Build tag is a trait instead of an own factory See merge request gitlab-org/gitlab-ce!15077
\| * \| \| \| \| \| \| \| \| \|	Ci::Build tag is a trait instead of an own factory	Zeger-Jan van de Weg	2017-10-30	2	-9/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Minor annoyance of mine, and there were a couple of things wrong, for example: 1. Switching on a property is just a trait 2. It didn't inherrit from its parent Find and replace through the code based fixed all occurances.
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'make-merge-jid-handling-less-stateful' into 'master'	Sean McGivern	2017-10-30	7	-60/+24
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix widget of locked merge requests not being presented See merge request gitlab-org/gitlab-ce!15069
\| * \| \| \| \| \| \| \| \| \|	Move locked check to a guard-clause	Oswaldo Ferreira	2017-10-30	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add changelogmake-merge-jid-handling-less-stateful	Oswaldo Ferreira	2017-10-29	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Make merge_jid handling less stateful in MergeService	Oswaldo Ferreira	2017-10-27	6	-61/+18
\| \| \|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '2518-saved-configuration-for-issue-board' into 'master'	Phil Hughes	2017-10-30	16	-93/+174
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[CE backport] Saved configuration for issue board See merge request gitlab-org/gitlab-ce!15009
\| * \| \| \| \| \| \| \| \| \|	[CE backport] Saved configuration for issue board	Oswaldo Ferreira	2017-10-30	16	-93/+174
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'bvl-fix-system-hook-project-visibility' into 'master'	Sean McGivern	2017-10-30	3	-1/+12
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use the correct project visibility in system hooks Closes #39496 See merge request gitlab-org/gitlab-ce!15065
\| * \| \| \| \| \| \| \| \| \|	Use the correct project visibility in system hooks	Bob Van Landuyt	2017-10-30	3	-1/+12
\| \| \|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '39366-email-confirmation-fails' into 'master'	Douwe Maan	2017-10-30	4	-1/+16
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	grab the correct username when confirming secondary email Closes #39366 See merge request gitlab-org/gitlab-ce!15010
\| * \| \| \| \| \| \| \| \|	more readable changelog39366-email-confirmation-fails	Brett Walker	2017-10-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	remove extra whitespace	Brett Walker	2017-10-27	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	use a delegate for `username` to be more future friendly	Brett Walker	2017-10-27	3	-2/+11
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	add changelog entry	Brett Walker	2017-10-27	1	-0/+5
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	fix to pass static-analysis	Brett Walker	2017-10-24	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	grab the correct username when confirming secondary email	Brett Walker	2017-10-23	1	-1/+2
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'es-module-autosave' into 'master'	Filipa Lacerda	2017-10-30	6	-27/+17
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove Autosave class from global namespace See merge request gitlab-org/gitlab-ce!14856
\| * \ \ \ \ \ \ \ \ \	Merge branch 'master' into 'es-module-autosave'es-module-autosave	Mike Greiling	2017-10-24	925	-9504/+22685
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/assets/javascripts/issuable_form.js # app/assets/javascripts/notes.js
\| * \| \| \| \| \| \| \| \| \| \|	remove import from main.js	Mike Greiling	2017-10-12	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	remove global export	Mike Greiling	2017-10-12	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	convert Autosave into pure es module and remove global export	Mike Greiling	2017-10-12	5	-25/+18
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'docs/update-create-mr' into 'master'	Marcia Ramos	2017-10-27	4	-13/+10
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update docs on creating MRs See merge request gitlab-org/gitlab-ce!14982
\| * \| \| \| \| \| \| \| \| \| \|	Update docs on creating MRsdocs/update-create-mr	Achilleas Pipinellis	2017-10-21	4	-13/+10
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'use-git-branch-merged' into 'master'	Rémy Coutable	2017-10-27	10	-9/+121
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fetch the merged branches at once. Checking it one by one in the view. We don't cache this yet because this would already much improve the performance. A naive test against a particularly large repository: ``` ruby begin now = Time.now branches.map{ \|b\| r.merged_to_root_ref?(b.name) } Time.now - now end # 8.265830782 ``` Around 10 times faster: ``` ruby begin now = Time.now r.merged_branches(branches.map(&:name)) Time.now - now end # 0.807405397 ``` This should make the branches page usable. See merge request gitlab-org/gitlab-ce!14729
\| * \| \| \| \| \| \| \| \| \| \| \|	Fetch the merged branches at once	Lin Jen-Shin (godfat)	2017-10-27	10	-9/+121
\|/ / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'docs-update-ee_features.md-ce' into 'master'	Rémy Coutable	2017-10-27	1	-0/+382
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move doc/development/ee_features.md to CE See merge request gitlab-org/gitlab-ce!15066
\| * \| \| \| \| \| \| \| \| \| \| \|	Merging EE doc into CEdocs-update-ee_features.md-ce	Lin Jen-Shin	2017-10-27	1	-0/+382
\|/ / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'zj-commit-cache' into 'master'	Sean McGivern	2017-10-27	8	-21/+61
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cache commits on the repository model See merge request gitlab-org/gitlab-ce!14863
\| * \| \| \| \| \| \| \| \| \| \| \|	Cache commits on the repository model	Zeger-Jan van de Weg	2017-10-27	8	-21/+61
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now, when requesting a commit from the Repository model, the results are not cached. This means we're fetching the same commit by oid multiple times during the same request. To prevent us from doing this, we now cache results. Caching is done only based on object id (aka SHA). Given we cache on the Repository model, results are scoped to the associated project, eventhough the change of two repositories having the same oids for different commits is small.
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix/avoid-using-rugged-in-wiki-preview-slug' into 'master'	Sean McGivern	2017-10-27	1	-1/+10
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avoid using Rugged in Gitlab::Git::Wiki#preview_slug See merge request gitlab-org/gitlab-ce!15054
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Avoid using Rugged in Gitlab::Git::Wiki#preview_slug	Ahmad Sherif	2017-10-27	1	-1/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'add-user-avatar-username-link' into 'master'	Fatih Acet	2017-10-27	2	-3/+65
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add configurable option to display username in user avatar link component See merge request gitlab-org/gitlab-ce!14902