summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | formatting fixesJose Ivan Vargas2018-04-062-25/+15
| | | | | | | | | |
| * | | | | | | | | Add summary statistics prometheus dashboardJose Ivan Vargas2018-04-0610-299/+421
|/ / / / / / / / /
* | | | | | | | | Merge branch 'tz-ide-blob-image' into 'master'Phil Hughes2018-04-0612-28/+246
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Web IDE blob image + default fallback See merge request gitlab-org/gitlab-ce!18186
| * | | | | | | | | Web IDE blob image + default fallbackTim Zallmann2018-04-0612-28/+246
|/ / / / / / / / /
* | | | | | | | | Merge branch ↵Sean McGivern2018-04-0628-85/+206
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '42090-create-cop-for-factorybot-methods-used-in-migration-specs' into 'master' Resolve "Create cop for FactoryBot methods used in migration specs" Closes #42090 See merge request gitlab-org/gitlab-ce!18108
| * | | | | | | | | Ignore current RSpec/FactoriesInMigrationSpecs offensesRémy Coutable2018-04-0622-84/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | Introduce a new FactoriesInMigrationSpecs copRémy Coutable2018-04-066-1/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | Merge branch '17939-osw-patch-support-gfm' into 'master'Sean McGivern2018-04-064-1/+44
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for patch link extension for commit links on GFM Closes #17939 See merge request gitlab-org/gitlab-ce!18229
| * | | | | | | | | | Add support for patch link extension for commit links on GFMOswaldo Ferreira2018-04-064-1/+44
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'fix-500-error-when-mr-ref-is-not-yet-fetched' into 'master'Rémy Coutable2018-04-063-1/+23
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 500 error when MR from fork has conflicts but worker has not run See merge request gitlab-org/gitlab-ce!18226
| * | | | | | | | | | Fix 500 error when MR from fork has conflicts but worker has not runfix-500-error-when-mr-ref-is-not-yet-fetchedSean McGivern2018-04-063-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the ref hasn't been fetched into the target repository yet, this will fail with a Rugged::ReferencError (assuming we're not using Gitaly). We should handle this in the same way as a missing ref.
* | | | | | | | | | | Merge branch 'sh-add-cleanup-rpc-gitaly' into 'master'Sean McGivern2018-04-069-30/+114
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatically cleanup stale worktrees and lock files upon a push Closes #44115 See merge request gitlab-org/gitlab-ce!18095
| * | | | | | | | | | | Automatically cleanup stale worktrees and lock files upon a pushStan Hu2018-04-069-30/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git 2.16 will fail badly if there are stale worktrees. Closes #44115
* | | | | | | | | | | | Merge branch 'fl-fix-annoying-actions' into 'master'Phil Hughes2018-04-069-223/+289
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stop redirecting the page in graph main actions See merge request gitlab-org/gitlab-ce!18185
| * | | | | | | | | | | Stop redirecting the page in graph main actionsFilipa Lacerda2018-04-069-223/+289
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'fj-41900-import-endpoint-with-overwrite-support' into 'master'Douwe Maan2018-04-0637-13/+1439
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend API for importing a project export with overwrite support Closes #41900 See merge request gitlab-org/gitlab-ce!17883
| * | | | | | | | | | Extend API for importing a project export with overwrite supportFrancisco Javier López2018-04-0637-13/+1439
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'jramsay-38830-tarball' into 'master'Douwe Maan2018-04-0615-38/+98
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add alternative archive route Closes #38830 See merge request gitlab-org/gitlab-ce!17225
| * | | | | | | | | | Add new repository archive routeJames Ramsay2018-04-0611-29/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Repository archives are always named `<project>-<ref>-<sha>` even if the ref is a commit. A consequence of always including the sha even for tags is that packaging a release is more difficult because both the ref and sha must be known by the packager. - add `<project>/-/archive/<ref>/<filename>.<format>` route using the `-` separator to prevent namespace collisions. If the filename is `<project>-<ref>` or the ref is a sha, the sha will be omitted, otherwise the default filename will be used. - deprecate previous archive route `repository/<ref>/archive`
| * | | | | | | | | | Add option to suppress archive commit shaJames Ramsay2018-04-047-14/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Repository archives are always named `<project>-<ref>-<sha>` even if the ref is a commit. A consequence of always including the sha even for tags is that packaging a release is more difficult because both the ref and sha must be known by the packager. - add append_sha option (defaults true) to provide a method for toggling this feature. Support added to GitLab Workhorse by gitlab-org/gitlab-workhorse!232
* | | | | | | | | | | Merge branch ↵Douwe Maan2018-04-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'blackst0ne-rails5-update-skip-before-action-in-authenticates-with-two-factor-concern' into 'master' [Rails5] Add `raise: false` to skip_before_action in authenticates_with_two_factor.rb See merge request gitlab-org/gitlab-ce!18221
| * | | | | | | | | | | [Rails5] Add `raise: false` to skip_before_action in ↵blackst0ne-rails5-update-skip-before-action-in-authenticates-with-two-factor-concernblackst0ne2018-04-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | authenticates_with_two_factor.rb Rails 5.0 raises `ArgumentErrror` if an unrecognised callback is skipped. https://github.com/rails/rails/commit/8b88df94ebda2e829782f514ff51caeaf5e694dd This commit adds `raise: false` to the filter.
* | | | | | | | | | | | Merge branch 'gitaly-0.94.0' into 'master'Sean McGivern2018-04-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use gitaly 0.94.0 See merge request gitlab-org/gitlab-ce!18225
| * | | | | | | | | | | | Use gitaly 0.94.0gitaly-0.94.0Jacob Vosmaer2018-04-061-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'docs/gb/improve-pipeline-variables-expressions-docs' into 'master'Grzegorz Bizon2018-04-063-15/+62
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve docs about pipeline variables expressions Closes #44786 See merge request gitlab-org/gitlab-ce!18195
| * | | | | | | | | | | | | Document unsupported variables for dynamic environmentsdocs/gb/improve-pipeline-variables-expressions-docsGrzegorz Bizon2018-04-062-3/+16
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Improve docs about pipeline variables expressionsGrzegorz Bizon2018-04-052-12/+46
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'fix/gb/fix-deployment-platform-for-environment' into 'master'Kamil Trzciński2018-04-063-2/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix environment deployment platform filter method See merge request gitlab-org/gitlab-ce!18216
| * | | | | | | | | | | | | | Fix environment deployment platform filter methodGrzegorz Bizon2018-04-063-2/+28
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'remove-pages-tar-support' into 'master'Kamil Trzciński2018-04-063-67/+56
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove support for legacy tar.gz pages artifacts See merge request gitlab-org/gitlab-ce!18090
| * | | | | | | | | | | | | | | ChangelogJacob Vosmaer2018-04-061-0/+5
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Remove support for legacy tar.gz pages artifactsJacob Vosmaer2018-04-032-67/+51
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch ↵Tim Zallmann2018-04-065-45/+70
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '42448-change-commit-row-actions-and-sha-design-for-project-commit-list' into 'master' Implement a new SHA partial for commit lists Closes #42448 See merge request gitlab-org/gitlab-ce!17406
| * | | | | | | | | | | | | | | | Implement a new SHA partial for commit listsShah El-Rahman2018-04-065-45/+70
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch '43246-checkfilter' into 'master'Sean McGivern2018-04-0621-257/+315
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Show a message when loading the issues / merge requests dashboard without filters" Closes #43246 See merge request gitlab-org/gitlab-ce!17961
| * | | | | | | | | | | | | | | | Fix breadcrumb linksWinnie Hellmann2018-04-063-5/+5
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Use template strings in search_autocomplete_spec.jsWinnie Hellmann2018-04-051-104/+110
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Increase top margin of illustrationWinnie Hellmann2018-04-041-1/+1
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Resolve conflicts in issues_filter_spec.rbWinnie Hellmann2018-04-031-7/+1
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Fixed dashboard filtering testsJan Provaznik2018-04-038-101/+137
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Display illustration and message if no filter is selectedWinnie Hellmann2018-04-035-5/+22
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Check if at least one filter is set on dashboardJan Provaznik2018-04-0312-48/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When listing issues and merge requests on dasboard page, make sure that at least one filter is enabled. User's id is used in search autocomplete widget instead of username, which allows presetting user in filter dropdowns. Related to #43246
* | | | | | | | | | | | | | | | | Merge branch 'dz-add-plugins-note' into 'master'Dmitriy Zaporozhets2018-04-062-28/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a note to plugins.md about contributing back to GitLab See merge request gitlab-org/gitlab-ce!18215
| * | | | | | | | | | | | | | | | Copyedit plugins docsAchilleas Pipinellis2018-04-062-31/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | | | | | | Add note about contributing back to GitLab to plugins.mdDmitriy Zaporozhets2018-04-061-0/+4
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'update-gitlab-com-settings-docs' into 'master'Achilleas Pipinellis2018-04-061-17/+89
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update GitLab.com settings with current state See merge request gitlab-org/gitlab-ce!18209
| * | | | | | | | | | | | | | | | Update GitLab.com settings with current stateupdate-gitlab-com-settings-docsTomasz Maczukin2018-04-051-17/+89
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'ab-37462-cache-personal-projects-count' into 'master'Yorick Peterse2018-04-069-8/+58
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cache personal projects count. Closes #37462 See merge request gitlab-org/gitlab-ce!18197
| * | | | | | | | | | | | | | | | | Remove unused method.Andreas Brandl2018-04-061-6/+0
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Cache personal projects count.Andreas Brandl2018-04-069-8/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #37462.