summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update default expiry information for artifactsdocs/update-artifact-expirySteve Azzopardi2019-02-071-2/+3
| | | | | | We have wrong documentation where we say that if no `expire_in` is set it will be kept forever, which is not true since we have an instance wide default expiry date.
* Merge branch 'adriel-remove-feature-flag' into 'master'Phil Hughes2019-02-077-7/+295
|\ | | | | | | | | | | | | Remove ECharts metrics dashboard feature flag Closes #55910 and #54973 See merge request gitlab-org/gitlab-ce!24653
| * Remove ECharts metrics dashboard feature flagAdriel Santiago2019-02-077-7/+295
|/
* Merge branch 'support-chunking-in-client' into 'master'Stan Hu2019-02-073-16/+99
|\ | | | | | | | | Fix code search when text is larger than max gRPC message size See merge request gitlab-org/gitlab-ce!24111
| * Modifying gitaly search files client to add chunking supportJohn Cai2019-02-063-16/+99
| | | | | | | | | | | | | | | | updates gitaly proto to 1.7.0, modifies the search files gitaly client call to use the new chunked_response flag in the rpc request, and stitch the responses together. maintains backwards compatibility with older gitaly servers.
* | Merge branch 'update-docu-repository-mirroring' into 'master'Evan Read2019-02-071-0/+8
|\ \ | |/ |/| | | | | | | | | Describe how to set up a push mirror repository at GitLab Closes #57062 See merge request gitlab-org/gitlab-ce!24834
| * Update repository_mirroring.md to correct list numberingJuergen Kosel2019-02-061-3/+3
| |
| * Use place holder for the destination host in the push mirror URLJuergen Kosel2019-02-061-1/+1
| | | | | | | | Signed-off-by: Juergen Kosel <juergen.kosel@gmx.de>
| * Apply suggested changes from code reviewJuergen Kosel2019-02-061-4/+5
| | | | | | | | | | | | Apply wording from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24834#note_138592349 Signed-off-by: Juergen Kosel <juergen.kosel@gmx.de>
| * Apply merge request suggestions regarding creation of personal access tokenJuergen Kosel2019-02-041-3/+1
| | | | | | | | | | | | | | | | | | Apply of the following suggestions: - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24834#note_137860004 - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24834#note_137860005 - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24834#note_137860006 Signed-off-by: Juergen Kosel <juergen.kosel@gmx.de>
| * Describe how to set up a push mirror repository at GitLabJuergen Kosel2019-01-311-0/+9
| | | | | | | | | | | | | | As requested in issue https://gitlab.com/gitlab-org/gitlab-ce/issues/57062 describe how to set up a push mirror repository at GitLab. Signed-off-by: Juergen Kosel <juergen.kosel@gmx.de>
* | Merge branch 'docs-add-timesync-note' into 'master'Evan Read2019-02-071-0/+6
|\ \ | | | | | | | | | | | | Documentation: add a note about time sync between GitLab and k8s cluster See merge request gitlab-org/gitlab-ce!24816
| * | Update a note about time sync between GitLab and k8s clusterdocs-add-timesync-noteAlexander Tanayno2019-02-071-3/+3
| | |
| * | Adds a note about time sync between GitLab and k8s clusterAlexander Tanayno2019-01-311-0/+6
| | |
* | | Merge branch 'patch-37' into 'master'Evan Read2019-02-071-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Added further details to the CI_PROJECT_DIR variable documentation See merge request gitlab-org/gitlab-ce!24153
| * | | Apply suggestion to doc/ci/variables/README.mdCraig Davidson2019-01-081-1/+1
| | | |
| * | | Added further details to the CI_PROJECT_DIR variable highlighting a ↵Craig Davidson2019-01-041-1/+1
| | | | | | | | | | | | | | | | dependency to the Runner builds_dir configuration option.
* | | | Merge branch 'bjk/56788_unicorn_labels' into 'master'Stan Hu2019-02-064-6/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up unicorn sampler metric labels Closes #56788 See merge request gitlab-org/gitlab-ce!24626
| * | | | Update metrics docsbjk/56788_unicorn_labelsBen Kochie2019-02-061-0/+2
| | | | | | | | | | | | | | | | | | | | Update the list of GitLab metrics to include the missing metric names.
| * | | | Clean up unicorn sampler metric labelsBen Kochie2019-02-063-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | Change `type` and `address` labels to be less generic to avoid conflicts with other systems.
* | | | | Merge branch 'gitaly-update-1.18.0' into 'master'Douglas Barbosa Alexandre2019-02-062-1/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Upgrade gitaly to 1.18.0 See merge request gitlab-org/gitlab-ce!24981
| * | | | | Upgrade gitaly to 1.18.0Andrew Newdigate2019-02-062-1/+6
|/ / / / /
* | | | | Merge branch '56938-diff-file-headers-on-compare-not-quite-right' into 'master'Fatih Acet2019-02-068-19/+40
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Diff file headers on 'Compare' not quite right" Closes #56938 See merge request gitlab-org/gitlab-ce!24783
| * | | | | Correct file-header spacing on compare pageSam Bigelow2019-02-068-19/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use special classes when is_compare, similar to is_commit. Default expectation is diff is being viewed in MR
* | | | | | Merge branch 'sh-log-project-name-with-gitaly' into 'master'Rémy Coutable2019-02-0646-129/+220
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send project name with Gitaly repository requests Closes gitaly#1394 See merge request gitlab-org/gitlab-ce!23373
| * | | | | | Rename gl_project_name -> gl_project_pathsh-log-project-name-with-gitalyStan Hu2019-02-058-30/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade gitaly-proto to 1.10.0 to have this field.
| * | | | | | Use Project#full_path instead of Project#path_with_namespaceStan Hu2019-02-051-1/+2
| | | | | | |
| * | | | | | Add more tests and comments around Wiki formattingStan Hu2019-02-053-1/+37
| | | | | | |
| * | | | | | Add convenience methods for creating project and Wiki repositoriesStan Hu2019-02-055-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it easier to access other project arguments in the future.
| * | | | | | Add comment to explain why gl_repository is blankStan Hu2019-02-051-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During creation of a repository, gl_repository may not be known because that depends on a yet-to-be assigned project ID in the database (e.g. project-1234), so for now it is blank.
| * | | | | | Rename name -> disk_path in create_repositoryStan Hu2019-02-051-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With hashed storage, the project name may not necessarily be the project name, so rename the variable to make it clear.
| * | | | | | Refactor use of Shell.import_repository for WikisStan Hu2019-02-059-19/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous behavior would pass in a list of parameters to Shell, but we can improve this by using the WikiFormatter and Project models to give us the same information.
| * | | | | | Clean up Shell.fork_repositoryStan Hu2019-02-054-33/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use project models instead of a list of parameters.
| * | | | | | Send project name with Gitaly repository requestsStan Hu2019-02-0540-90/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When hashed storage is in use, it's helpful to have the project name associated with the request. Closes https://gitlab.com/gitlab-org/gitaly/issues/1394
* | | | | | | Merge branch '44332-openid-scope-error' into 'master'Nick Thomas2019-02-066-6/+79
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #44332 - Add support for profile and email Closes #44332 See merge request gitlab-org/gitlab-ce!24335
| * | | | | | | Fix #44332 - Add support for profile and emailGotenXiao2019-02-066-6/+79
|/ / / / / / /
* | | | | | | Merge branch '55199-error-tracking-controller' into 'master'Sean McGivern2019-02-064-4/+158
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add list_projects endpoint to error tracking See merge request gitlab-org/gitlab-ce!24700
| * | | | | | | Add list_projects endpoint to error trackingReuben Pereira2019-02-064-4/+158
|/ / / / / / /
* | | | | | | Merge branch 'docs/go-standards' into 'master'11-8-stable-prepare-rc1Marcia Ramos2019-02-063-0/+221
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Go guidelines to developer docs Closes #54494 See merge request gitlab-org/gitlab-ce!24661
| * | | | | | Add Go guidelines to developer docsPhilippe Lafoucrière2019-02-063-0/+221
|/ / / / / /
* | | | | | Merge branch 'fix-stable-branch-prefix' into 'master'Marin Jankovski2019-02-063-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix incorrect stable branch name for templates See merge request gitlab-org/gitlab-ce!24973
| * | | | | | Fix incorrect stable branch name for templatesfix-stable-branch-prefixYorick Peterse2019-02-063-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24962 the stable branches were incorrectly changed to `stable-X-Y`. This commit fixes this so we correctly use `X-Y-stable`.
* | | | | | | Merge branch '55199-list-projects-service' into 'master'Sean McGivern2019-02-062-0/+193
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add service to get sentry projects list See merge request gitlab-org/gitlab-ce!24681
| * | | | | | | Add service to get sentry projects listReuben Pereira2019-02-062-0/+193
|/ / / / / / /
* | | | | | | Merge branch 'bvl-fix-race-condition-creating-signature' into 'master'Rémy Coutable2019-02-066-5/+70
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid race conditions when creating GpgSignature Closes #57304 See merge request gitlab-org/gitlab-ce!24939
| * | | | | | Avoid race conditions when creating GpgSignatureBob Van Landuyt2019-02-066-5/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids race conditions when creating GpgSignature.
* | | | | | | Merge branch '7048_add_preference_ui_for_group_overview_be-ce' into 'master'Grzegorz Bizon2019-02-063-8/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add UI for "Group Overview default" preference in User Settings See merge request gitlab-org/gitlab-ce!24761
| * | | | | | | Add render_if_exists for sidebar and preferencesVictor Zagorodny2019-02-052-1/+4
| | | | | | | |
| * | | | | | | Make parameters list more easily changeableGilbert Roulot2019-02-051-7/+5
| | | | | | | |
* | | | | | | | Merge branch 'sh-bump-supported-ruby-versions-docs' into 'master'Dmitriy Zaporozhets2019-02-061-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump required Ruby version in install doc Closes #57350 See merge request gitlab-org/gitlab-ce!24966
View Lorry Controller Status