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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix end-to-end specs for rebasing a merge requestqa/gb/fix-rebase-specs	Grzegorz Bizon	2018-03-20	1	-8/+9
\|
*	Merge branch 'fix/sm/erase_old_trace' into 'master'	Kamil Trzciński	2018-03-20	2	-2/+23
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Use update_column than write_attribute and save Closes #44366 See merge request gitlab-org/gitlab-ce!17861
\| *	Use update_column than write_attribute and savefix/sm/erase_old_trace	Shinya Maeda	2018-03-19	2	-2/+23
\| \|
* \|	Merge branch '42558-add-monitoring-no-data-empty-state' into 'master'	Phil Hughes	2018-03-20	5	-35/+24
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Prometheus graphs have no empty state when no data is present" Closes #42558 See merge request gitlab-org/gitlab-ce!17759
\| * \|	fix tests for dahboard.vue42558-add-monitoring-no-data-empty-state	Mike Greiling	2018-03-19	2	-34/+13
\| \| \|
\| * \|	add no_data illustration to monitoring empty state	Mike Greiling	2018-03-19	3	-1/+11
\| \| \|
* \| \|	Merge branch '44280-fix-code-search' into 'master'	Sean McGivern	2018-03-20	4	-7/+24
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Search code blob sometimes shows filename and branch" Closes #44280 See merge request gitlab-org/gitlab-ce!17777
\| * \| \|	Split repository search result on \n instead of $ to prevent the items of ↵	Jasper Maes	2018-03-19	4	-7/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the array to start with a newline. Remove the strip from parsing the search result to keep result endlines.
* \| \| \|	Merge branch 'issue_25542' into 'master'	Sean McGivern	2018-03-20	8	-29/+88
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve JIRA event descriptions Closes #25542 See merge request gitlab-org/gitlab-ce!17811
\| * \| \| \|	Improve JIRA event descriptionsissue_25542	Felipe Artur	2018-03-19	8	-29/+88
\| \| \| \| \|
* \| \| \| \|	Merge branch 'rs-twitter-helper' into 'master'	Douwe Maan	2018-03-20	1	-3/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove `www.` from `twitter_url` helper See merge request gitlab-org/gitlab-ce!17872
\| * \| \| \| \|	Remove `www.` from `twitter_url` helperrs-twitter-helper	Robert Speicher	2018-03-19	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Twitter redirects `www.twitter.com` to `twitter.com` Also removes unnecessary regex escapes, just 'cause.
* \| \| \| \| \|	Merge branch 'move-render-gfm' into 'master'	Mike Greiling	2018-03-20	15	-22/+20
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move render gfm to commons and update imports See merge request gitlab-org/gitlab-ce!15993
\| * \| \| \| \| \|	move render_gfm into behaviors directory	Mike Greiling	2018-03-19	15	-22/+20
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'ajax-requests-in-performance-bar' into 'master'	Robert Speicher	2018-03-19	30	-212/+807
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show Ajax requests in performance bar Closes #43925 See merge request gitlab-org/gitlab-ce!17742
\| * \| \| \| \| \|	Show Ajax requests in performance bar	Sean McGivern	2018-03-19	30	-212/+807
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	But first, rewrite the performance bar in Vue: 1. Remove the peek-host gem and replace it with existing code. This also allows us to include the host in the JSON response, rather than in the page HTML. 2. Leave the line profiler parts as here-be-dragons: nicer would be a separate endpoint for these, so we could use them on Ajax requests too. 3. The performance bar is too fiddly to rewrite right now, so apply the same logic to that. Then, add features! All requests made through Axios are able to be tracked. To keep a lid on memory usage, only the first two requests for a given URL are tracked, though. Each request that's tracked has the same data as the initial page load, with the exception of the performance bar and the line profiler, as explained above.
* \| \| \| \| \| \|	Merge branch 'blackst0ne-rails5-update-active-record-locking-initializer' ↵	Robert Speicher	2018-03-19	1	-52/+56
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' [Rails5] Update active_record_locking initializer See merge request gitlab-org/gitlab-ce!17824
\| * \| \| \| \| \|	[Rails5] Update active_record_locking initializerblackst0ne-rails5-update-active-record-locking-initializer	blackst0ne	2018-03-18	1	-52/+56
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'api-delimiter' into 'master'	Robert Speicher	2018-03-19	4	-39/+44
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Optional '/-/' delimiter for search API See merge request gitlab-org/gitlab-ce!17750
\| * \| \| \| \| \| \|	Optional '/-/' delimiter for search API	Jan Provaznik	2018-03-19	4	-39/+44
\| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'/-/' delimiter is used only in UI, in API we don't use it for other endpoints. To align search endpoints with the rest of API endpoints, this patch makes '/-/' optional for existing endpoints (to keep backward compatibility). Documentation is updated to prefer paths without '/-/'.
* \| \| \| \| \| \|	Merge branch 'jl-add-custom-metrics-docs' into 'master'	Marcia Ramos	2018-03-19	1	-13/+17
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improvements for prometheus metrics documentation See merge request gitlab-org/gitlab-ce!17838
\| * \| \| \| \| \| \|	Minor updatesjl-add-custom-metrics-docs	Joshua Lambert	2018-03-18	1	-13/+17
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '43933-always-notify-mentions' into 'master'	Sean McGivern	2018-03-19	3	-4/+26
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ignore unsubscribed toggle for @ mentions Closes #43933 See merge request gitlab-org/gitlab-ce!17786
\| * \| \| \| \| \| \| \|	Always notify new mentions even if explicitly unsubscribed43933-always-notify-mentions	Mario de la Ossa	2018-03-19	3	-4/+26
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '44383-cleanup-framework-header' into 'master'	Phil Hughes	2018-03-19	2	-56/+57
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clean up selectors in framework/header.scss Closes #44383 See merge request gitlab-org/gitlab-ce!17822
\| * \| \| \| \| \| \| \|	Clean up selectors in framework/header.scss	Takuya Noguchi	2018-03-20	2	-56/+57
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '44330-docs-for-ingress-ip' into 'master'	Achilleas Pipinellis	2018-03-19	2	-0/+34
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Add documentation for "Display ingress IP address in the Kubernetes page"" Closes #44330, #42761, and #43526 See merge request gitlab-org/gitlab-ce!17836
\| * \| \| \| \| \| \| \| \|	Document static IP and DNS configuration for Kubernetes	Achilleas Pipinellis	2018-03-19	1	-7/+23
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add documentation for displayed K8s Ingress IP address (#44330)44330-docs-for-ingress-ip	Dylan Griffith	2018-03-19	2	-0/+18
\| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'update-google-api-client' into 'master'	Robert Speicher	2018-03-19	2	-5/+5
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update google-api-client 0.13.6 -. 0.19.8 See merge request gitlab-org/gitlab-ce!17790
\| * \| \| \| \| \| \| \| \|	Update google-api-client	Pirate Praveen	2018-03-16	2	-5/+5
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '44384-cleanup-css-for-nested-lists' into 'master'	Filipa Lacerda	2018-03-19	2	-6/+5
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Unify format for nested non-task lists Closes #44384 See merge request gitlab-org/gitlab-ce!17823
\| * \| \| \| \| \| \| \| \|	Unify format for nested non-task lists	Takuya Noguchi	2018-03-18	2	-6/+5
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'sh-admin-projects-remove-n-plus-one' into 'master'	Robert Speicher	2018-03-19	2	-0/+11
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove N+1 queries in /admin/projects page See merge request gitlab-org/gitlab-ce!17834
\| * \| \| \| \| \| \| \| \| \|	Remove N+1 queries in /admin/projects page	Stan Hu	2018-03-19	2	-0/+11
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'refactor/move-mr-widget-sha-mismatch-vue-component' into 'master'	Clement Ho	2018-03-19	7	-26/+39
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move ShaMismatch vue component See merge request gitlab-org/gitlab-ce!17546
\| * \| \| \| \| \| \| \| \| \|	Move ShaMismatch vue component	George Tsiolis	2018-03-19	7	-26/+39
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'sh-fix-failure-project-destroy' into 'master'	Robert Speicher	2018-03-19	2	-1/+10
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix "Can't modify frozen hash" error when project is destroyed See merge request gitlab-org/gitlab-ce!17816
\| * \| \| \| \| \| \| \| \| \| \|	Fix "Can't modify frozen hash" error when project is destroyedsh-fix-failure-project-destroy	Stan Hu	2018-03-16	2	-1/+10
\| \| \|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Partial fix to #44378
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'update-doorkeeper-openid_connect' into 'master'	Douwe Maan	2018-03-19	2	-12/+13
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update doorkeeper-openid_connect and doorkeeper See merge request gitlab-org/gitlab-ce!17797
\| * \| \| \| \| \| \| \| \| \| \|	Update doorkeeper-openid_connect and doorkeeper	Pirate Praveen	2018-03-16	2	-12/+13
\| \| \|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'remove-oj' into 'master'	Robert Speicher	2018-03-19	2	-5/+0
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove oj as we're not using it See merge request gitlab-org/gitlab-ce!17863
\| * \| \| \| \| \| \| \| \| \| \|	Remove oj as we're not using it	Lin Jen-Shin	2018-03-19	2	-5/+0
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch ↵	Filipa Lacerda	2018-03-19	1	-9/+3
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'43928-merge-request-comment-gets-cleared-once-the-previous-comment-is-submitted' into 'master' Resolve "Notes karma specs failing" Closes #44002 See merge request gitlab-org/gitlab-ce!17627
\| * \| \| \| \| \| \| \| \| \| \| \|	Resolve "Notes karma specs failing"	Simon Knox	2018-03-19	1	-9/+3
\|/ / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'update-omniauth-saml' into 'master'	Douwe Maan	2018-03-19	2	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Relax omniauth-saml 1.0.0 -> 1.10 Closes #14292 See merge request gitlab-org/gitlab-ce!17764
\| * \| \| \| \| \| \| \| \| \| \|	Relax omniauth-saml	Pirate Praveen	2018-03-15	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch '31114-internal-ids-are-not-atomic' into 'master'	Sean McGivern	2018-03-19	19	-8/+383
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Atomic generation of internal ids for issues. Closes #31114 See merge request gitlab-org/gitlab-ce!17580
\| * \| \| \| \| \| \| \| \| \| \|	Add spec for concurrent insert situation.31114-internal-ids-are-not-atomic	Andreas Brandl	2018-03-18	1	-0/+13
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Replace public_send calls.	Andreas Brandl	2018-03-18	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \|