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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'upstream/master' into ↵	Lin Jen-Shin	2016-12-20	1040	-5142/+29726
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	feature/1376-allow-write-access-deploy-keys * upstream/master: (538 commits) Reject blank environment vcariables in Gitlab::Git::RevList Add online terminal documentation Add changelog entry Add terminal UI and controller actions Fix specs Even out padding on plus button in breadcrumb menu Update font size of detail page header to 14px Update CHANGELOG.md for 8.13.10 Update CHANGELOG.md for 8.14.5 Fix Route#rename_children behavior Remove inline-block styling from status Add terminals to the Kubernetes deployment service Add a ReactiveCaching concern for use in the KubernetesService Add xterm.js 2.1.0 and a wrapper class to the asset pipeline Remove unnecessary hidden svg elements for icons. Fix consistent typo in environment.js Use a block to insert extra check for authenticate_build! Align milestone column header with count number Add Wiki import to BB importer Make CI badge hitboxes better match container ...
\| *	Merge branch 'move-admin-projects-spinach-tests-to-rspec' into 'master'	Rémy Coutable	2016-12-20	3	-159/+91
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move admin projects spinach tests to RSpec Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/23036 See merge request !8174
\| \| *	Move admin projects spinach tests to rspec	Semyon Pupkov	2016-12-19	3	-159/+91
\| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
\| * \|	Merge branch 'doc-for-pipeline-duration' into 'master'	Rémy Coutable	2016-12-20	1	-0/+31
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add doc for pipeline duration The description was copied and modified from !6084 See merge request !6445
\| \| * \|	Add docs for pipeline durationdoc-for-pipeline-duration	Lin Jen-Shin	2016-12-15	1	-0/+31
\| \| \| \|
\| * \| \|	Merge branch '22348-gitea-importer-docs' into 'master'	Rémy Coutable	2016-12-20	4	-5/+85
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add doc for the Gitea importer This adds documentation for !8116. It's mostly a copy/paste of the GitHub import documentation without the OAuth parts since Gitea is not yet an OAuth provider. Part of #22348. See merge request !8139
\| \| * \| \|	Fix link to img22348-gitea-importer-docs	Achilleas Pipinellis	2016-12-19	1	-1/+1
\| \| \| \| \|
\| \| * \| \|	Remove duplicate image and optimize the remaining one	Achilleas Pipinellis	2016-12-19	2	-0/+0
\| \| \| \| \|
\| \| * \| \|	Add doc for the Gitea importer	Rémy Coutable	2016-12-19	5	-5/+85
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \|	Merge branch '22348-gitea-importer' into 'master'	Rémy Coutable	2016-12-20	39	-657/+1357
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It adds a brand new importer for Gitea! This is a continuation of !6945 started by @bkc. Gitea aims to be 100% GitHub-compatible but there's a few differences: - Gitea is not an OAuth provider (yet): https://github.com/go-gitea/gitea/issues/27 - This means we cannot map Gitea users given an assignee ID => assignees are not set on imported issues and merge requests - No releases API for now: https://github.com/go-gitea/gitea/issues/330 - API version is `v1` (GitHub is `v3`) - The IID field for milestones is `id` compared to `number` in GitHub. - Issues, PRs, milestones, labels don't have a `url` field (the importer now fallback to `''` in that case) Known issues: - Comments are not imported because comments JSON always have a blank `html_url`/`issue_url`/`pull_request_url`, so the IID cannot be extracted and the issuable cannot be found... :( This is tracked in https://github.com/go-gitea/gitea/issues/401, and solved by https://github.com/gogits/gogs/pull/3624 but this needs to be submitted / merged in Gitea. This is noted in the documentation. ## Are there points in the code the reviewer needs to double check? 1. I've made `Import::GiteaController` inherit from `Import::GithubController` since both controllers should be identical in the long-term and their current differences are small. 1. I've added a base `IssuableFormatter` class from which `IssueFormatter` & `PullRequestFormatter` inherit 1. I've added shared examples for GitHub/Gitea importer classes 1. I've made `Gitlab::ImportSources` more robust and tested! :christmas_tree: 1. I've added routing specs for import routes! :christmas_tree: Closes #22348 See merge request !8116
\| \| * \| \| \|	Add Project#gitea_import?22348-gitea-importer	Rémy Coutable	2016-12-19	5	-5/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| \| * \| \| \|	Namespace access token session key in `Import::GithubController`	Rémy Coutable	2016-12-19	6	-30/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| \| * \| \| \|	Reduce duplication for GitHubish import status view	Rémy Coutable	2016-12-19	5	-131/+89
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| \| * \| \| \|	Improve Gitlab::ImportSources	Rémy Coutable	2016-12-19	4	-43/+125
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| \| * \| \| \|	Modify GithubImport to support Gitea	Rémy Coutable	2016-12-19	22	-337/+513
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The reason is that Gitea plan to be GitHub-compatible so it makes sense to just modify GitHubImport a bit for now, and hopefully we can change it to GitHubishImport once Gitea is 100%-compatible. Signed-off-by: Rémy Coutable <remy@rymai.me>
\| \| * \| \| \|	Rename Gogs to Gitea, DRY the controller and improve views	Rémy Coutable	2016-12-19	26	-433/+632
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| \| * \| \| \|	Gogs Importer	Kim "BKC" Carlbäcker	2016-12-19	21	-23/+284
\| \| \|/ / /
\| * \| \| \|	Merge branch 'nuke-ugly-spaces-in-changelog-generator' into 'master'	Robert Speicher	2016-12-20	2	-3/+12
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove trailing whitespace when generating changelog entry ## What does this MR do? It removes the trailing whitespace when a new changelog entry file is created by our changelog generator. ## Why was this MR needed? If you run `bin/changelog` without passing merge request and author, these two lines are empty, with a trailing space at the end. I have to remove this trailing space manually. See merge request !7948
\| \| * \| \| \|	Remove trailing whitespace when generating changelog entrynuke-ugly-spaces-in-changelog-generator	Adam Niedzielski	2016-12-09	2	-3/+12
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch '22864-kubernetes-deploy-with-terminal' into 'master'	Kamil Trzciński	2016-12-20	50	-68/+5805
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add online terminal support for Kubernetes ## What does this MR do? Gives terminal access to kubernetes-deployed environments via the deployment service ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Part of idea to production ## Screenshots (if relevant) ### `/root/reviewing/environments` ![Screen_Shot_2016-12-15_at_19.10.40](/uploads/bd2c54c07b6c85dec3328a20cd185b64/Screen_Shot_2016-12-15_at_19.10.40.png) ### `/root/reviewing/environments/10013` ![Screen_Shot_2016-12-19_at_12.52.39](/uploads/db4e4e06cda88437e8727433d65898b9/Screen_Shot_2016-12-19_at_12.52.39.png) ### `/root/reviewing/enviroments/10013/terminal` ![Screen_Shot_2016-12-15_at_02.35.52](/uploads/1bb77b7e2de2c657ae3bda62dc4f0970/Screen_Shot_2016-12-15_at_02.35.52.png) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - Tests - [X] Added for this feature/bug - [x] All builds are passing - [X] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [X] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? * Closes #22864 #22958 * Alternative to, and somewhat based on, !6770 * Depends on https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/83 See merge request !7690
\| \| * \| \| \| \|	Add online terminal documentation	Nick Thomas	2016-12-19	9	-11/+149
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Add changelog entry	Nick Thomas	2016-12-19	1	-0/+4
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Add terminal UI and controller actions	Fatih Acet	2016-12-19	18	-13/+189
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Add terminals to the Kubernetes deployment service	Nick Thomas	2016-12-19	15	-43/+546
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Add a ReactiveCaching concern for use in the KubernetesService	Nick Thomas	2016-12-19	6	-0/+324
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Add xterm.js 2.1.0 and a wrapper class to the asset pipeline	Nick Thomas	2016-12-19	6	-0/+4596
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Remove unnecessary hidden svg elements for icons.	Fatih Acet	2016-12-19	1	-4/+0
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Fix consistent typo in environment.js	Fatih Acet	2016-12-19	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	environmnets => environments
\| * \| \| \| \| \|	Merge branch '25848-fix-git-rev-list-env-parsing' into 'master'	Sean McGivern	2016-12-20	2	-2/+9
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reject blank environment variables in Gitlab::Git::RevList Closes #25848 See merge request !8189
\| \| * \| \| \| \| \|	Reject blank environment vcariables in Gitlab::Git::RevList25848-fix-git-rev-list-env-parsing	Rémy Coutable	2016-12-20	2	-2/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \|	Merge branch 'zj-kamil-slack-slash-commands' into 'master'	Grzegorz Bizon	2016-12-20	37	-242/+483
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Slack slash commands ## What does this MR do? Implement Slack Slash Commands by utilizing generalized Mattermost presenter to fulfill Slack requirements. ## Why was this MR needed? We want to expose Slack Slash Commands as a first-class service. ## What are the relevant issue numbers? Supersedes !8007 Closes #22182 See merge request !8126
\| \| * \| \| \| \| \| \|	Fix specszj-kamil-slack-slash-commands	Kamil Trzcinski	2016-12-19	3	-28/+20
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Improve after feedback	Kamil Trzcinski	2016-12-19	9	-51/+32
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Fix previously reverted spec failures	Kamil Trzcinski	2016-12-19	7	-47/+47
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Improve code design	Kamil Trzcinski	2016-12-19	2	-6/+8
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Fix failures	Kamil Trzcinski	2016-12-18	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Fix spec failures	Kamil Trzcinski	2016-12-18	4	-4/+5
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Remove not related spec changes	Kamil Trzcinski	2016-12-18	6	-43/+43
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Fix Rubocop	Kamil Trzcinski	2016-12-18	1	-2/+2
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Added slack slash commands frontend help well	Luke "Jared" Bennett	2016-12-18	3	-0/+145
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added tests
\| \| * \| \| \| \| \| \|	Use Slack::Notifier::LinkFormatter to convert markdown links to slack compat	Kamil Trzcinski	2016-12-16	12	-58/+57
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Fix SlackSlashCommands tests	Kamil Trzcinski	2016-12-16	8	-118/+127
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Fix specs	Kamil Trzcinski	2016-12-16	3	-8/+12
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Render format dependent links	Kamil Trzcinski	2016-12-16	6	-99/+132
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Use Slack compatible syntax	Kamil Trzcinski	2016-12-16	1	-4/+4
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Use single presenter for everything	Kamil Trzcinski	2016-12-16	3	-14/+2
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Rename Mattermost::Presenter to Presenter	Kamil Trzcinski	2016-12-16	2	-131/+133
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Rename ChatService into ChatSlashCommandsService	Kamil Trzcinski	2016-12-16	5	-81/+60
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Create Slack Slash command service	Z.J. van de Weg	2016-12-16	17	-51/+156
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch '25810-misaligned-count' into 'master'	Fatih Acet	2016-12-20	2	-3/+19
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Align milestone column header with count number ## What does this MR do? - Aligns the milestone column header with the count number - Prevents the count from wrapping below the column header ## Why was this MR needed? - Count number was being pushed below the column header text if the text was too long ## Screenshots (if relevant) - see issue sceenshots for before #25810 - fixed version ![milestones](/uploads/ca12c290abe814b457ad3b2fb86f7696/milestones.png) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #25810 See merge request !8177