summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* Merged the 'groups' and 'projects' tabs when viewing user profilesJames Gregory2016-12-291-1/+0
|
* Fix 500 error when visit group from admin area if group name contains dotdz-improve-admin-group-routingDmitriy Zaporozhets2016-12-281-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'feature/more-storage-statistics' into 'master' Sean McGivern2016-12-261-1/+1
|\ | | | | | | | | Add more storage statistics See merge request !7754
| * Add more storage statisticsMarkus Koller2016-12-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | This adds counters for build artifacts and LFS objects, and moves the preexisting repository_size and commit_count from the projects table into a new project_statistics table. The counters are displayed in the administration area for projects and groups, and also available through the API for admins (on */all) and normal users (on */owned) The statistics are updated through ProjectCacheWorker, which can now do more granular updates with the new :statistics argument.
* | Merge branch 'permit-uploadedfile-scalar' into 'master' Rémy Coutable2016-12-231-0/+16
|\ \ | | | | | | | | | | | | | | | | | | Monkey-patch StrongParameters for ::UploadedFile Closes gitlab-ee#1451 See merge request !8299
| * | Monkey-patch StrongParameters for ::UploadedFileJacob Vosmaer2016-12-231-0/+16
| | |
* | | Merge branch '25896-fix-404-katax-fonts' into 'master' Alfredo Sumaran2016-12-221-0/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "KaTeX fonts 404 on gitlab.com" Closes #25896 See merge request !8228
| * | | Add KaTeX fonts to assets paths and precompileHiroyuki Sato2016-12-221-0/+2
| | | |
* | | | Merge branch '23638-remove-builds-tab' into 'master' Kamil Trzciński2016-12-211-4/+0
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Resolve "Remove Builds tab from Merge Requests and Commits" Closes #23638 See merge request !7763
| * | | Changes after reviewFilipa Lacerda2016-12-211-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | Fix broken test Remove spinach tests for the builds tab
| * | | Remove builds tab from commitFilipa Lacerda2016-12-211-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Remove unused file Fix commit link
| * | | Removes builds tab from merge requestFilipa Lacerda2016-12-211-1/+0
| | | | | | | | | | | | | | | | Fix specs
* | | | Merge branch 'backport-mr-widget-ci-js' into 'master' Alfredo Sumaran2016-12-211-0/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Backport moving MR widget CI JS out of script tag See merge request !8200
| * | | Remove unneeded bundle refs.backport-mr-widget-ci-jsBryce Johnson2016-12-211-2/+0
| | | |
| * | | Backport moving MR widget CI JS out of script tag.Bryce Johnson2016-12-211-0/+3
| | | |
* | | | Merge branch 'zj-mattermost-slash-config' into 'master' Kamil Trzciński2016-12-212-1/+3
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Mattermost slash auto config Closes #24769 See merge request !8070
| * | | Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-configKamil Trzcinski2016-12-205-1/+12
| |\ \ \ | | | |/ | | |/|
| * | | Improve sourcesKamil Trzcinski2016-12-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | - Add proper error handling, - Use flash[:alert] and flash[:notice], - Use `resource` instead of `resources`,
| * | | Minor adjustments API MattermostZ.J. van de Weg2016-12-191-5/+1
| | | | | | | | | | | | | | | | [ci skip]
| * | | Merge branch 'master' into 'zj-mattermost-slash-config'Zeger-Jan van de Weg2016-12-1811-10/+43
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # config/gitlab.yml.example # lib/mattermost/session.rb # spec/lib/mattermost/session_spec.rb
| * | | | Fix configure routeLuke "Jared" Bennett2016-12-171-1/+1
| | | | |
| * | | | Add tests for auto configure slash commandsZ.J. van de Weg2016-12-161-1/+0
| | | | |
| * | | | Add MattermostControllerZ.J. van de Weg2016-12-161-0/+6
| | | | |
| * | | | Base work for auto config MM slash commandsZ.J. van de Weg2016-12-162-0/+6
| | | | |
* | | | | Merge branch 'authentiq-id-oauth-support' into 'master' Rémy Coutable2016-12-211-0/+10
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | Added support for Authentiq OAuth provider See merge request !8038
| * | | | Added support for Authentiq oauth providerAlex2016-12-211-0/+10
| | |/ / | |/| |
* | | | Merge branch '19703-direct-link-pipelines' into 'master' Grzegorz Bizon2016-12-201-0/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Direct link from pipeline list to builds" ## What does this MR do? - Adds a dropdown with builds in the mini pipeline graph in the pipelines table - Unnest a lot of CSS related with pipelines in order to make it reusable ## Screenshots ![Screen_Shot_2016-12-15_at_14.45.41](/uploads/ca1c61842a422a34383e029d668034b7/Screen_Shot_2016-12-15_at_14.45.41.png) ![Screen_Shot_2016-12-15_at_14.45.49](/uploads/952e3277143639ce4ad111103034faeb/Screen_Shot_2016-12-15_at_14.45.49.png) ![Screen_Shot_2016-12-15_at_14.46.02](/uploads/f7369a124b1c3c0db4194de2cb637ef0/Screen_Shot_2016-12-15_at_14.46.02.png) ![graph_animation](/uploads/9bae036cb5acff499f992a4722943d72/graph_animation.gif) ## Does this MR meet the acceptance criteria? - [x] [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 - [x] 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) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #25071 Closes #19703 See merge request !8097
| * | | Merge branch 'master' into 19703-direct-link-pipelinesFilipa Lacerda2016-12-198-6/+35
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (175 commits) Fix typo Always use `fixture_file_upload` helper to upload files in tests. Add CHANGELOG Fix extra spacing in all rgba methods in status file Improve spacing and fixes manual status color Add `ci-manual` status CSS with darkest gray color Move admin application spinach test to rspec Move admin deploy keys spinach test to rspec Fix CI/CD statuses actions' CSS on pipeline graphs Fix rubocop failures Store mattermost_url in settings Improve Mattermost Session specs Ensure the session is destroyed Improve session tests Setup mattermost session Fix link from doc/development/performance.md to 'Performance Monitoring' Fix query in Projects::ProjectMembersController to fetch members Improve test for sort dropdown on members page Fix sort dropdown alignment Undo changes on members search button stylesheet ...
| * | | Render stage dropdown in separate API call as HTMLKamil Trzcinski2016-12-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ``` Endpoint: /group/project/pipelines/id/stage.json?stage=name Call: stage_namespace_project_pipeline_path(pipeline.project.namespace, pipeline.project, pipeline, stage: stage.name) ```
* | | | Merge branch '22348-gitea-importer' into 'master' Rémy Coutable2016-12-202-1/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Rename Gogs to Gitea, DRY the controller and improve viewsRémy Coutable2016-12-192-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Gogs ImporterKim "BKC" Carlbäcker2016-12-192-1/+7
| | |/ / | |/| |
* | | | Add terminal UI and controller actionsFatih Acet2016-12-191-0/+2
| | | |
* | | | Add a ReactiveCaching concern for use in the KubernetesServiceNick Thomas2016-12-191-0/+1
| | | |
* | | | Add xterm.js 2.1.0 and a wrapper class to the asset pipelineNick Thomas2016-12-191-0/+2
|/ / /
* | | Merge branch '25741_enable_multiline_operation_indentation_rubocop_rule' ↵Sean McGivern2016-12-171-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Enable Style/MultilineOperationIndentation in Rubocop Fixes #25741 See merge request !8125
| * | | Enable Style/MultilineOperationIndentation in Rubocop, fixes #25741Rydkin Maxim2016-12-161-1/+1
| | | |
* | | | Fix rubocop failureszj-mattermost-sessionKamil Trzcinski2016-12-171-2/+2
| | | |
* | | | Store mattermost_url in settingsKamil Trzcinski2016-12-172-0/+13
| | | |
* | | | Merge branch 'bitbucket-oauth2' into 'master' Douglas Barbosa Alexandre2016-12-162-2/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor Bitbucket importer to use BitBucket API Version 2 ## What does this MR do? ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/19946 ## Screenshots (if relevant) This MR needs the following permissions in the Bitbucket OAuth settings: ![image](/uploads/a26ae5e430a724bf581a92da7028ce3c/image.png) - [] ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5995
| * \ \ \ Merge remote-tracking branch 'origin/master' into bitbucket-oauth2Douglas Barbosa Alexandre2016-12-165-3/+13
| |\ \ \ \ | | |/ / /
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into bitbucket-oauth2Valery Sizov2016-12-141-7/+16
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into bitbucket-oauth2Valery Sizov2016-12-148-16/+34
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into bitbucket-oauth2Valery Sizov2016-11-309-158/+184
| |\ \ \ \ \
| * | | | | | Remove code to clone Bitbucket repositories using SSHDouglas Barbosa Alexandre2016-11-211-2/+0
| | | | | | |
| * | | | | | Add custom OmniAuth strategy for Bitbucket OAuth2Douglas Barbosa Alexandre2016-11-211-0/+6
| | | | | | |
* | | | | | | Merge branch '18435-autocomplete-is-not-performant' into 'master' Fatih Acet2016-12-161-1/+12
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make autocomplete request performant ## What does this MR do? Restricts the `autocomplete_sources`action to returning the `json`of one specific `at` type at a time. Makes sure all commands start by immediately showing the `loading` dropdown. If the `loading` dropdown is active, we will request and load in the data for that specific `at` type. We manually trigger the filter again. This time, if `loading` dropdown is not active, initiate default filter behaviour and use the correct data template. Also fixes an issue where `setup` was called multiple times by only setting up and destroying atwho on a focused/blured input. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? `autocomplete_sources` was requested on page load and is large. ## Screenshots (if relevant) 3 requests for 3 different first-time references. ![Screen_Shot_2016-10-14_at_14.43.12](/uploads/0b04eab0d0bf3638d6d6e431036b8089/Screen_Shot_2016-10-14_at_14.43.12.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - 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 #22802 Closes #18435 See merge request !6856
| * | | | | | Changed autocomplete_sources into an action that returns a single 'at' type ↵18435-autocomplete-is-not-performantLuke Bennett2016-12-151-1/+12
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of sources at a time Finished up autocomplete_sources action and added frontend to fetch data only when its needed Added wait_for_ajax to specs Fixed builds and improved the setup/destroy lifecycle Changed global namespace and DRYed up loading logic Added safety for accidentally loading data twice Removed destroy as its not necessary and is messing with click events from a blur race condition Created AutocompleteSourcesController and updated routes Fixed @undefined from tabbing before load ends Disable tabSelectsMatch until we have loaded data Review changes
* | | | | | Calls to the API are checked for scope.Timothy Andrew2016-12-162-2/+3
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Move the `Oauth2::AccessTokenValidationService` class to `AccessTokenValidationService`, since it is now being used for personal access token validation as well. - Each API endpoint declares the scopes it accepts (if any). Currently, the top level API module declares the `api` scope, and the `Users` API module declares the `read_user` scope (for GET requests). - Move the `find_user_by_private_token` from the API `Helpers` module to the `APIGuard` module, to avoid littering `Helpers` with more auth-related methods to support `find_user_by_private_token`
* | | | | Merge branch 'rs-filter-params' into 'security' bpj-issuable-sidebar-autoupdatebackport-link_to_member_avatarRémy Coutable2016-12-151-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Filter `incoming_email_token` and `runners_token` parameters Closes https://dev.gitlab.org/gitlab/gitlabhq/issues/2676 See merge request !2045