summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Check if user can read issue before being assignedissue_22664Felipe Artur2016-12-274-23/+32
|
* Fix issuable assignee update bug when previous assignee is nullFelipe Artur2016-12-201-3/+4
|
* Merge branch 'avatar-circles' into 'master' Fatih Acet2016-12-202-2/+1
|\ | | | | | | | | | | | | | | | | | | | | Fix sizing of avatar circles; add border * Adds border to group and project avatars * Fixes cut-off circles ![Screen_Shot_2016-12-20_at_8.25.12_AM](/uploads/24e0eedf001f230300a316c504af59d4/Screen_Shot_2016-12-20_at_8.25.12_AM.png) ![Screen_Shot_2016-12-20_at_8.24.59_AM](/uploads/23450bf1f99b8075a043dd5512185e91/Screen_Shot_2016-12-20_at_8.24.59_AM.png) Closes #25733 See merge request !8194
| * Fix sizing of avatar circles; add borderavatar-circlesAnnabel Dunstone Gray2016-12-202-2/+1
| |
* | Merge branch '25093-hide-new-issue-btn-non-loggedin-user' into 'master' Fatih Acet2016-12-201-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hides new issue btn for not loggedin user ## What does this MR do? This MR closes #25093 #25180 ## Are there points in the code the reviewer needs to double check? NR ## Why was this MR needed? Prevent issue creation for no logged in user and some confusion related to ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - Tests - [ ] All builds are passing - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #25093, #25180 See merge request !8175
| * | hides new issue btn for now loggedin userNur Rony2016-12-191-1/+1
| | |
* | | Merge branch 'bold-wip-removed-note' into 'master' Sean McGivern2016-12-201-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Make 'unmarked as Work In Progress' system note more consistent See merge request !8193
| * | | Make 'unmarked as WIP' message more consistentjurre2016-12-201-1/+1
| | |/ | |/|
* | | Merge branch 'jej-memoize-milestoneish-visible-to-user' into 'master' Sean McGivern2016-12-203-6/+36
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Memoize Milestoneish#issues_visible_to_user to reduce lookups https://gitlab.com/gitlab-org/gitlab-ce/issues/25748 See merge request !8146
| * | Milestoneish SQL performance partially improved and memoizedjej-memoize-milestoneish-visible-to-userJames Edwards-Jones2016-12-203-6/+36
| | | | | | | | | | | | Memoize Milestoneish#issues_visible_to_user and counts to reduce lookups Milstoneish SQL optimised with project, but still slow on GlobalMilestone
* | | Merge branch 'project-authorizations-diff' into 'master' Nick Thomas2016-12-204-49/+152
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-194-49/+152
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-201-4/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary method `build_user` from model `User` Closes #25678 See merge request !8162
| * | | | remove build_user from model UserArsenev Vladislav2016-12-181-4/+0
| | | | |
* | | | | Merge branch '22348-gitea-importer' into 'master' Rémy Coutable2016-12-2012-112/+225
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-191-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Namespace access token session key in `Import::GithubController`Rémy Coutable2016-12-192-12/+20
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Reduce duplication for GitHubish import status viewRémy Coutable2016-12-194-121/+66
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Improve Gitlab::ImportSourcesRémy Coutable2016-12-192-31/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Modify GithubImport to support GiteaRémy Coutable2016-12-194-12/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1912-153/+162
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Gogs ImporterKim "BKC" Carlbäcker2016-12-198-1/+177
| | |_|_|/ | |/| | |
* | | | | Merge branch '22864-kubernetes-deploy-with-terminal' into 'master' Kamil Trzciński2016-12-2020-23/+426
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 terminal UI and controller actionsFatih Acet2016-12-1913-10/+119
| | | | | |
| * | | | | Add terminals to the Kubernetes deployment serviceNick Thomas2016-12-196-12/+118
| | | | | |
| * | | | | Add a ReactiveCaching concern for use in the KubernetesServiceNick Thomas2016-12-192-0/+125
| | | | | |
| * | | | | Add xterm.js 2.1.0 and a wrapper class to the asset pipelineNick Thomas2016-12-192-0/+67
| | | | | |
| * | | | | 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 'zj-kamil-slack-slash-commands' into 'master' Grzegorz Bizon2016-12-208-52/+185
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Improve code designKamil Trzcinski2016-12-192-6/+8
| | | | | | |
| * | | | | | Fix spec failuresKamil Trzcinski2016-12-181-1/+1
| | | | | | |
| * | | | | | Added slack slash commands frontend help wellLuke "Jared" Bennett2016-12-182-0/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Added tests
| * | | | | | Use Slack::Notifier::LinkFormatter to convert markdown links to slack compatKamil Trzcinski2016-12-163-12/+11
| | | | | | |
| * | | | | | Fix SlackSlashCommands testsKamil Trzcinski2016-12-162-2/+2
| | | | | | |
| * | | | | | Fix specsKamil Trzcinski2016-12-161-3/+2
| | | | | | |
| * | | | | | Render format dependent linksKamil Trzcinski2016-12-163-2/+19
| | | | | | |
| * | | | | | Use single presenter for everythingKamil Trzcinski2016-12-163-14/+2
| | | | | | |
| * | | | | | Rename ChatService into ChatSlashCommandsServiceKamil Trzcinski2016-12-165-81/+60
| | | | | | |
| * | | | | | Create Slack Slash command serviceZ.J. van de Weg2016-12-164-2/+53
| | | | | | |
* | | | | | | Merge branch '25810-misaligned-count' into 'master' Fatih Acet2016-12-202-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
| * | | | | | | Align milestone column header with count number25810-misaligned-countSam Rose2016-12-192-3/+19
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch '25735-font-size' into 'master' Fatih Acet2016-12-201-1/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update font size of detail page header to 14px Before: ![Screen_Shot_2016-12-19_at_2.55.08_PM](/uploads/ff1544631ff376c3039674ac45eec696/Screen_Shot_2016-12-19_at_2.55.08_PM.png) After: ![Screen_Shot_2016-12-19_at_2.54.48_PM](/uploads/8a1038cc851e186eddada625b8c8de83/Screen_Shot_2016-12-19_at_2.54.48_PM.png) Closes #25735 See merge request !8183
| * | | | | | | Update font size of detail page header to 14px25735-font-sizeAnnabel Dunstone Gray2016-12-191-1/+0
| | | | | | | |
* | | | | | | | Merge branch 'status-badge-height' into 'master' Fatih Acet2016-12-202-2/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove inline-block styling from status Before: ![Screen_Shot_2016-12-19_at_2.13.42_PM](/uploads/2bb7bc84f97fb3489854518e35349203/Screen_Shot_2016-12-19_at_2.13.42_PM.png) After: ![Screen_Shot_2016-12-19_at_2.12.34_PM](/uploads/d228c105f90d546fce5b1653d7a74fd7/Screen_Shot_2016-12-19_at_2.12.34_PM.png) See merge request !8181
| * | | | | | | | Remove inline-block styling from statusstatus-badge-heightAnnabel Dunstone Gray2016-12-192-2/+0
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'dz-fix-route-rename' into 'master' Douglas Barbosa Alexandre2016-12-191-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Route#rename_children behavior ## What does this MR do? Fix Route#rename_children behavior. Given group `gitlab` and `gitlab-org` exists. When rename `gitlab` it will rename `gitlab-org` group route too. This MR fixes it ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/2772 See merge request !8182
| * | | | | | | | Fix Route#rename_children behaviordz-fix-route-renameDmitriy Zaporozhets2016-12-191-1/+1
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Given group `gitlab` and `gitlab-org` exists. When rename `gitlab` it will rename `gitlab-org` group route too. This commit fixes it Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | Merge branch '25740-fix-new-branch-button-padding' into 'master' Annabel Dunstone Gray2016-12-191-0/+1
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even out padding on "plus" button in breadcrumb menu Changed the padding on the ```+``` button to be ```6px``` on all sides. ![Screen_Shot_2016-12-16_at_8_06_07_PM](/uploads/cc85f8ff36c7d2dd75546a67445af19a/Screen_Shot_2016-12-16_at_8_06_07_PM.png) Closes #25740 See merge request !8154
| * | | | | | | Even out padding on plus button in breadcrumb menuRyan Harris2016-12-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed plus button padding to 6px 10px