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

	Commit message (Collapse)	Author	Age	Files	Lines
*	fix typorefactor-services-for-audit-events-ce	James Lopez	2017-11-02	1	-1/+1
\|
*	fix specs	James Lopez	2017-11-02	1	-1/+1
\|
*	fix specs	James Lopez	2017-11-02	2	-2/+3
\|
*	refactor code	James Lopez	2017-10-31	3	-4/+3
\|
*	fix spinach failure	James Lopez	2017-10-31	1	-0/+2
\|
*	fix specs	James Lopez	2017-10-31	1	-0/+0
\|
*	fix spec	James Lopez	2017-10-31	1	-2/+0
\|
*	uypdated keys controller logic	James Lopez	2017-10-31	2	-8/+3
\|
*	add applications controller logic	James Lopez	2017-10-31	4	-22/+42
\|
*	Merge branch '39582-nestingdepth-6' into 'master'39635-convert-jquery-scrollto-js-library-to-be-a-yarn-managed-library	Annabel Dunstone Gray	2017-10-30	5	-21/+12
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Enable NestingDepth (level 6) on scss-lint Closes #39582 See merge request gitlab-org/gitlab-ce!15073
\| *	Enable NestingDepth (level 6) on scss-lint	Takuya Noguchi	2017-10-30	5	-21/+12
\| \|
* \|	Merge branch '39583-reopen-issue-count-cache' into 'master'	Rémy Coutable	2017-10-30	3	-0/+7
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refresh open Issue and Merge Request project counter caches when re-opening Closes #39583 See merge request gitlab-org/gitlab-ce!15085
\| * \|	Refresh open Issue and Merge Request project counter caches when re-opening	Rob Ede	2017-10-30	3	-0/+7
\|/ /
* \|	Merge branch 'sh-fix-broken-redirection-relative-url-root' into 'master'	Rémy Coutable	2017-10-30	6	-10/+15
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken Members link when relative URL root paths are used See merge request gitlab-org/gitlab-ce!15070
\| * \|	Fix broken Members link when relative URL root paths are usedsh-fix-broken-redirection-relative-url-root	Stan Hu	2017-10-27	6	-10/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Navigating to the "Members" section of a project would omit the relative URL root path. Fix the redirection and eliminate the need for a redirection in the first place. Fix other redirections failing to work with relative roots
* \| \|	Merge branch ↵	Sean McGivern	2017-10-30	6	-2/+39
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'39570-performance-bar-appears-enabled-even-though-it-won-t-show-up' into 'master' Resolve "Performance bar appears enabled even though it won't show up" Closes #39570 See merge request gitlab-org/gitlab-ce!15084
\| * \| \|	Add .gitlab/route-map.yml	Rémy Coutable	2017-10-30	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \|	Allow to disable the Performance Bar and document the `p b` shortcut in its ↵	Rémy Coutable	2017-10-30	5	-2/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	doc page Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch '38869-importer_status' into 'master'	Phil Hughes	2017-10-30	13	-476/+305
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove code from global namespace See merge request gitlab-org/gitlab-ce!15058
\| * \| \| \|	Fix queried element38869-importer_status	Filipa Lacerda	2017-10-30	1	-3/+3
\| \| \| \| \|
\| * \| \| \|	Merge branch 'master' into 38869-importer_status	Filipa Lacerda	2017-10-30	144	-583/+2125
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (51 commits) Move locked check to a guard-clause Ci::Build tag is a trait instead of an own factory [CE backport] Saved configuration for issue board Use the correct project visibility in system hooks Add changelog more readable changelog Make merge_jid handling less stateful in MergeService Fetch the merged branches at once remove extra whitespace use a delegate for `username` to be more future friendly Merging EE doc into CE add changelog entry Avoid using Rugged in Gitlab::Git::Wiki#preview_slug Cache commits on the repository model Remove groups_select from global namespace & simplifies the code Change default disabled merge request widget message to "Merge is not allowed yet" Semi-linear history merge is now available in CE. Remove repetitive karma spec Improve spec to check hidden component Rename to shouldShowUsername ...
\| * \| \| \| \|	Remove issuable form from global namespace	Filipa Lacerda	2017-10-26	4	-102/+98
\| \| \| \| \| \|
\| * \| \| \| \|	Remove issuableContext from global namespace	Filipa Lacerda	2017-10-26	6	-64/+60
\| \| \| \| \| \|
\| * \| \| \| \|	Improves issuable tests	Filipa Lacerda	2017-10-26	3	-70/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes missing dependencies
\| * \| \| \| \|	Remove old code	Filipa Lacerda	2017-10-26	5	-242/+112
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'update-fe-i18n-guide' into 'master'	Filipa Lacerda	2017-10-30	3	-10/+39
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update i18n in FE docs for marking and interpolation See merge request gitlab-org/gitlab-ce!15020
\| * \| \| \| \| \|	Update i18n in FE docs, marking, interpolationupdate-fe-i18n-guide	Eric Eastwood	2017-10-24	3	-10/+39
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch ↵	Fatih Acet	2017-10-30	3	-5/+16
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'39020-fix-js-call-stack-size-exceeded-autocomplete-group-milestone' into 'master' Fix call stack size exceeded group milestone description autocomplete Closes #39020 See merge request gitlab-org/gitlab-ce!14972
\| * \| \| \| \| \|	Split project and group milestone dispatcher branch39020-fix-js-call-stack-size-exceeded-autocomplete-group-milestone	Luke "Jared" Bennett	2017-10-24	1	-0/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Prefer dispatcher glform init over global init	Luke "Jared" Bennett	2017-10-23	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	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