summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | Update component diagram, switch to mermaidJoshua Lambert2019-05-071-2/+146
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch '60462-empty-pipeline-section' into 'master'Mayra Cabrera2019-05-074-2/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes empty block in MR widget Closes #60462 See merge request gitlab-org/gitlab-ce!27462
| * | | | | | | | | | | | | Fixes empty block in MR widgetFilipa Lacerda2019-05-074-2/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit prevents the pipeline block to be rendered when no pipeline information is provided
* | | | | | | | | | | | | | Merge branch '54405-resolve-discussion-when-applying-a-suggested-change' ↵Phil Hughes2019-05-0710-124/+283
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Resolve discussion when suggestion is applied" Closes #54405 See merge request gitlab-org/gitlab-ce!28160
| * | | | | | | | | | | | | | Resolve discussion when suggestion is applied54405-resolve-discussion-when-applying-a-suggested-changePaul Slaughter2019-05-0710-124/+283
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Adds color and a tooltip to describe this new behavior - Does not resolve if discussion is already resolved - Adds an action `resolveDiscussion` to simplify `toggleResolveNote` - Updates docs https://gitlab.com/gitlab-org/gitlab-ce/issues/54405
* | | | | | | | | | | | | | | Merge branch 'register-gitaly-flags' into 'master'Sean McGivern2019-05-071-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Register "gitaly_delta_islands" feature flag See merge request gitlab-org/gitlab-ce!28181
| * | | | | | | | | | | | | | | Register "gitaly_delta_islands" feature flagJacob Vosmaer2019-05-071-1/+2
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'sh-fix-related-merge-requests-path' into 'master'Rémy Coutable2019-05-074-1/+44
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a path for the related merge requests endpoint Closes #61280 See merge request gitlab-org/gitlab-ce!28171
| * | | | | | | | | | | | | | | Use a path for the related merge requests endpointsh-fix-related-merge-requests-pathStan Hu2019-05-074-1/+44
| | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hosts using a non-standard configuration may have a different hostname/port/scheme than what may be configured on the GitLab server. While expose_url should generate a proper URL, there are cases where it may not work. Since we don't need the full URL, we can use the relative path. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/61280
* | | | | | | | | | | | | | | Merge branch '57171-link-to-grafana-on-metrics-dashboard' into 'master'Clement Ho2019-05-0711-1/+286
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Link to Grafana on metrics dashboard" Closes #57171 See merge request gitlab-org/gitlab-ce!27880
| * | | | | | | | | | | | | | | Add external dashboard linkAdriel Santiago2019-05-0711-1/+286
|/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add settings for linking to external dashboard from metrics dashboard
* | | | | | | | | | | | | | | Merge branch '58882-reduce-test-view-port' into 'master'Rémy Coutable2019-05-074-9/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Try to reduce testing viewport Closes #58882 See merge request gitlab-org/gitlab-ce!27385
| * | | | | | | | | | | | | | | Avoid quick action prompt blocking preview button58882-reduce-test-view-portLin Jen-Shin2019-05-072-5/+14
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Try to reduce testing view port and unify itLin Jen-Shin2019-05-072-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hoping that we don't hit into Selenium::WebDriver::Error::NoSuchDriverError: invalid session id Again.
* | | | | | | | | | | | | | | | Merge branch 'patch-35' into 'master'Achilleas Pipinellis2019-05-071-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix alert box formatting See merge request gitlab-org/gitlab-ce!28159
| * | | | | | | | | | | | | | | | fix alert box formattingBen Bodenmiller2019-05-071-2/+2
| | |_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'mc/feature/pipeline-tracking-ce' into 'master'Grzegorz Bizon2019-05-071-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add bridge relation between Pipelines and Bridges CE backport See merge request gitlab-org/gitlab-ce!28152
| * | | | | | | | | | | | | | | | Backport EE changesmc/feature/pipeline-tracking-ceMatija Čupić2019-05-061-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backports the EE changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/11264
* | | | | | | | | | | | | | | | | Merge branch '57077-add-salesforce-omniauth' into 'master'Douglas Barbosa Alexandre2019-05-0710-1/+95
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Salesforce.com omniauth support" Closes #57077 See merge request gitlab-org/gitlab-ce!27834
| * | | | | | | | | | | | | | | | | Remove from providers with iconGosia Ksionek2019-05-0710-1/+95
|/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove puts Remove puts
* | | | | | | | | | | | | | | | | Merge branch 'ce-11430-update_clair_local_scan' into 'master'James Lopez2019-05-072-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump clair-local-scan to v2.0.8 See merge request gitlab-org/gitlab-ce!27977
| * | | | | | | | | | | | | | | | Bump clair-local-scan to v2.0.8Olivier Gonzalez2019-05-072-1/+6
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'show-disabled-mirrors' into 'master'Nick Thomas2019-05-078-15/+58
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE Show disabled project repo mirrors See merge request gitlab-org/gitlab-ce!27326
| * | | | | | | | | | | | | | | | Show disabled project repo mirrorsshow-disabled-mirrorsLuke Bennett2019-05-078-15/+58
| | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show disabled mirrors with a badge so that they can be deleted by project owners.
* | | | | | | | | | | | | | | | Merge branch 'quarantine-login-via-oauth-spec' into 'master'Lin Jen-Shin2019-05-071-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Quarantine login via oauth spec See merge request gitlab-org/gitlab-ce!28176
| * | | | | | | | | | | | | | | Quarantine login via oauth specWalmyr Lima2019-05-071-1/+2
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'patch-17' into 'master'Bob Van Landuyt2019-05-072-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove note that multi-line suggestions are not yet available See merge request gitlab-org/gitlab-ce!28119
| * | | | | | | | | | | | | | | | add changelog entrySimon Hardt2019-05-071-0/+5
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | remove note that multi-line suggestions are not yet availableSimon Hardt2019-05-061-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#53310 is now done)
* | | | | | | | | | | | | | | | | Merge branch 'fj-59522-improve-search-controller-performance' into 'master'James Lopez2019-05-0714-113/+182
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve performance of the global search for issuables Closes #59522 See merge request gitlab-org/gitlab-ce!27817
| * | | | | | | | | | | | | | | | Add improvements to the global search processFrancisco Javier López2019-05-0714-113/+182
|/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed the conditions added to Project.with_feature_available_for_user, and moved to the IssuableFinder. Now, we ensure that, in the projects retrieved in the Finder, the user has enough access for the feature.
* | | | | | | | | | | | | | | | Merge branch 'patch-17' into 'master'Bob Van Landuyt2019-05-071-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doc/ci: include local: remove superfluous ":" See merge request gitlab-org/gitlab-ce!28112
| * | | | | | | | | | | | | | | | include local: remove superfluous ":"Elan Ruusamäe2019-05-061-2/+2
| | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'bvl-fix-ordering-mysql' into 'master'Sean McGivern2019-05-071-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set created_at and updated_at for sorting specs Closes #61541 See merge request gitlab-org/gitlab-ce!28173
| * | | | | | | | | | | | | | | | Set created_at and updated_at for sorting specsBob Van Landuyt2019-05-071-5/+5
| | |_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes sure that the results are predictable and the same on both Postgres and MySQL
* | | | | | | | | | | | | | | | Merge branch 'docs/fix-source-install-git' into 'master'Bob Van Landuyt2019-05-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix installation from source See merge request gitlab-org/gitlab-ce!28170
| * | | | | | | | | | | | | | | Fix installation from sourceDmitriy Zaporozhets2019-05-071-1/+1
| | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Compiling git has a wrong symbol that leads into invalid command
* | | | | | | | | | | | | | | Merge branch 'gitaly-version-v1.42.0' into 'master'Douwe Maan2019-05-072-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Gitaly to v1.42.0 See merge request gitlab-org/gitlab-ce!28135
| * | | | | | | | | | | | | | | Upgrade Gitaly to v1.42.0GitalyBot2019-05-072-1/+6
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'dz-registry-proxy-ui-ce' into 'master'Tim Zallmann2019-05-071-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE Backport for Dependency Proxy UI See merge request gitlab-org/gitlab-ce!27965
| * | | | | | | | | | | | | | | Backport change to group sidebardz-registry-proxy-ui-cemfluharty2019-05-011-0/+1
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'sh-cleanup-import-export' into 'master'James Lopez2019-05-073-4/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up CarrierWave's import/export files Closes #60656 See merge request gitlab-org/gitlab-ce!27487
| * | | | | | | | | | | | | | | | Clean up CarrierWave's import/export filesStan Hu2019-05-073-4/+37
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unlike uploads that have been uploaded with Tempfile, the project import/export archives are stored in a temporary cache directory and remain there if: 1. Object storage is enabled 2. `move_to_store` is set to `true`. CarrierWave will leave these files there until disk space runs out or a clean step is run manually. If `move_to_store` is set to `false`, CarrierWave will remove the files after storing them. However, unlike a local file, with object storage, the file is still copied, so setting `move_to_store` to `true` doesn't buy us anything. To ensure files are cleaned up, we can just inherit from the GitlabUploader implementation of `move_to_store`, which returns `true` if it's a local file, `false` otherwise. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/60656
* | | | | | | | | | | | | | | | Merge branch 'friendly-wrap-component' into 'master'Tim Zallmann2019-05-072-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add wbr style for IE11 compatibility See merge request gitlab-org/gitlab-ce!27846
| * | | | | | | | | | | | | | | Add wbr style for IE11 compatibilityfriendly-wrap-componentPaul Gascou-Vaillancourt2019-05-062-0/+9
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch '59930-todos-scss' into 'master'Phil Hughes2019-05-072-35/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleans up todos.scss style-lint warnings Closes #59930 See merge request gitlab-org/gitlab-ce!28076
| * | | | | | | | | | | | | | | | Cleans up todos.scss stylelint warnings59930-todos-scssFilipa Lacerda2019-05-032-35/+28
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'winh-separate-frontend-fixtures' into 'master'Phil Hughes2019-05-078-10/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generate EE-specific JavaScript fixtures into ee/ directory (CE-backport) See merge request gitlab-org/gitlab-ce!28032
| * | | | | | | | | | | | | | | | | Load EE fixtures from ee/ directory in Jestwinh-separate-frontend-fixturesWinnie Hellmann2019-05-022-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 2917a28a885922a03f2026ddbb2680bc2b6e5d50)
| * | | | | | | | | | | | | | | | | Load EE fixtures from ee/ directory in KarmaWinnie Hellmann2019-05-022-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 7cde57bf7367bce130a2e7f149c8dafd362de3f8)