summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Improve specs for Files API4269-public-files-apiRémy Coutable2016-12-203-34/+61
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Allow unauthenticated access to Repositories Files API GET endpointsRémy Coutable2016-12-206-16/+35
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch '4269-public-repositories-api' into 'master' Sean McGivern2016-12-205-142/+412
|\ | | | | | | | | | | | | Allow Repositories API GET endpoints to be requested anonymously Closes #4269 See merge request !8148
| * Improve specs for Repositories API4269-public-repositories-apiRémy Coutable2016-12-203-114/+266
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * Allow Repositories API GET endpoints to be requested anonymouslyRémy Coutable2016-12-194-93/+211
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'project-authorizations-diff' into 'master' Nick Thomas2016-12-207-61/+364
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Smarter refreshing of authorized projects This MR reworks the way `User#refresh_authorized_projects`, resulting in a much more efficient process leading to fewer dead tuples. Related issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/25257 See merge request !7956
| * | Smarter refreshing of authorized projectsproject-authorizations-diffYorick Peterse2016-12-197-61/+364
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this commit the refreshing of authorized projects was done in two steps: 1. Remove existing authorizations 2. Insert a new list of all authorizations This can lead to a high amount of dead tuples as every time all rows are being replaced. For example, if a user with 100 authorizations is given access to a new project this would lead to: * 100 rows being removed * 101 new rows being inserted This commit changes the way this system works so it only removes/inserts what is necessary. Using the above example this would lead to only 1 new row being inserted, with the initial 100 being left untouched. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/25257
* | | Merge branch '25678-remove-user-build' into 'master' Rémy Coutable2016-12-203-5/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary method `build_user` from model `User` Closes #25678 See merge request !8162
| * | | remove build_user from model UserArsenev Vladislav2016-12-183-5/+5
| | | |
* | | | Merge branch 'fix_team_member_expiration_date_spec' into 'master' Grzegorz Bizon2016-12-201-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix member with expiration date feature spec See merge request !8186
| * | | | Fix member with expiration date feature specfix_team_member_expiration_date_specFelipe Artur2016-12-191-2/+2
| | | | |
* | | | | Merge branch 'move-admin-projects-spinach-tests-to-rspec' into 'master' Rémy Coutable2016-12-203-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 rspecSemyon Pupkov2016-12-193-159/+91
| | |_|/ / | |/| | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* | | | | Merge branch 'doc-for-pipeline-duration' into 'master' Rémy Coutable2016-12-201-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-durationLin Jen-Shin2016-12-151-0/+31
| | | | | |
* | | | | | Merge branch '22348-gitea-importer-docs' into 'master' Rémy Coutable2016-12-204-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-docsAchilleas Pipinellis2016-12-191-1/+1
| | | | | | |
| * | | | | | Remove duplicate image and optimize the remaining oneAchilleas Pipinellis2016-12-192-0/+0
| | | | | | |
| * | | | | | Add doc for the Gitea importerRémy Coutable2016-12-195-5/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch '22348-gitea-importer' into 'master' Rémy Coutable2016-12-2039-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-importerRémy Coutable2016-12-195-5/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | Namespace access token session key in `Import::GithubController`Rémy Coutable2016-12-196-30/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | Reduce duplication for GitHubish import status viewRémy Coutable2016-12-195-131/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | Improve Gitlab::ImportSourcesRémy Coutable2016-12-194-43/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | Modify GithubImport to support GiteaRémy Coutable2016-12-1922-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 viewsRémy Coutable2016-12-1926-433/+632
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | Gogs ImporterKim "BKC" Carlbäcker2016-12-1921-23/+284
| |/ / / / / /
* | | | | | | Merge branch 'nuke-ugly-spaces-in-changelog-generator' into 'master' Robert Speicher2016-12-202-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-generatorAdam Niedzielski2016-12-092-3/+12
| | | | | | | |
* | | | | | | | Merge branch '22864-kubernetes-deploy-with-terminal' into 'master' Kamil Trzciński2016-12-2050-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 documentationNick Thomas2016-12-199-11/+149
| | | | | | | | |
| * | | | | | | | Add changelog entryNick Thomas2016-12-191-0/+4
| | | | | | | | |
| * | | | | | | | Add terminal UI and controller actionsFatih Acet2016-12-1918-13/+189
| | | | | | | | |
| * | | | | | | | Add terminals to the Kubernetes deployment serviceNick Thomas2016-12-1915-43/+546
| | | | | | | | |
| * | | | | | | | Add a ReactiveCaching concern for use in the KubernetesServiceNick Thomas2016-12-196-0/+324
| | | | | | | | |
| * | | | | | | | Add xterm.js 2.1.0 and a wrapper class to the asset pipelineNick Thomas2016-12-196-0/+4596
| | | | | | | | |
| * | | | | | | | Remove unnecessary hidden svg elements for icons.Fatih Acet2016-12-191-4/+0
| | | | | | | | |
| * | | | | | | | Fix consistent typo in environment.jsFatih Acet2016-12-191-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | environmnets => environments
* | | | | | | | | Merge branch '25848-fix-git-rev-list-env-parsing' into 'master' Sean McGivern2016-12-202-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-parsingRémy Coutable2016-12-202-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | Merge branch 'zj-kamil-slack-slash-commands' into 'master' Grzegorz Bizon2016-12-2037-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-commandsKamil Trzcinski2016-12-193-28/+20
| | | | | | | | | | |
| * | | | | | | | | | Improve after feedbackKamil Trzcinski2016-12-199-51/+32
| | | | | | | | | | |
| * | | | | | | | | | Fix previously reverted spec failuresKamil Trzcinski2016-12-197-47/+47
| | | | | | | | | | |
| * | | | | | | | | | Improve code designKamil Trzcinski2016-12-192-6/+8
| | | | | | | | | | |
| * | | | | | | | | | Fix failuresKamil Trzcinski2016-12-181-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Fix spec failuresKamil Trzcinski2016-12-184-4/+5
| | | | | | | | | | |
| * | | | | | | | | | Remove not related spec changesKamil Trzcinski2016-12-186-43/+43
| | | | | | | | | | |
| * | | | | | | | | | Fix RubocopKamil Trzcinski2016-12-181-2/+2
| | | | | | | | | | |
| * | | | | | | | | | Added slack slash commands frontend help wellLuke "Jared" Bennett2016-12-183-0/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added tests