summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* 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 '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
* | | | | Merge branch 'katex-math' into 'master' Sean McGivern2016-12-152-0/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Render math in Asciidoc and Markdown with KaTeX using code blocks Closes #13690 and #13180 See merge request !8003
| * | | | | Render math in Asciidoc and Markdown with KaTeX using code blocksMunken2016-12-142-0/+4
| | | | | |
* | | | | | Add Gitlab::Middleware::MultipartJacob Vosmaer2016-12-151-0/+3
| |/ / / / |/| | | |
* | | | | Merge branch 'dz-fix-admin-routes' into 'master' Sean McGivern2016-12-141-7/+16
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | Add support for nested groups to admin routing See merge request !8008
| * | | | Add support for nested groups to admin routingdz-fix-admin-routesDmitriy Zaporozhets2016-12-111-7/+16
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'fix-autoloading-issue' into 'master' Sean McGivern2016-12-131-1/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't require `API::API` in routes Closes #18312. See merge request !8045
| * | | | | Don't require `API::API` in routesfix-autoloading-issueRémy Coutable2016-12-121-1/+0
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `API::API` is autoloaded and shouldn't be required in non-autoloaded code. Otherwise, we get the following dreaded error: A copy of API::Helpers has been removed from the module tree but is still active! Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Crontab typo '* */6' -> '0 */6' (4x/day not 1x-per-min-for-1h 4x/day)Jon Bailey2016-12-121-1/+1
|/ / / /
* | | | Merge branch 'rs-filter-authentication_token' into 'security' Douwe Maan2016-12-082-2/+3
|/ / / | | | | | | | | | | | | Add authentication_token to filter_parameters list See merge request !2041
* | | Fix 404 error when visit group label edit pagedz-fix-group-label-404Dmitriy Zaporozhets2016-12-061-11/+11
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch '24814-pipeline-tabs' into 'master' Fatih Acet2016-12-011-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pipelines tabs ## What does this MR do? Changes the URL when the builds tab is clicked making it possible to be shared. 1. Adds a standard way to handle linked tabs: * This behaviour is already present in the merge requests, commit and user `show` page. * This MR introduces a reusable way to accomplish this behaviour for pages with static content. 2. Adds test: * For the linked tabs reusable class * For the pipelines tabs ## Why was this MR needed? To allow having a sharable URL that represented the opened tab ![tabs](/uploads/91e663c12c6e9ac46a17aa3a9489dc72/tabs.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 - [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 #24814 See merge request !7709
| * | | Pipelines tabsFilipa Lacerda2016-11-301-0/+1
| | |/ | |/|
* | | Merge branch 'fix-optimistic-locking-for-destroy' into 'master' Stan Hu2016-12-011-0/+17
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make deleting with optimistic locking respect NULL Make deleting with optimistic locking respect NULL For now deleting with optimistic locking is broken when lock_version is still NULL, because Rails would try to delete with `lock_version = 0` while in the database the column is still `NULL`. The monkey patches would force Rails just pass whatever in the column, and stop Rails from casting `NULL` into `0` when the value is read from database. Closes #24766 See merge request !7867
| * | | Use Arel to avoid MySQL triple quotingfix-optimistic-locking-for-destroyLin Jen-Shin2016-12-011-2/+1
| | | |
| * | | Make deleting with optimistic locking respect NULLLin Jen-Shin2016-12-011-0/+18
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For now deleting with optimistic locking is broken when lock_version is still NULL, because Rails would try to delete with `lock_version = 0` while in the database the column is still `NULL`. The monkey patches would force Rails just pass whatever in the column, and stop Rails from casting `NULL` into `0` when the value is read from database. Closes #24766
* | | Gracefully recover from Redis connection failures in Sidekiq initializerStan Hu2016-12-011-1/+1
|/ / | | | | | | | | * Closes gitlab-org/gitlab-ce#25143 * Closes gitlab-org/omnibus-gitlab#1743
* | Merge branch '24880-configurable-plaintext-emails' into 'master' Sean McGivern2016-11-291-0/+2
|\ \ | | | | | | | | | | | | | | | | | | Add setting to enable/disable HTML emails Closes #24880 See merge request !7749
| * | Add new configuration setting to enable/disable HTML emails.24880-configurable-plaintext-emailsRuben Davila2016-11-281-0/+2
| | | | | | | | | | | | | | | | | | This new global setting will allow admins to specify if HTML emails should be sent or not, this is basically useful when system administrators want to save some disk space by avoiding emails in HTML format and using only the Plain Text version.
* | | Merge branch 'dz-allow-nested-group-routing' into 'master' Douwe Maan2016-11-247-158/+160
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add nested groups support to the routing ## What does this MR do? It allows routing with `/` in namespace name ## Why was this MR needed? For nested groups feature(https://gitlab.com/gitlab-org/gitlab-ce/issues/2772). We need URI like `/group/subgroup/project` be routed correctly ## 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 - [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? https://gitlab.com/gitlab-org/gitlab-ce/issues/2772 See merge request !7459
| * | Add nested groups support to the routingdz-allow-nested-group-routingDmitriy Zaporozhets2016-11-237-158/+160
| |/ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'doc-for-config' into 'master' Achilleas Pipinellis2016-11-221-0/+22
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add some clarification for some files under config/* Add some clarification for some files under config/* I didn't add a lot of them because I am not very familiar about how they work and I am not sure if we really need to explain files like config/database.yml because if you know Rails you must know how that works. At any rate, I think this is a beginning and we could keep documenting more files in the future. Closes #18373 See merge request !4851
| * Update wordings by feedback from:doc-for-configLin Jen-Shin2016-06-231-7/+8
| | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4851