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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'winh-note_form_spec-vue-test-utils' into 'master'	Fatih Acet	2019-03-01	1	-59/+98
\|\ \| \| \| \| \| \| \| \|	Refactor note_form_spec.js to use Vue test utils See merge request gitlab-org/gitlab-ce!25571
\| *	Refactor note_form_spec.js to use Vue test utils	Winnie Hellmann	2019-02-28	1	-59/+98
\| \|
* \|	Merge branch '40396-remove-unneeded-restart-code' into 'master'	Robert Speicher	2019-02-28	2	-88/+63
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Remove an obsolete workaround for GRPC unavailable errors See merge request gitlab-org/gitlab-ce!25645
\| * \|	Revert "Restart Unicorn and Sidekiq when GRPC throws 14:Endpoint read failed"	Nick Thomas	2019-02-28	2	-88/+63
\| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 006753110a462e62f549cdf3c410e73eed068dbf.
* \| \|	Merge branch '56863-system-messages-in-email' into 'master'	Douglas Barbosa Alexandre	2019-02-28	10	-19/+297
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show header and footer system messages in email Closes #56863 See merge request gitlab-org/gitlab-ce!25474
\| * \|	Show header and footer system messages in email	Alexandru Croitor	2019-02-27	10	-19/+297
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Add email_header_and_footer_enabled flag to appearances table * Set email_header_and_footer_enabled default value to false * Add checkbox to appearance to toggle show header and footer in emails * Add email_header_and_footer_enabled to allowed params in controller * Add header and footer messages to the html and text email layouts * Remove the color styling for emails header and footer * Add empty_mailer layout for emails without layout, to have the header and footer applied
* \| \|	Merge branch 'web-ide-default-merge-request' into 'master'	Nick Thomas	2019-02-28	1	-0/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use Web IDE path for merge request edit buttons See merge request gitlab-org/gitlab-ce!25595
\| * \| \|	Use Web IDE path for merge request edit buttons	Phil Hughes	2019-02-27	1	-0/+2
\| \| \| \|
* \| \| \|	Jira: Make issue links title compact	Douglas Barbosa Alexandre	2019-02-28	2	-4/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Port of a community contribution from @glensc to upstream.
* \| \| \|	Resolve "Add missing karma tests to the the MR Diff components"	Natalia Tepluhina	2019-02-28	6	-21/+428
\| \| \| \|
* \| \| \|	make assertions on objects instead of tag names	Alexis Reigel	2019-02-27	1	-12/+12
\| \| \| \|
* \| \| \|	don't filter tags by taggable type	Alexis Reigel	2019-02-27	1	-15/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Due to performance reasons we cannot use the type filter on the tags. The table for ActsAsTaggableOn is too big and too unoptimized, such that the queries time out on production. See the discussion https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/19740#note_120087938 for more info.
* \| \| \|	use lazy ajax filter dropdown for runner tags	Alexis Reigel	2019-02-27	2	-17/+66
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the potential number of available runner tags is too large to load it statically to a dropdown. we use the same lazy loaded dropdown as is used for the users dropdown already.
* \| \| \|	add tag filter to admin runners page	Alexis Reigel	2019-02-27	3	-0/+75
\| \| \| \|
* \| \| \|	add tag_list param to runners api	Alexis Reigel	2019-02-27	1	-0/+33
\| \|/ / \|/\| \|
* \| \|	Merge branch 'danger-ignores-gitlab-pot' into 'master'	Robert Speicher	2019-02-27	1	-0/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Danger ignores gitlab.pot See merge request gitlab-org/gitlab-ce!25594
\| * \| \|	Danger ignores gitlab.pot	Nick Thomas	2019-02-27	1	-0/+1
\| \| \|/ \| \|/\|
* \| \|	Merge branch 'fix-misspellings-app' into 'master'	Rémy Coutable	2019-02-27	12	-24/+24
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix misspellings in app/spec executable lines See merge request gitlab-org/gitlab-ce!25521
\| * \| \|	Fix misspellings in app/spec executable lines	Takuya Noguchi	2019-02-27	12	-24/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* \| \| \|	Merge branch ↵	Kamil Trzciński	2019-02-27	15	-113/+207
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'10014-ee-spec-models-ci-build_spec-rb-ee-spec-requests-api-runner_spec-rb-and-ee-spec-services-ci-process_pipeline_service_spec-rb-are-all-failing-ce' into 'master' Revert "Merge branch 'revert-8baf9e5f' into 'master'" See merge request gitlab-org/gitlab-ce!25584
\| * \| \| \|	Revert "Merge branch 'revert-8baf9e5f' into 'master'"	Matija Čupić	2019-02-27	15	-113/+207
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit f5201a816f2eff9393e16f362403451e5d86ee6c, reversing changes made to 48e6db0dad6f256e8423e0bd6c9b254803f50ccf.
* \| \| \| \|	Merge branch 'osw-fetch-latest-version-when-creating-suggestions' into 'master'	Sean McGivern	2019-02-27	2	-6/+52
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enforce using the latest diff version when creating suggestions Closes gitlab-ee#9876 See merge request gitlab-org/gitlab-ce!25441
\| * \| \| \|	Always fetch MR latest version when creating suggestions	Oswaldo Ferreira	2019-02-26	2	-6/+52
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is an issue that can only be seen through EE. Further details can be seen on https://gitlab.com/gitlab-org/gitlab-ee/issues/9876. In general we should always use the latest diff version of a file in order to both create and apply suggestions.
* \| \| \| \|	Merge branch '42086-project-fetch-statistics-api-http-only' into 'master'57125-heatmap-chart-type	Nick Thomas	2019-02-27	7	-0/+161
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Project fetch statistics API (HTTP only)" Closes #42086 See merge request gitlab-org/gitlab-ce!23596
\| * \| \| \| \|	Add project http fetch statistics API	Jacopo	2019-02-27	7	-0/+161
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The API get projects/:id/traffic/fetches allows user with write access to the repository to get the number of clones for the last 30 days.
* \| \| \| \| \|	Merge branch '58149-fix-read-list-board-policy' into 'master'	Nick Thomas	2019-02-27	1	-2/+2
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow `:read_list` when `:read_group` is allowed Closes #58149 See merge request gitlab-org/gitlab-ce!25524
\| * \| \| \| \|	Enable `:read_list` when `:read_group` is enabled	Heinrich Lee Yu	2019-02-25	1	-2/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Add Project template for go-micro	Jason Lenny	2019-02-27	1	-1/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'osw-merge-refs-refreshing-api' into 'master'	Douwe Maan	2019-02-27	1	-0/+61
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API support for MR merge to temporary merge ref path Closes #57252 See merge request gitlab-org/gitlab-ce!24918
\| * \| \| \| \| \|	Add API support for refreshing merge ref path	Oswaldo Ferreira	2019-02-26	2	-28/+61
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a merge_requests/:iid/merge_to_ref API which make use of the groundwork to write merge results into refs/merge-requests/:iid/merge.
\| * \| \| \| \| \|	Support merge to ref for merge-commit and squash	Oswaldo Ferreira	2019-02-26	1	-0/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds the ground work for writing into the merge ref refs/merge-requests/:iid/merge the merge result between source and target branches of a MR, without further side-effects such as mailing, MR updates and target branch changes.
* \| \| \| \| \| \|	Prepare test suite for switch to Gitaly-embedded Git hooks	Jacob Vosmaer	2019-02-27	4	-8/+11
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'include-ci-yaml' into 'master'	Grzegorz Bizon	2019-02-27	2	-3/+82
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix: validate 'include' keywords in gitlab-ci.yml configuration files Closes #55863 See merge request gitlab-org/gitlab-ce!24098
\| * \| \| \| \| \| \|	tests(yaml_processor): complete test scenarios on 'include' keyword	Paul B	2019-02-19	2	-8/+78
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	tests: adding a failing unit test	Paul B	2019-02-19	1	-0/+9
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Reduce code duplication	Alexander Koval	2019-02-27	2	-4/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move logic of obtaining Issuable data to separate method
* \| \| \| \| \| \| \|	Fix inconsistent pagination styles	Clement Ho	2019-02-27	6	-11/+11
\| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'sh-wip-fix-duplicate-env-xhr' into 'master'	Filipa Lacerda	2019-02-27	1	-0/+17
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix pagination and duplicate requests in environments page Closes #58191 See merge request gitlab-org/gitlab-ce!25582
\| * \| \| \| \| \| \|	Add pagination spec and improve filtering of null values	Stan Hu	2019-02-26	1	-0/+17
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'web-ide-default-editor' into 'master'	Filipa Lacerda	2019-02-27	4	-0/+16
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Makes the Web IDE the default editor Closes #42382 See merge request gitlab-org/gitlab-ce!25171
\| * \| \| \| \| \| \| \|	Makes the Web IDE the default editor	Phil Hughes	2019-02-26	4	-0/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/42382
* \| \| \| \| \| \| \| \|	Merge branch 'winh-dequarantine-labels-autocomplete' into 'master'	Phil Hughes	2019-02-27	3	-85/+133
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move gfm_autocomplete_spec.rb out of quarantine Closes #57995 and #56843 See merge request gitlab-org/gitlab-ce!25542
\| * \| \| \| \| \| \| \| \|	Remove tests for labels dropdown from gfm_autocomplete_spec.rb	Winnie Hellmann	2019-02-27	1	-83/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add tests for labels dropdown to gfm_auto_complete_spec.js	Winnie Hellmann	2019-02-27	1	-2/+92
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add JSON fixture for labels autocomplete source	Winnie Hellmann	2019-02-27	1	-0/+40
\| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Set up basic keyboard next/previous navigation in diff list	Denys Mishunov	2019-02-27	3	-36/+227
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Mousetrap is used as the help-tool to listen to keystrokes Added currentDiffIndex getter to store that holds the index of currently active diff file in the list Instead of computing it on the component, we will take advantage of it being available for all components in DiffsApp Testing keyboard navigation and jumpToFile()
* \| \| \| \| \| \| \| \|	Persist source sha and target sha for merge pipelines	Shinya Maeda	2019-02-27	5	-4/+217
\| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	source_sha and target_sha are used for merge request pipelines
* \| \| \| \| \| \| \|	Added: Documentation for the API	Nermin Vehabovic	2019-02-26	10	-39/+109
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added: Specs for the API action
* \| \| \| \| \| \| \|	Remove N+1 query for tags in /admin/runners page	Stan Hu	2019-02-26	1	-1/+18
\| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As discussed in https://github.com/mbleigh/acts-as-taggable-on/issues/91, we can avoid N+1 queries if we use `tags` instead of `tag_list`. Seen while reviewing https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/19740.
* \| \| \| \| \| \|	Add name_without_type to environments.json	Vladimir Shushlin	2019-02-26	3	-5/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It's needed to show shorter names in environments "folders"