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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Log and send a system hook if a blocked user fails to loginsh-log-when-user-blocked	Stan Hu	2018-01-14	2	-4/+9
\| \| \| \|	Closes #41633
*	Merge branch '16988-use-toggle-for-subscribed-unsubscribed-to-notifications' ↵	Annabel Dunstone Gray	2018-01-12	3	-29/+46
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Use toggle for subscribed/unsubscribed to notifications" Closes #16988 See merge request gitlab-org/gitlab-ce!16408
\| *	change loading prop behavior for subscriptions.vue	Mike Greiling	2018-01-12	2	-2/+2
\| \|
\| *	add missing comma	Mike Greiling	2018-01-12	1	-1/+1
\| \|
\| *	only show loading indicator in subscription toggle on initial data fetch16988-use-toggle-for-subscribed-unsubscribed-to-notifications	Mike Greiling	2018-01-12	1	-1/+1
\| \|
\| *	add tooltip for notifications icon in collapsed sidebar	Mike Greiling	2018-01-12	1	-9/+29
\| \|
\| *	change notification bell icon from font-awesome to gitlab svg	Mike Greiling	2018-01-12	1	-8/+10
\| \|
\| *	update karma tests	Mike Greiling	2018-01-12	1	-1/+1
\| \|
\| *	add prop defaults	Mike Greiling	2018-01-12	2	-2/+4
\| \|
\| *	change rss icon to bell icon for notifications	Mike Greiling	2018-01-11	1	-1/+5
\| \|
\| *	convert notification subscription button into toggle	Mike Greiling	2018-01-11	3	-22/+11
\| \|
* \|	Merge branch 'fix_gitlab-ce#41891' into 'master'	Annabel Dunstone Gray	2018-01-12	2	-3/+8
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix gitlab-org/gitlab-ce#41891 (design nitpick) Closes #41891 See merge request gitlab-org/gitlab-ce!16383
\| * \|	remove wrong/unneeded margin of custom navigation header logo without logo text	Markus Doits	2018-01-12	2	-3/+8
\| \| \|
* \| \|	Display related merge requests in commit detail page	Hiroyuki Sato	2018-01-12	7	-2/+104
\| \| \|
* \| \|	Merge branch 'projects-l' into 'master'	Filipa Lacerda	2018-01-12	5	-2/+41
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor projects:l* See merge request gitlab-org/gitlab-ce!16393
\| * \| \|	Refactor into init_labelsprojects-l	Clement Ho	2018-01-12	2	-17/+20
\| \| \| \|
\| * \| \|	Merge branch 'master' into projects-l	Clement Ho	2018-01-11	55	-66/+145
\| \|\ \ \
\| * \| \| \|	Code improvements	Clement Ho	2018-01-11	4	-11/+8
\| \| \| \| \|
\| * \| \| \|	Refactor projects:l*	Jacob Schatz	2018-01-11	4	-2/+41
\| \| \| \| \|
* \| \| \| \|	Move row containing Projects, Users and Groups count to the top	Kushal Pandya	2018-01-12	1	-28/+28
\| \| \| \| \|
* \| \| \| \|	Merge branch ↵	Filipa Lacerda	2018-01-12	8	-135/+60
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'ce-backport-generalize-protected-branch-tags-to-create-item-dropdown' into 'master' Generalize protected branch/tag dropdowns -- CE backport See merge request gitlab-org/gitlab-ce!16420
\| * \| \| \| \|	Generalize protected branch/tag dropdownsce-backport-generalize-protected-branch-tags-to-create-item-dropdown	Eric Eastwood	2018-01-12	8	-135/+60
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove duplicate ee code This was generalized for usage in the new variable table design, see https://gitlab.com/gitlab-org/gitlab-ce/issues/39118#note_53615249 Conflicts: app/assets/stylesheets/pages/projects.scss ee/app/assets/javascripts/protected_branches/protected_branch_create.js ee/app/assets/javascripts/protected_tags/protected_tag_create.js ee/app/views/projects/protected_branches/ee/_dropdown.html.haml
* \| \| \| \| \|	Merge remote-tracking branch 'upstream/master' into 41731-predicate-memoization	Lin Jen-Shin	2018-01-13	14	-53/+89
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: Docs: move article "Autoscaling Runners on AWS" to its topic-related dir Update missing API documentation on `GET /users/:id/projects` Docs: remove duplicate CI examples Only search for MR revert commits on notes after MR was merged Added .rej files to gitignore Fixed performance of projects dropdown Add a note about GitLab QA page objects validator to docs Refactor dispatcher projects blame and blob path Fix Ctrl+Enter keyboard shortcut saving comment/note edit Fix boolean prop being provided as string Fixes minor aspects on Prometheus description Refactor dispatcher project branches path Use simple Next/Prev paging for jobs to avoid large count queries on arbitrarily large sets of historical jobs Update the grpc gem to 1.8.3
\| * \ \ \ \ \	Merge branch '41807-15665-consistently-502s-because-it-fetches-every-commit' ↵41988-updating-the-markdown-cache-version-does-not-flush-the-appearances-cache	Rémy Coutable	2018-01-12	2	-3/+13
\| \|\ \ \ \ \ \ \| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "!15665 consistently 502s because it fetches every commit" Closes #41807 See merge request gitlab-org/gitlab-ce!16320
\| \| * \| \| \| \|	Only search for MR revert commits on notes after MR was merged41807-15665-consistently-502s-because-it-fetches-every-commit	Sean McGivern	2018-01-12	2	-3/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If we search for notes before the MR was merged, we have to load every commit that was ever part of the MR, or mentioned in a push. In extreme cases, this can be tens of thousands of commits to load, but we know they can't revert the merge commit, because they are from before the MR was merged. In the (rare) case that we don't have a `merged_at` value for the MR, we can still search all notes.
\| * \| \| \| \| \|	Merge branch 'projects-dropdown-perf' into 'master'	Filipa Lacerda	2018-01-12	1	-5/+2
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed performance of projects dropdown Closes #41939 See merge request gitlab-org/gitlab-ce!16425
\| \| * \| \| \| \| \|	Fixed performance of projects dropdownprojects-dropdown-perf	Phil Hughes	2018-01-12	1	-5/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #41939
\| * \| \| \| \| \| \|	Merge branch 'disable-pages-on-jobs' into 'master'	Yorick Peterse	2018-01-12	2	-2/+2
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use simple Next/Prev paging for CI Jobs page Closes #41058 See merge request gitlab-org/gitlab-ce!16392
\| \| * \| \| \| \| \| \|	Use simple Next/Prev paging for jobs to avoid large count queries on ↵disable-pages-on-jobs	Greg Stark	2018-01-11	2	-2/+2
\| \| \| \|_\|_\|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	arbitrarily large sets of historical jobs
\| * \| \| \| \| \| \|	Merge branch '41937-vue-prop-type' into 'master'	Phil Hughes	2018-01-12	1	-1/+5
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Fix type is started key" Closes #41937 See merge request gitlab-org/gitlab-ce!16407
\| \| * \| \| \| \| \| \|	Fix boolean prop being provided as string41937-vue-prop-type	Filipa Lacerda	2018-01-11	1	-1/+5
\| \| \| \|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch '41797-prometheus-wording-fixes' into 'master'	Kamil Trzciński	2018-01-12	1	-2/+1
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Wording fixes on cluster page" Closes #41797 See merge request gitlab-org/gitlab-ce!16324
\| \| * \| \| \| \| \| \|	Fixes minor aspects on Prometheus description41797-prometheus-wording-fixes	Mayra Cabrera	2018-01-11	1	-2/+1
\| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Change Gitlab to GitLab - Remove trailing space on GitLab Integration link
\| * \| \| \| \| \| \|	Merge branch '41956-fix-ctrl-enter-binding-to-save-comment' into 'master'	Phil Hughes	2018-01-12	2	-2/+4
\| \|\ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Ctrl+Enter keyboard shortcut saving comment/note edit Closes #41956 See merge request gitlab-org/gitlab-ce!16415
\| \| * \| \| \| \| \|	Fix Ctrl+Enter keyboard shortcut saving comment/note edit41956-fix-ctrl-enter-binding-to-save-comment	Eric Eastwood	2018-01-11	2	-2/+4
\| \| \| \|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/41956
\| * \| \| \| \| \|	Merge branch 'dispatcher-project-branches' into 'master'	Phil Hughes	2018-01-12	2	-4/+10
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor dispatcher project branches path See merge request gitlab-org/gitlab-ce!16398
\| \| * \| \| \| \| \|	Refactor dispatcher project branches pathdispatcher-project-branches	Clement Ho	2018-01-11	2	-4/+10
\| \| \| \|_\|_\|_\|/ \| \| \|/\| \| \| \|
\| * \| \| \| \| \|	Refactor dispatcher projects blame and blob path	Clement Ho	2018-01-12	4	-34/+52
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Properly cleaning up memoized values	Lin Jen-Shin	2018-01-12	1	-3/+5
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Introduce PredicateMemoization cop and fix offenses	Lin Jen-Shin	2018-01-12	3	-11/+28
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	with StrongMemoize
* \| \| \| \| \|	Update export message to mention we can download the file from the UI	James Lopez	2018-01-12	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'mk-fix-permanent-redirect-validation' into 'master'	Douwe Maan	2018-01-12	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Route validation when conflicting permanent redirects exist Closes gitlab-com/support-forum#2883 and #41786 See merge request gitlab-org/gitlab-ce!16397
\| * \| \| \| \| \|	Revert "Revert "Fix Route validation for unchanged path""	Michael Kozono	2018-01-11	1	-1/+1
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 3576d59ae95a61dd20e997a619dbc6c8e8a70276.
* \| \| \| \| \|	fix case where tooltip messes up :last-child selector37077-subscribe-button-tooltip-on-issues-page-causes-visual-stuttering	Mike Greiling	2018-01-11	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'sh-remove-import-retry-count-warning' into 'master'	Robert Speicher	2018-01-11	1	-2/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove warning noise in ProjectImportOptions See merge request gitlab-org/gitlab-ce!16410
\| * \| \| \| \| \|	Remove warning noise in ProjectImportOptions	Stan Hu	2018-01-11	1	-2/+2
\| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Squlches these warnings: ``` /opt/gitlab/embedded/service/gitlab-rails/app/workers/concerns/project_import_options.rb:5: warning: already initialized constant ProjectImportOptions::IMPORT_RETRY_COUNT /opt/gitlab/embedded/service/gitlab-rails/app/workers/concerns/project_import_options.rb:5: warning: previous definition of IMPORT_RETRY_COUNT was here ```
* \| \| \| \| \|	Merge branch 'dispatcher-dashboard-mr' into 'master'	Fatih Acet	2018-01-11	2	-3/+10
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor dispatcher dashboard mr path See merge request gitlab-org/gitlab-ce!16360
\| * \| \| \| \| \|	Remove initLegacyFilters reference in dispatcherdispatcher-dashboard-mr	Clement Ho	2018-01-10	1	-1/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Refactor dispatcher dashboard mr path	Clement Ho	2018-01-10	2	-2/+10
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'dispatcher-boards' into 'master'	Fatih Acet	2018-01-11	2	-2/+11
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor dispatcher project boards path See merge request gitlab-org/gitlab-ce!16374