summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge branch 'clear-up-background-type-change-docs' into 'master'Yorick Peterse2018-06-201-0/+47
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add docs for the cleanup step of a background column type change See merge request gitlab-org/gitlab-ce!20020
| * | | | | | | | | | | Add docs for the cleanup step of a background column type changeclear-up-background-type-change-docsSean McGivern2018-06-191-0/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A background column type change needs a cleanup step, like any background migration. We should call that out explicitly in the documentation.
* | | | | | | | | | | | Merge branch 'rails5-fix-48141' into 'master'Rémy Coutable2018-06-202-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails5 fix expected: 0 times with any arguments received: 1 time with… Closes #48141 See merge request gitlab-org/gitlab-ce!20018
| * | | | | | | | | | | | Rails5 fix expected: 0 times with any arguments received: 1 time with ↵Jasper Maes2018-06-202-1/+7
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | arguments: DashboardController
* | | | | | | | | | | | Merge branch 'go-1.10-source-installs' into 'master'Nick Thomas2018-06-202-11/+11
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Go 1.10 for source installations Closes gitaly#1231 See merge request gitlab-org/gitlab-ce!19989
| * | | | | | | | | | | | Use Go 1.10 for source installationsgo-1.10-source-installsJacob Vosmaer2018-06-192-11/+11
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'use-backup-custom-hooks-gitaly' into 'master'Douwe Maan2018-06-207-70/+119
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use gitaly for backup rake task See merge request gitlab-org/gitlab-ce!19742
| * | | | | | | | | | | | Move backup custom hooks up a leveluse-backup-custom-hooks-gitalyAhmad Hassan2018-06-201-4/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | Output done for wiki and repoAhmad Hassan2018-06-191-14/+3
| | | | | | | | | | | | |
| * | | | | | | | | | | | Migrate repo backup to gitalyAhmad Hassan2018-06-157-60/+122
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'rails5-fix-48104' into 'master'Rémy Coutable2018-06-202-1/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails5 fix expected: 1 time with arguments: (97, anything, {"squash"=>false}) received: 0 times Closes #48104 See merge request gitlab-org/gitlab-ce!20004
| * | | | | | | | | | | | | Rails5 fix expected: 1 time with arguments: (97, anything, ↵Jasper Maes2018-06-192-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | {"squash"=>false}) received: 0 times
* | | | | | | | | | | | | | Merge branch 'rails5-fix-pages-controller' into 'master'Rémy Coutable2018-06-202-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails5 fix Projects::PagesController spec See merge request gitlab-org/gitlab-ce!20007
| * | | | | | | | | | | | | | Rails5 fix Projects::PagesController specJasper Maes2018-06-192-2/+7
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'gitaly-disk-access-5' into 'master'Douwe Maan2018-06-206-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More gitaly disk access blocks See merge request gitlab-org/gitlab-ce!19892
| * | | | | | | | | | | | | | More gitaly disk access blocksJacob Vosmaer (GitLab)2018-06-206-1/+9
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'ce-5024-filename-search' into 'master'Sean McGivern2018-06-208-6/+186
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement filtering by filename on code search Closes #43627 See merge request gitlab-org/gitlab-ce!19509
| * | | | | | | | | | | | | | Implement filtering by filename on code searchce-5024-filename-searchMario de la Ossa2018-06-198-6/+186
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch '48105-git-version-detection-using-gitaly' into 'master'Sean McGivern2018-06-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move git version detection to gitaly for usage ping data Closes #48105 and charts/gitlab#530 See merge request gitlab-org/gitlab-ce!19993
| * | | | | | | | | | | | | | | Use gitaly to figure out git version for usage ping48105-git-version-detection-using-gitalyBalasankar "Balu" C2018-06-191-1/+1
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch '47959-rails5-redis-timewithzone' into 'master'Sean McGivern2018-06-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "[Rails5] expected "2018-05-07 13:53:08 UTC" to be an instance of ActiveSupport::TimeWithZone" Closes #47959 See merge request gitlab-org/gitlab-ce!20000
| * | | | | | | | | | | | | | | Fix redis_cacheable deserialization47959-rails5-redis-timewithzoneMario de la Ossa2018-06-191-1/+1
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'patch-28' into 'master'Rémy Coutable2018-06-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Point out the specific anchor inside the document See merge request gitlab-org/gitlab-ce!19998
| * | | | | | | | | | | | | | | | Point out the specific anchor inside the documentMatthieu Fronton2018-06-191-1/+1
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'zj-lfs-pointers' into 'master'Douwe Maan2018-06-202-94/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LFS changes are detected by Gitaly Closes gitaly#935 See merge request gitlab-org/gitlab-ce!19995
| * | | | | | | | | | | | | | | | | LFS changes are detected by Gitalyzj-lfs-pointersZeger-Jan van de Weg2018-06-192-94/+7
| |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitaly/issues/935
* | | | | | | | | | | | | | | | | Merge branch 'text-expander-icon-update' into 'master'Tim Zallmann2018-06-206-7/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated horizontal ellipsis icon for text-expander See merge request gitlab-org/gitlab-ce!18793
| * | | | | | | | | | | | | | | | Updated horizontal ellipsis icon for text-expanderConstance Okoghenun2018-06-206-7/+28
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'docs/correct-curl-syntax' into 'master'Stan Hu2018-06-201-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct cURL syntax See merge request gitlab-org/gitlab-ce!20014
| * | | | | | | | | | | | | | | Correct cURL syntaxHenrik Hüttemann2018-06-201-4/+4
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch '48025-branch-name-status-color-is-not-correct-anymore' into ↵Tim Zallmann2018-06-193-5/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Branch name status color is not correct anymore" Closes #48025 See merge request gitlab-org/gitlab-ce!19973
| * | | | | | | | | | | | | | Resolve "Branch name status color is not correct anymore"Clement Ho2018-06-193-5/+9
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'leipert-proper-eslint-report' into 'master'Mike Greiling2018-06-192-3/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use eslint cli option instead of sed See merge request gitlab-org/gitlab-ce!19939
| * | | | | | | | | | | | | | use eslint config parameter instead of sedleipert-proper-eslint-reportLukas Eipert2018-06-162-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eslint has the possibility to ignore inline config `no-inline-config`, so we should use that
* | | | | | | | | | | | | | | Merge branch '46250-remove-commented-from-comment-system-notes' into 'master'Mike Greiling2018-06-193-4/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Remove “commented” from comment system notes" Closes #46250 See merge request gitlab-org/gitlab-ce!19709
| * | | | | | | | | | | | | | | Resolve "Remove “commented” from comment system notes"Constance Okoghenun2018-06-193-4/+0
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'jl-update-jupyterhub-docs' into 'master'Marcia Ramos2018-06-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update JupyterHub docs with additional details See merge request gitlab-org/gitlab-ce!19981
| * | | | | | | | | | | | | | Clarify jupyterhub docs to indicate OAuth is enabled and HTTPS is not yet ↵jl-update-jupyterhub-docsJoshua Lambert2018-06-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | supported.
* | | | | | | | | | | | | | | Merge branch 'qa-improve-main-login-page' into 'master'bjk/gh_importer_labelsRobert Speicher2018-06-192-31/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make Page::Main::Login#sign_in_using_credentials gracefully bail out when user is already logged-in See merge request gitlab-org/gitlab-ce!19964
| * | | | | | | | | | | | | | | Make Page::Main::Login#sign_in_using_credentials gracefully bail out when ↵qa-improve-main-login-pageRémy Coutable2018-06-192-31/+37
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | user is already logged-in Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | | Merge branch 'jivl-fix-cancel-auto-merge-button-height' into 'master'Clement Ho2018-06-191-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix cancel automatic merge button height Closes #48052 See merge request gitlab-org/gitlab-ce!19977
| * | | | | | | | | | | | | | | Fix cancel automatic merge button heightJose2018-06-191-0/+1
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'dm-branch-api-can-push' into 'master'Robert Speicher2018-06-194-4/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose whether current user can push into a branch on branches API See merge request gitlab-org/gitlab-ce!19958
| * | | | | | | | | | | | | | | | Expose whether current user can push into a branch on branches APIdm-branch-api-can-pushDouwe Maan2018-06-184-4/+19
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'jivl-fix-focused-links-missing-underline' into 'master'Tim Zallmann2018-06-192-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix missing underline on focus states for anchor tags Closes #47748 See merge request gitlab-org/gitlab-ce!19873
| * | | | | | | | | | | | | | | | | Fix missing underline on focus states for anchor tagsjivl-fix-focused-links-missing-underlineJose2018-06-152-0/+6
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'fix-flakey-groups-filter-list-specs' into 'master'Rémy Coutable2018-06-192-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix flakey time-senstive group filter specs See merge request gitlab-org/gitlab-ce!19880
| * | | | | | | | | | | | | | | | | Fix flakey time-senstive group filter specsfix-flakey-groups-filter-list-specsEric Eastwood2018-06-142-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This passed previously because the filtered group search is debounced by 0.5s. The test cleared the input, entered `group1`, cleared the input, entered nothing, and the all of groups are still listed because of the 0.5s debounce hasn't triggered and the test passes before anything is actually filtered. Even if we assert that the list is filtered before clearing the input, the test still fails because the nature of the `fill_in 'filter', with: ""` method is that ["if you're setting the value to "", no keys are ever actually sent, hence no [`input`] event"](https://github.com/teamcapybara/capybara/issues/203#issuecomment-557281) and we never filter back to everything in the list. So the solution is two-fold, add in the assertions that the list is actually filtered after each step. Then use a method that fills the input with proper events fired.
* | | | | | | | | | | | | | | | | | Merge branch '48047-project-integrations' into 'master'Clement Ho2018-06-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Frontend issues in integrations page" See merge request gitlab-org/gitlab-ce!19970
| * | | | | | | | | | | | | | | | | Fix integration table widths48047-project-integrationsAnnabel Dunstone Gray2018-06-181-1/+1
| | | | | | | | | | | | | | | | | |