summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* fixed missing commamerge-request-target-branch-perfPhil Hughes2018-01-161-1/+1
|
* actual spec fixesPhil Hughes2018-01-161-0/+1
|
* more spec fixesPhil Hughes2018-01-162-2/+0
|
* fixed failing specPhil Hughes2018-01-161-0/+1
|
* only search branchesPhil Hughes2018-01-163-21/+13
| | | | target branch select dropdown doesnt care about tags so we dont need to waste time searching them
* Improved performance of merge requests target branch dropdownPhil Hughes2018-01-164-5/+61
|
* Merge branch 'feature/migrate-commit-uri-to-gitaly' into 'master'Sean McGivern2018-01-163-16/+53
|\ | | | | | | | | | | | | Migrate Commit#uri_type to Gitaly Closes gitaly#915 See merge request gitlab-org/gitlab-ce!16453
| * Migrate Commit#uri_type to Gitalyfeature/migrate-commit-uri-to-gitalyAhmad Sherif2018-01-155-18/+55
| | | | | | | | Closes gitaly#915
* | Merge branch '36571-ignore-root-in-repo' into 'master'Sean McGivern2018-01-163-2/+21
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Error while searching for text starting with slash "/"" Closes #36571 See merge request gitlab-org/gitlab-ce!16455
| * | Move Regexp.escape(), fix formatting on tests.Andrew McCallum2018-01-162-4/+4
| | |
| * | Account for query of only forward slash(es).Andrew McCallum2018-01-152-2/+9
| | |
| * | Create intermediary variable for query value with leading slashes removed.Andrew McCallum2018-01-151-1/+3
| | |
| * | Fix spelling mistake.Andrew McCallum2018-01-151-2/+2
| | |
| * | Add space after comma per layout guidelines.Andrew McCallum2018-01-151-1/+1
| | |
| * | Update 36571-ignore-root-in-repo.ymlAndrew McCallum2018-01-151-1/+1
| | |
| * | Add changelogAndrew McCallum2018-01-151-0/+5
| | |
| * | Add scenario of searching within context of repository with root slash to tests.Andrew McCallum2018-01-151-0/+5
| | |
| * | Strip off leading slashes when searching in context of repository.Andrew McCallum2018-01-151-1/+1
| | |
* | | Merge branch 'issue-30101' into 'master'Rémy Coutable2018-01-163-16/+14
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update 'removed assignee' note to include old assignee reference Closes #30101 See merge request gitlab-org/gitlab-ce!16301
| * | | Update 'removed assignee' note to include old assignee referenceMaurizio De Santis2018-01-093-16/+14
| | | |
* | | | Merge branch ↵Kamil Trzciński2018-01-161-13/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '41809-auto-devops-performance-docker-image-not-compatible-with-gitlab-runner' into 'master' Include updated AutoDevOps template with Browser Performance using DinD Closes #41809 See merge request gitlab-org/gitlab-ce!16373
| * | | | Update AutoDevOps template with browser performance fix41809-auto-devops-performance-docker-image-not-compatible-with-gitlab-runnerJoshua Lambert2018-01-101-13/+17
| | | | |
* | | | | Merge branch 'docs-redirections' into 'master'Achilleas Pipinellis2018-01-163-5/+55
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Docs: document new redirect for Disqus comments See merge request gitlab-org/gitlab-ce!16327
| * | | | | Docs: document new redirect for Disqus commentsMarcia Ramos2018-01-163-5/+55
|/ / / / /
* | | | | Merge branch '42055-update-marked-from-0.3.6-to-0.3.12' into 'master'Phil Hughes2018-01-163-4/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update marked to 0.3.12 Closes #42055 See merge request gitlab-org/gitlab-ce!16480
| * | | | | Update marked from 0.3.6 to 0.3.12Takuya Noguchi2018-01-163-4/+9
| | |_|_|/ | |/| | |
* | | | | Merge branch 'sh-remove-shared-runners-and-more' into 'master'Grzegorz Bizon2018-01-162-3/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove erroneous text in shared runners page that suggested more runners available Closes #42059 See merge request gitlab-org/gitlab-ce!16483
| * | | | | Remove erroneous text in shared runners page that suggested more runners ↵sh-remove-shared-runners-and-moreStan Hu2018-01-152-3/+5
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | available Closes #42059
* | | | | Merge branch 'sh-optimize-ci-build-project' into 'master'Grzegorz Bizon2018-01-165-3/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Ensure CI pipelines and builds have the correction project associations See merge request gitlab-org/gitlab-ce!16448
| * | | | | Add specs for CI builds and pipeline relationshipssh-optimize-ci-build-projectStan Hu2018-01-142-0/+14
| | | | | |
| * | | | | Ensure CI pipelines and builds have the correction project associationsStan Hu2018-01-143-3/+4
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should reduce the number of SQL queries and lookups needed to look up a project of a build and pipeline and vice versa. Before: ``` [1] pry(main)> Ci::Build.reflect_on_association(:project).has_inverse? => false [2] pry(main)> Project.reflect_on_association(:builds).has_inverse? => false [3] pry(main)> Ci::Pipeline.reflect_on_association(:project).has_inverse? => false [4] pry(main)> Project.reflect_on_association(:pipelines).has_inverse? => :project ``` After: ``` [1] pry(main)> Ci::Build.reflect_on_association(:project).has_inverse? => :builds [2] pry(main)> Project.reflect_on_association(:builds).has_inverse? => :project [3] pry(main)> Ci::Pipeline.reflect_on_association(:project).has_inverse? => :pipelines [4] pry(main)> Project.reflect_on_association(:pipelines).has_inverse? => :project ```
* | | | | Merge branch '1819-override-ce' into 'master'Rémy Coutable2018-01-158-9/+348
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | CE: Override module to specify that we're overriding See merge request gitlab-org/gitlab-ce!16131
| * | | | | Add some more docs to doc/development/utilities.md1819-override-ceLin Jen-Shin2018-01-122-1/+49
| | | | | |
| * | | | | Merge remote-tracking branch 'upstream/master' into 1819-override-ceLin Jen-Shin2018-01-121243-12281/+33234
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (621 commits) Add a note about GitLab QA page objects validator to docs Refactor dispatcher projects blame and blob path Update export message to mention we can download the file from the UI Fix Ctrl+Enter keyboard shortcut saving comment/note edit fix case where tooltip messes up :last-child selector Add reason to keep postgresql 9.2 for CI Remove warning noise in ProjectImportOptions Add changelog entry Add RedirectRoute factory Update Ingress extra cost note to be more generic Fix Rubocop offense Refactor dispatcher project branches path Revert "Revert "Fix Route validation for unchanged path"" Document that we need rsync for backing up Docs: move article "Laravel and Envoy w/ CI/CD" Recommend against the use of EFS Adds Rubocop rule for line break around conditionals Update CHANGELOG.md for 10.1.6 Filter out build traces from logged parameters Refactored project:n* imports in dispatcher.js ...
| * | | | | | Skip sha_attribute if we're checking staticallyLin Jen-Shin2017-12-261-0/+1
| | | | | | |
| * | | | | | Use `Gitlab::Utils::Override` over defined?(super)Lin Jen-Shin2017-12-266-9/+299
| | | | | | |
* | | | | | | Merge branch 'docs-delete-content-articles-index' into 'master'Achilleas Pipinellis2018-01-157-77/+32
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: deprecates articles index Closes #41138 See merge request gitlab-org/gitlab-ce!16469
| * | | | | | | Docs: deprecates articles indexMarcia Ramos2018-01-157-77/+32
|/ / / / / / /
* | | | | | | Merge branch '19493-fork-does-not-protect-default-branch' into 'master'Douwe Maan2018-01-153-4/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make forking protect default branch on completion Closes #19493 See merge request gitlab-org/gitlab-ce!16449
| * | | | | | | Fork now protects default branch on completion19493-fork-does-not-protect-default-branchTiago Botelho2018-01-153-4/+14
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'feature/migrate-import-repository-to-gitaly' into 'master'Robert Speicher2018-01-155-45/+96
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate importing repository to Gitaly Closes gitaly#907 See merge request gitlab-org/gitlab-ce!16431
| * | | | | | | Migrate importing repository to Gitalyfeature/migrate-import-repository-to-gitalyAhmad Sherif2018-01-157-47/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes gitaly#907
* | | | | | | | Merge branch ↵Kamil Trzciński2018-01-155-38/+105
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '41799-managed-prometheus-deployment-install-a-lot-of-extra-stuff' into 'master' Resolve "Managed Prometheus deployment installs a lot of extra stuff" Closes #41799 See merge request gitlab-org/gitlab-ce!16378
| * | | | | | | | Resolve "Managed Prometheus deployment installs a lot of extra stuff"Mayra Cabrera2018-01-155-38/+105
|/ / / / / / / /
* | | | | | | | Merge branch 'stop-gitaly-atexit' into 'master'Rémy Coutable2018-01-152-9/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use an at_exit hook to stop test gitaly Closes #41991 See merge request gitlab-org/gitlab-ce!16433
| * | | | | | | | Use an at_exit hook to stop test gitalystop-gitaly-atexitJacob Vosmaer2018-01-152-9/+3
| | | | | | | | |
* | | | | | | | | Merge branch 'docs-fix-duplicate-sections' into 'master'Achilleas Pipinellis2018-01-151-11/+12
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: fix duplicate sections (CI docs) - Backport to CE See merge request gitlab-org/gitlab-ce!16463
| * | | | | | | | | move sections for better doc flowMarcia Ramos2018-01-151-11/+11
| | | | | | | | | |
| * | | | | | | | | link to admin docMarcia Ramos2018-01-151-0/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch '38540-ssh-env-file' into 'master'Douwe Maan2018-01-152-10/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "rake gitlab:shell:install creates ~git/.ssh/environment which gitlab:check complains about" Closes #38540 See merge request gitlab-org/gitlab-ce!16114
View Lorry Controller Status