summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'docs/follow-up-parallel-run' into 'master'Achilleas Pipinellis2019-03-191-7/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor new content for stage keyword See merge request gitlab-org/gitlab-ce!25953
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor new content for stage keywordEvan Read2019-03-191-7/+12
|/ / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'docs/registry-dev-arch' into 'master'Achilleas Pipinellis2019-03-190-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add registry to dev arch docs See merge request gitlab-org/gitlab-ce!25951
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Add registry to dev arch docsCindy Pallares2019-03-101-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'docs/registry-dev-arch' into 'master'Achilleas Pipinellis2019-03-191-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add registry to dev arch docs See merge request gitlab-org/gitlab-ce!25951
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Add registry to dev arch docsCindy Pallares 🦉2019-03-191-0/+12
|/ / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch ↵Stan Hu2019-03-198-545/+575
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '47491-gitlab-fakeapplicationsettings-doesn-t-respond-to-all-the-methods-applicationsetting-responds-to-itself' into 'master' Introduce ApplicationSettingImplementation Closes #47491 See merge request gitlab-org/gitlab-ce!25803
| * | | | | | | | | | | | | | | | | | | | | | | | | | Move some application setting examples to be sharedLin Jen-Shin2019-03-193-298/+268
| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Add a few tests for fake applicationsLin Jen-Shin2019-03-191-0/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Update TokenAuthenticatable so methods can be overriddenLin Jen-Shin2019-03-192-8/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Introduce ApplicationSettingImplementation yayLin Jen-Shin2019-03-194-294/+290
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So the fake can enjoy it, too. We don't use `prepend` because that'll require we change `allow_any_instance_of` to `expect_next_instance_of`, but that's not very easy to do. We can do that later.
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'qa-artillery-io-script-2' into 'master'Ramya Authappan2019-03-194-6/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add artillery.io load testing script and rake tasks See merge request gitlab-org/gitlab-ce!26210
| * | | | | | | | | | | | | | | | | | | | | | | | | | Add load testing script for artillery.ioSanad Liaquat2019-03-194-6/+52
|/ / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add rake tasks that makes use of existing performance data genertion task.
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'fix-projects-partial-locals' into 'master'Stan Hu2019-03-197-6/+77
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix undefined variable error on json project views See merge request gitlab-org/gitlab-ce!26297
| * | | | | | | | | | | | | | | | | | | | | | | | | Fix undefined variable error on json project viewsAlejandro Rodríguez2019-03-187-6/+77
|/ / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This mistake seems to have always been there, but it only resulted in errors on the `/explore*.json` since they were the one that _actually_ relied on the local variables.
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bw-fix-api-routing-specs' into 'master'Stan Hu2019-03-181-11/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix spec for routes to the GraphqlController See merge request gitlab-org/gitlab-ce!26231
| * | | | | | | | | | | | | | | | | | | | | | | | Fix spec for routes to the GraphqlControllerBrett Walker2019-03-151-11/+3
| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'osw-suggestion-diff-lines-strategy' into 'master'Douglas Barbosa Alexandre2019-03-182-0/+92
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement suggestion diff lines parser See merge request gitlab-org/gitlab-ce!26069
| * | | | | | | | | | | | | | | | | | | | | | | | | Implement suggestion diff lines parserOswaldo Ferreira2019-03-182-0/+92
| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'qa-update-test-plan-tag' into 'master'Mek Stittri2019-03-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix test-plan label in the template See merge request gitlab-org/gitlab-ce!26283
| * | | | | | | | | | | | | | | | | | | | | | | | | | Fix test-plan label in the templateSanad Liaquat2019-03-181-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'patch-47' into 'master'Dmitriy Zaporozhets2019-03-183-4/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed backup of non default upload directory See merge request gitlab-org/gitlab-ce!25736
| * | | | | | | | | | | | | | | | | | | | | | | | | | Replaced config accessDominic Renner2019-03-183-4/+20
|/ / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced Settings with Gitlab.config for uniformity
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into 'master'Achilleas Pipinellis2019-03-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updating nginx_status link in index.md to use the proper anchor to nginx.html See merge request gitlab-org/gitlab-ce!26245
| * | | | | | | | | | | | | | | | | | | | | | | | | | Updating nginx_status link in index.md to use the proper anchor to nginx.htmlChris Horne2019-03-161-1/+1
| |/ / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into 'master'Mark Lapierre2019-03-183-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the same standard for method names on project activity and menu page objects See merge request gitlab-org/gitlab-ce!24738
| * | | | | | | | | | | | | | | | | | | | | | | | | | Use the same standard for method names on project activity and menuWalmyr2019-03-183-4/+4
|/ / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... page objects. Also, update the affected test case. I choose `click_...` instead of `go_to_...` since it describes better what the method really does, which is clicking on something. I know there are other places in the code where methods start with `click_` and others where methods start with `go_to_`, with that I'd like to start a discussion or be pointed to the right issue if there is already one so that we can address this in the whole framework. This contribution could be the start in the direction of using the standard chosen here.
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'resolve-lib-gitlab-differences' into 'master'Robert Speicher2019-03-1812-11/+64
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move EE specific code out of lib/gitlab See merge request gitlab-org/gitlab-ce!25741
| * | | | | | | | | | | | | | | | | | | | | | | | | | Backport EE changes to UserExtractor to CEYorick Peterse2019-03-182-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This backports the changes EE made to Gitlab::UserExtractor, removing the need for an EE specific module.
| * | | | | | | | | | | | | | | | | | | | | | | | | | Fix whitespace in IssueBuilder/MergeRequestBuilderYorick Peterse2019-03-152-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Backport support for finding EE workersYorick Peterse2019-03-121-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This backports support for finding EE workers in ee/app/workers from EE to CE, since we already do this for the configuration paths constant. This removes the need for EE specific modules.
| * | | | | | | | | | | | | | | | | | | | | | | | | | Backport try_megabytes_to_bytes from EEYorick Peterse2019-03-122-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EE adds this method to Gitlab::Utils, which is also required by our SimpleCov helper. This prevents us from injecting EE modules into Gitlab::Utils, because the necessary bits for this are not yet in place. To work around this we just backport try_megabytes_to_bytes, as there's no particular reason to keep this in EE only.
| * | | | | | | | | | | | | | | | | | | | | | | | | | Backport allow_mirror_update for Chain::CommandYorick Peterse2019-03-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This backports the allow_mirror_update update field for Chain::Command from EE to CE. There's no particular reason to keep this in EE. Doing so would require refactoring of CE as there currently is no easy way to inject new Struct members into the Chain::Command class.
| * | | | | | | | | | | | | | | | | | | | | | | | | | Backport Gitaly dynamic timeouts from EEYorick Peterse2019-03-122-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EE added the ability to set timeouts when handling blobs. Since there's no particular reason for this to be EE specific we can just backport this to CE.
| * | | | | | | | | | | | | | | | | | | | | | | | | | Refactor Gitlab::Favicon for EEYorick Peterse2019-03-121-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves the development favicon name in Gitlab::Favicon to a separate method, allowing EE to redefine it to return a custom favicon.
| * | | | | | | | | | | | | | | | | | | | | | | | | | Backport Gitlab::Ci::Model from EEYorick Peterse2019-03-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This backports the EE changes to Gitlab::Ci::Model back into CE, ensuring the code is the same for both versions.
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '10428-cluster-sidebar' into 'master'Phil Hughes2019-03-181-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes EE differences for clusters/_sidebar.html.haml Closes gitlab-ee#10428 See merge request gitlab-org/gitlab-ce!26271
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Removes EE differences for clusters/_sidebar.html.hamlFilipa Lacerda2019-03-181-0/+2
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch ↵Clement Ho2019-03-182-0/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '58889-spinners-are-active-prematurely-in-bitbucket-cloud-import' into 'master' Resolve "Spinners are active prematurely in Bitbucket Cloud import" Closes #58889 See merge request gitlab-org/gitlab-ce!26175
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Spinners are active prematurely in Bitbucket Cloud import"Brandon Labuschagne2019-03-182-0/+17
|/ / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '58739-fix-storage-migration' into 'master'Douglas Barbosa Alexandre2019-03-183-10/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix storage migration check for non-empty queues Closes #58739 See merge request gitlab-org/gitlab-ce!26109
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Fix storage migration check for non-empty queuesGabriel Mazetto2019-03-173-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous code works fine when running specs, but the API does not exist outside that environment.
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'id-skip-prepopulating-for-any-none' into 'master'Phil Hughes2019-03-182-6/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix skipping of user rendering for none and any See merge request gitlab-org/gitlab-ce!26268
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix skipping of user rendering for none and anyIgor2019-03-182-6/+28
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '58999-z-index-issue-on-pipeline-dropdown' into 'master'Phil Hughes2019-03-182-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Z-Index Issue on Pipeline Dropdown" Closes #58999 See merge request gitlab-org/gitlab-ce!26274
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix z-index issueNathan Friend2019-03-182-1/+7
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit lowers the z-index of the .merge-request-tabs-holder class to avoid rendering conflicts with the mini pipeline status dropdown on the merge request page.
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch ↵Lin Jen-Shin2019-03-184-3/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'ce-10421-implement-the-retrieval-reading-of-the-insights-file-to-be-used-in-the-insights-controller' into 'master' New Repository#insights_config method Closes gitlab-ee#10421 See merge request gitlab-org/gitlab-ce!26183
| * | | | | | | | | | | | | | | | | | | | | | | | | | | New Repository#insights_config methodRémy Coutable2019-03-184-3/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'pravi/gitlab-ce-update-acts-as-taggable-on' into 'master'James Lopez2019-03-183-4/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update acts-as-taggable-on 5.0 -> 6.0 See merge request gitlab-org/gitlab-ce!26051
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Update acts-as-taggable-on 5.0 -> 6.0Pirate Praveen2019-03-183-4/+5
| | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>