summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge branch 'blackst0ne-rails5-fix-snippets-finder' into 'master'Yorick Peterse2018-06-142-5/+15
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Rails5] Fix snippets_finder arel queries Closes #47832 See merge request gitlab-org/gitlab-ce!19796
| * | | | | | | | | | | [Rails5] Fix snippets_finder arel queriesblackst0ne-rails5-fix-snippets-finderblackst0ne2018-06-142-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a bug https://github.com/rails/arel/issues/531 in Rails 5.0 and 5.1 in Arel/ActiveRecord. This commit converts arel based queries to their raw counterparts to make the finder work in Rails 5.0. These changes should be reverted when on Rails 5.2 as since that version such queries work well again. See the bug link.
* | | | | | | | | | | | Merge branch 'backport-flayignore' into 'master'Douwe Maan2018-06-141-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport EE .flayignore lines to CE See merge request gitlab-org/gitlab-ce!19829
| * | | | | | | | | | | | Backport EE .flayignore lines to CENick Thomas2018-06-141-0/+9
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'gitaly-disk-access-4' into 'master'Douwe Maan2018-06-1417-34/+83
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deny repository disk access in development and test See merge request gitlab-org/gitlab-ce!19716
| * | | | | | | | | | | Deny repository disk access in development and testJacob Vosmaer (GitLab)2018-06-1417-34/+83
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'fix-flakey-user-comment-on-issue' into 'master'Sean McGivern2018-06-141-2/+5
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix flakey time-sensitive user comment on issue test See merge request gitlab-org/gitlab-ce!19786
| * | | | | | | | | | Fix flakey user comment on issue test race conditionEric Eastwood2018-06-141-2/+5
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'author-doc-fix' into 'master'Achilleas Pipinellis2018-06-142-30/+37
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix fields for author & assignee in MR API docs Closes #42445 See merge request gitlab-org/gitlab-ce!19798
| * | | | | | | | | | Fix fields for author & assignee in MR API docs.gfyoung2018-06-132-30/+37
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #42445.
* | | | | | | | | | Merge branch 'cache-doc-fix' into 'master'Achilleas Pipinellis2018-06-142-10/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove incorrect CI doc re: PowerShell Closes #40164 See merge request gitlab-org/gitlab-ce!19622
| * | | | | | | | | | Remove incorrect CI doc re: PowerShellgfyoung2018-06-132-10/+5
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #40164.
* | | | | | | | | | Merge branch 'unify-simple_executor' into 'master'Douwe Maan2018-06-141-5/+25
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring changes from EE for lib/system_check/simple_executor.rb See merge request gitlab-org/gitlab-ce!19782
| * | | | | | | | | | Bring changes from EE for lib/system_check/simple_executor.rbunify-simple_executorLin Jen-Shin2018-06-141-5/+25
| | | | | | | | | | |
* | | | | | | | | | | Merge branch ↵Sean McGivern2018-06-143-0/+10
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'rd-33733-showing-created-date-instead-of-updated-date-in-project-lists' into 'master' Invalidate cache with project details when repository is updated Closes #33733 See merge request gitlab-org/gitlab-ce!19774
| * | | | | | | | | | | Invalidate cache with project details when repository is updatedrd-33733-showing-created-date-instead-of-updated-date-in-project-listsRubén Dávila2018-06-133-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The partial using this cache key was showing stale information due to the cache not being invalidated.
* | | | | | | | | | | | Merge branch 'assignee-lists-tiers-docs' into 'master'Sean McGivern2018-06-141-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add assignee lists to tiers table in docs See merge request gitlab-org/gitlab-ce!19756
| * | | | | | | | | | | | Add assignee lists to tiers table in docsassignee-lists-tiers-docsVictor Wu2018-06-131-6/+6
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jprovazn-rails5-shoulda' into 'master'Rémy Coutable2018-06-141-0/+27
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix shoulda-matchers in Rails 5 Closes #47639 See merge request gitlab-org/gitlab-ce!19749
| * | | | | | | | | | | | Fix shoulda-matchers in Rails 5jprovazn-rails5-shouldaJan Provaznik2018-06-131-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backports a fix for https://github.com/thoughtbot/shoulda-matchers/issues/913. This can be removed once new shoulda-matchers version is released.
* | | | | | | | | | | | | Merge branch 'ide-pipeline-error-wrap' into 'master'Filipa Lacerda2018-06-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wrap YAML error in Web IDE pipelines panel Closes #47755 See merge request gitlab-org/gitlab-ce!19736
| * | | | | | | | | | | | Wrap YAML error in Web IDE pipelines panelide-pipeline-error-wrapPhil Hughes2018-06-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #47755
* | | | | | | | | | | | | Merge branch 'bw-enable-commonmark' into 'master'Sean McGivern2018-06-1414-86/+195
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enable CommonMark as the default See merge request gitlab-org/gitlab-ce!19331
| * | | | | | | | | | | | | enable CommonMark as the defaultBrett Walker2018-06-1414-86/+195
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'docs-coached-20180613-1' into 'master'Achilleas Pipinellis2018-06-141-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed six broken links in README.md See merge request gitlab-org/gitlab-ce!19797
| * | | | | | | | | | | | | fixed university curr anchorsEdwin Torres2018-06-131-6/+6
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | fixed university curr anchorsEdwin Torres2018-06-131-6/+6
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | fixed university curr anchorsEdwin Torres2018-06-131-5/+5
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'rails5-fix-47805' into 'master'Rémy Coutable2018-06-142-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails5 ActionController::ParameterMissing: param is missing or the value is… Closes #47805 See merge request gitlab-org/gitlab-ce!19763
| * | | | | | | | | | | | | Rails5 ActionController::ParameterMissing: param is missing or the value is ↵Jasper Maes2018-06-132-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | empty: application_setting
* | | | | | | | | | | | | | Merge branch 'rails5-fix-47835' into 'master'Rémy Coutable2018-06-142-1/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails5 fix no implicit conversion of Hash into String Closes #47835 See merge request gitlab-org/gitlab-ce!19792
| * | | | | | | | | | | | | | Rails5 fix no implicit conversion of Hash into String. ↵Jasper Maes2018-06-132-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActionController::Parameters no longer returns an hash in Rails 5
* | | | | | | | | | | | | | | Merge branch 'rails5-fix-47804' into 'master'Rémy Coutable2018-06-142-4/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails5 fix stack level too deep Closes #47804 See merge request gitlab-org/gitlab-ce!19762
| * | | | | | | | | | | | | | Rails5 fix stack level too deepJasper Maes2018-06-132-4/+9
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'winh-new-branch-url-encode' into 'master'Mike Greiling2018-06-133-16/+107
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix branch name encoding for dropdown on issue page Closes #47472 See merge request gitlab-org/gitlab-ce!19634
| * | | | | | | | | | | | | Fix branch name encoding for dropdown on issue pageWinnie Hellmann2018-06-133-16/+107
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'jivl-remove-remaining-btn-xs-class-usage' into 'master'Annabel Gray2018-06-138-23/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the btn-xs class from the stylesheets Closes #46743 See merge request gitlab-org/gitlab-ce!19719
| * | | | | | | | | | | | Remove the btn-xs class from the stylesheetsJose2018-06-138-23/+5
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch '47830-merge-request-diff-loading-icon-not-visible' into 'master'Annabel Gray2018-06-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Merge request diff loading icon not visible" Closes #47830 and #47849 See merge request gitlab-org/gitlab-ce!19758
| * | | | | | | | | | | | Fix loading icon for mr tabsClement Ho2018-06-131-1/+1
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jivl-fix-repository-instruction-wrapping-text' into 'master'Clement Ho2018-06-131-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove card class from the git-empty containers Closes #47847 See merge request gitlab-org/gitlab-ce!19785
| * | | | | | | | | | | Remove card class from the git-empty containersJose2018-06-131-4/+4
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'unify-parallel_importer' into 'master'Stan Hu2018-06-131-0/+9
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring changes from EE for parallel_importer.rb See merge request gitlab-org/gitlab-ce!19779
| * | | | | | | | | | | Bring changes from EE for parallel_importer.rbLin Jen-Shin2018-06-141-0/+9
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'rosulk-patch-12' into 'master'Clement Ho2018-06-132-5/+11
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Flex board columns See merge request gitlab-org/gitlab-ce!19250
| * | | | | | | | | | | Flex board columnsPaul Slaughter2018-06-132-5/+11
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'bvl-missing-message-on-access-denied' into 'master'Robert Speicher2018-06-134-3/+22
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Render access denied without message Closes #47844 See merge request gitlab-org/gitlab-ce!19755
| * | | | | | | | | | | Render access denied without messageBob Van Landuyt2018-06-134-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `errors/access_denied` page should not fail to render when no message is provided. When accessing something as a sessionless user, we should also display the terms message if possible.
* | | | | | | | | | | | Merge branch 'mk/rake-task-verify-remote-files' into 'master'Stan Hu2018-06-1310-41/+147
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for verifying remote uploads, artifacts, and LFS objects in check rake tasks Closes #47139 See merge request gitlab-org/gitlab-ce!19501
| * | | | | | | | | | | Add support for verifying remote uploads, artifacts, and LFS objects in ↵Michael Kozono2018-06-1310-41/+147
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | check rake tasks