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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix concurrency issue with migration for user_interacted_projects table.ab-44205-user_interacted_projects-migration	Andreas Brandl	2018-03-14	3	-49/+110
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The concurrency issue originates from inserts on `user_interacted_projects` from the app while running the post-deploy migration. This change comes with a strategy to lock the table while removing duplicates and creating the unique index (and similar for FK constraints). Also, we'll have a non-unique index until the post-deploy migration is finished to speed up queries during that time. Closes #44205.
*	Merge branch 'fix-emoji-popup' into 'master'	Sean McGivern	2018-03-14	2	-2/+6
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Hide emoji popup after multiple spaces or blank lines, closes #40620,#33678 Closes #40620 and #33678 See merge request gitlab-org/gitlab-ce!17680
\| *	Hide emoji popup after multiple spaces or blank lines	Jan Beckmann	2018-03-11	2	-2/+6
\| \| \| \| \| \| \| \|	Fixes #40620,#33678
* \|	Merge branch 'backstage/gb/add-pipeline-build-variables-tests' into 'master'	Kamil Trzciński	2018-03-14	2	-39/+90
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Improve tests for predefined variables See merge request gitlab-org/gitlab-ce!17597
\| * \|	Remove enforcing uniqueness of build variablesbackstage/gb/add-pipeline-build-variables-tests	Grzegorz Bizon	2018-03-07	2	-10/+9
\| \| \|
\| * \|	Improve pipeline tests for variables to test ordering	Grzegorz Bizon	2018-03-07	1	-3/+3
\| \| \|
\| * \|	Improve tests for predefined variables for a build	Grzegorz Bizon	2018-03-07	2	-37/+89
\| \| \|
* \| \|	Merge branch 'revert-238781a6' into 'master'	Robert Speicher	2018-03-13	1	-2/+0
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'sh-filter-secret-variables' into 'master'" See merge request gitlab-org/gitlab-ce!17733
\| * \| \|	Revert "Merge branch 'sh-filter-secret-variables' into 'master'"	Stan Hu	2018-03-13	1	-2/+0
\|/ / / \| \| \| \| \| \|	This reverts merge request !17159
* \| \|	Merge branch 'pages-0-7-1' into 'master'	Robert Speicher	2018-03-13	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade GitLab Pages to v0.7.1 See merge request gitlab-org/gitlab-ce!17732
\| * \| \|	Upgrade GitLab Pages to v0.7.1	Nick Thomas	2018-03-13	1	-1/+1
\|/ / /
* \| \|	Merge branch '44024-fix-table-extra-column' into 'master'	Clement Ho	2018-03-13	3	-2/+10
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix markdown table showing extra fake column v1 Closes #44024 See merge request gitlab-org/gitlab-ce!17669
\| * \| \|	Fix markdown table showing an extra rake column44024-fix-table-extra-column	Eric Eastwood	2018-03-09	3	-2/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/44024
* \| \| \|	Merge branch 'jivl-fix-timescale-prometheus-charts-overlapping' into 'master'	Mike Greiling	2018-03-13	1	-0/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix timescale prometheus charts overlapping Closes #43458 See merge request gitlab-org/gitlab-ce!17657
\| * \| \| \|	Use graph width to determine tick numberjivl-fix-timescale-prometheus-charts-overlapping	Jose Ivan Vargas	2018-03-12	3	-36/+3
\| \| \| \| \|
\| * \| \| \|	fix timescale prometheus charts overlapping	Jose Ivan Vargas	2018-03-08	3	-2/+36
\| \| \| \| \|
* \| \| \| \|	Merge branch 'docs-download-ce' into 'master'	Douwe Maan	2018-03-13	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Specify installation type for link See merge request gitlab-org/gitlab-ce!17713
\| * \| \| \| \|	Specify installation type for linkdocs-download-ce	Andrey Maslennikov	2018-03-13	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '44161-use-configured-git' into 'master'	Douwe Maan	2018-03-13	2	-13/+13
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "lib/gitlab/git/gitlab_projects.rb does not respect Gitlab.config.git.bin_path" Closes #44161 See merge request gitlab-org/gitlab-ce!17693
\| * \| \| \| \| \|	Respect the configured git path for imported gitlab-shell operations44161-use-configured-git	Nick Thomas	2018-03-12	2	-13/+13
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '43805-list-gitaly-calls-and-arguments-in-the-performance-bar' ↵	Grzegorz Bizon	2018-03-13	14	-49/+144
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "List Gitaly calls and arguments in the performance bar" Closes #43805 See merge request gitlab-org/gitlab-ce!17564
\| * \| \| \| \| \| \|	Capture Gitaly calls that don't go through `migrate`	Sean McGivern	2018-03-13	2	-13/+23
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Make Gitaly more prominent in the performance bar	Sean McGivern	2018-03-13	4	-4/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is as important as SQL timings, and much more important most of the time than GC, Redis, or Sidekiq.
\| * \| \| \| \| \| \|	Improve the frontend code for the performance bar	Sean McGivern	2018-03-13	7	-49/+52
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add Gitaly call details to the performance bar	Sean McGivern	2018-03-13	6	-30/+108
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The same as the SQL queries, show the details of Gitaly calls in the performance bar, as a modal that can be opened in the same way.
* \| \| \| \| \| \| \|	Merge branch 'docs-fe-security' into 'master'	Tim Zallmann	2018-03-13	1	-1/+12
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add frontend security documentation See merge request gitlab-org/gitlab-ce!17622
\| * \| \| \| \| \| \| \|	Add frontend security documentationdocs-fe-security	Clement Ho	2018-03-07	1	-1/+12
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '44152l-last-pipeline-link' into 'master'	Phil Hughes	2018-03-13	1	-4/+2
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make commit pipeline accessible on file page Closes #44152 See merge request gitlab-org/gitlab-ce!17716
\| * \| \| \| \| \| \| \|	Make commit pipeline accessible on file page	Filipa Lacerda	2018-03-13	1	-4/+2
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '35475-lazy-diff' into 'master'	Fatih Acet	2018-03-13	8	-14/+117
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Projects::MergeRequestsController#show is slow (implement skeleton loading)" Closes #35475 See merge request gitlab-org/gitlab-ce!15200
\| * \| \| \| \| \| \| \|	Resolve "Projects::MergeRequestsController#show is slow (implement skeleton ↵	Simon Knox	2018-03-13	8	-14/+117
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	loading)"
* \| \| \| \| \| \| \|	Merge branch '43720-update-fe-webpack-docs' into 'master'	Jacob Schatz	2018-03-13	7	-68/+118
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Document webpack_bundle_tag replacement method" Closes #43720 and #42704 See merge request gitlab-org/gitlab-ce!17706
\| * \| \| \| \| \| \| \|	move tip into blockquote43720-update-fe-webpack-docs	Mike Greiling	2018-03-12	1	-8/+5
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	specify that webpack entry points are exempt from unit tests, not ↵	Mike Greiling	2018-03-12	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	integration tests
\| * \| \| \| \| \| \| \|	address wording feedback	Mike Greiling	2018-03-12	1	-9/+9
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	update node and yarn dependencies within install/upgrade docs	Mike Greiling	2018-03-12	4	-13/+20
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	update EE features frontend section to point to performance.md for info on ↵	Mike Greiling	2018-03-12	1	-15/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	page-specific EE code
\| * \| \| \| \| \| \| \|	differentiate image lazy-loading from code splitting	Mike Greiling	2018-03-12	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	emphasize headings for each page-specific-javascript tip	Mike Greiling	2018-03-12	1	-19/+24
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	add section for universal code	Mike Greiling	2018-03-12	1	-5/+9
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	rewrite docs for page-specific-javascript	Mike Greiling	2018-03-12	1	-34/+88
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	remove deprecated page_specific_javascript_bundle_tag	Mike Greiling	2018-03-12	1	-5/+0
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '44149-issue-comment-buttons' into 'master'	Phil Hughes	2018-03-13	9	-7/+134
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Wrong button has the loading state when submitting a comment in issues" Closes #44149 See merge request gitlab-org/gitlab-ce!17698
\| * \| \| \| \| \| \| \|	Use mapState instead of a getter	Filipa Lacerda	2018-03-13	2	-2/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'master' into 44149-issue-comment-buttons	Filipa Lacerda	2018-03-13	60	-198/+630
\| \|\ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (29 commits) Fix provider server URL used when listing repos to import Fix inconsistent punctuation on MR form Update dependency for svgs Fix timestamp to include %M instead of %I for post-deploy migrations. Use Gitaly 0.89.0 Resolve "Hover style for sidebar dropdowns is wrong" fixed spec Respect the protocol in `expose_url` Fix removes source branch text being rendered in merged state Fix code and wiki search results when filename is non-ASCII Include the ee/ directory in backtraces Use GitLab fork of zaproxy Updates file extensions on Vue docs fixed note polling not sending updated last fetched at date added spec for polling Add changelog entry Use `list.id` for `:key` added mutation spec Bump parser and unparser gems to remove warnings fix polling not working correctly Fixed issue notes being duplicated ...
* \| \| \| \| \| \| \| \|	Merge branch 'rd-fix-github-url-when-listing-repositories-at-importing' into ↵	Douwe Maan	2018-03-12	8	-18/+46
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Fix provider server URL used when listing repos to import See merge request gitlab-org/gitlab-ce!17692
\| * \| \| \| \| \| \| \| \|	Fix provider server URL used when listing repos to importrd-fix-github-url-when-listing-repositories-at-importing	Rubén Dávila	2018-03-12	8	-18/+46
\| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also use Gitlab::Auth::OAuth::Provider.config_for to access OmniAuth config
* \| \| \| \| \| \| \| \|	Merge branch 'ab-44121-post-deploy-migrations-time-format' into 'master'	Yorick Peterse	2018-03-12	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix timestamp to include %M instead of %I for post-deploy migrations. Closes #44121 See merge request gitlab-org/gitlab-ce!17699
\| * \| \| \| \| \| \| \| \|	Fix timestamp to include %M instead of %I for post-deploy migrations.ab-44121-post-deploy-migrations-time-format	Andreas Brandl	2018-03-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #44121.
* \| \| \| \| \| \| \| \| \|	Merge branch 'fl-update-svg' into 'master'	Clement Ho	2018-03-12	2	-4/+4
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update dependency for svgs See merge request gitlab-org/gitlab-ce!17701