Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '42934-search-api-fix' into 'master'10-5-stable-prepare-rc6 | Sean McGivern | 2018-02-14 | 2 | -3/+7 |
| | | | | | | | Add information about projects when searching in wiki_blobs, blobs, commits scopes Closes #42934 See merge request gitlab-org/gitlab-ce!17095 | ||||
* | Merge branch 'whitelisting' into 'master' | Yorick Peterse | 2018-02-13 | 1 | -3/+2 |
| | | | | | Remove Sentry reporting for query limiting See merge request gitlab-org/gitlab-ce!17092 | ||||
* | Merge branch 'docs-for-commits-linking-to-mrs' into 'master' | Sean McGivern | 2018-02-12 | 1 | -1/+14 |
| | | | | | Add docs for MR link in commit page See merge request gitlab-org/gitlab-ce!16994 | ||||
* | Merge branch 'bvl-fix-concurrent-fork-network-migrations' into 'master' | Yorick Peterse | 2018-02-12 | 1 | -0/+12 |
| | | | | | | | Fix concurrent fork network migrations Closes #41487 See merge request gitlab-org/gitlab-ce!16988 | ||||
* | Merge branch 'issues-in-subgroups' into 'master' | Sean McGivern | 2018-02-12 | 2 | -6/+4 |
| | | | | | Issues and merge requests in subgroups docs See merge request gitlab-org/gitlab-ce!16978 | ||||
* | Merge branch 'update-docs-labels-ce' into 'master' | Marcia Ramos | 2018-02-12 | 25 | -119/+70 |
| | | | | | Update docs labels CE See merge request gitlab-org/gitlab-ce!16974 | ||||
* | Merge branch 'bvl-pot-merge-conflicts-docs' into 'master' | Achilleas Pipinellis | 2018-02-12 | 1 | -0/+3 |
| | | | | | Add a note about merge conflicts in `gitlab.pot` See merge request gitlab-org/gitlab-ce!16971 | ||||
* | Merge branch '10-5-ce-update-guides' into 'master' | Marin Jankovski | 2018-02-08 | 1 | -0/+361 |
| | | | | | 10.5 Create the "Update" guides See merge request gitlab-org/gitlab-ce!16996 | ||||
* | Merge branch '10-5-update-source-install-guide' into 'master' | Marin Jankovski | 2018-02-08 | 1 | -2/+2 |
| | | | | | 10.5 Update the "Installation from Source" guide See merge request gitlab-org/gitlab-ce!16995 | ||||
* | Resolve "New design for user deletion confirmation in admin area" | Shah El-Rahman | 2018-02-08 | 1 | -1/+1 |
| | |||||
* | Add instructions for source installation to mysql_to_postgresql.md | Dark Dragon | 2018-02-07 | 1 | -124/+140 |
| | |||||
* | Merge branch '34416-issue-i18n' into 'master' | Sean McGivern | 2018-02-07 | 1 | -0/+2 |
|\ | | | | | | | | | | | | | Translate issuable sidebar Closes #34416 See merge request gitlab-org/gitlab-ce!16663 | ||||
| * | Translate issuable sidebar34416-issue-i18n | Jarka Kadlecová | 2018-02-07 | 1 | -0/+2 |
| | | |||||
* | | Merge branch 'rd-35856-backport-lfs-file-locking-api' into 'master' | Sean McGivern | 2018-02-07 | 1 | -0/+66 |
|\ \ | | | | | | | | | | | | | | | | | | | Backport LFS File Locking API Closes #35856 See merge request gitlab-org/gitlab-ce!16935 | ||||
| * | | Backport of LFS File Locking APIrd-35856-backport-lfs-file-locking-api | Rubén Dávila | 2018-02-07 | 1 | -0/+66 |
| | | | |||||
* | | | Merge branch 'docs/add-retrieving-external-ip' into 'master' | Marcia Ramos | 2018-02-07 | 2 | -0/+40 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add how to get the external ip of a cluster Closes #42691 See merge request gitlab-org/gitlab-ce!16874 | ||||
| * | | | Add how to get the external ip of a cluster | Fabio Busatto | 2018-02-07 | 2 | -0/+40 |
| |/ / | |||||
* | | | Merge branch '41763-search-api' into 'master' | Sean McGivern | 2018-02-07 | 1 | -0/+797 |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | Search API Closes #41763 See merge request gitlab-org/gitlab-ce!16878 | ||||
| * | | Small code/doc changes41763-search-api | Jarka Kadlecová | 2018-02-07 | 1 | -4/+4 |
| | | | |||||
| * | | port ee changes | Jarka Kadlecová | 2018-02-07 | 1 | -3/+7 |
| | | | |||||
| * | | Support search in API | Jarka Kadlecová | 2018-02-06 | 1 | -0/+793 |
| | | | |||||
* | | | Merge branch '41601-document-pages-static-gzip' into 'master' | Achilleas Pipinellis | 2018-02-07 | 1 | -0/+41 |
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | Resolve "I wonder how to leverage browser caching of my Gitlab pages?" Closes #15037 See merge request gitlab-org/gitlab-ce!16829 | ||||
| * | | Add documentation about serving pre-compressed assets in GitLab Pages | Nick Thomas | 2018-01-31 | 1 | -0/+41 |
| | | | |||||
* | | | Merge branch 'ce-39118-dynamic-pipeline-variables-fe' into 'master' | Kamil Trzciński | 2018-02-07 | 1 | -0/+0 |
|\ \ \ | | | | | | | | | | | | | | | | | Dynamic CI secret variables -- CE backport See merge request gitlab-org/gitlab-ce!16842 | ||||
| * | | | Use dynamic variable list in scheduled pipelines and group/project CI secret ↵ | Eric Eastwood | 2018-02-05 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | variables See https://gitlab.com/gitlab-org/gitlab-ce/issues/39118 Conflicts: app/views/ci/variables/_form.html.haml app/views/ci/variables/_table.html.haml ee/app/views/ci/variables/_environment_scope.html.haml spec/javascripts/ci_variable_list/ci_variable_list_ee_spec.js spec/javascripts/fixtures/projects.rb | ||||
* | | | | Merge branch 'docs-replace-product-names' into 'master' | Achilleas Pipinellis | 2018-02-07 | 22 | -72/+81 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Docs: replace product names See merge request gitlab-org/gitlab-ce!16867 | ||||
| * | | | | Change docs links to https://about.gitlab.com/products/ | Achilleas Pipinellis | 2018-02-07 | 16 | -21/+21 |
| | | | | | |||||
| * | | | | search and replace "Enterprise Edition Ultimate" => "Ultimate" | Marcia Ramos | 2018-02-07 | 5 | -9/+9 |
| | | | | | |||||
| * | | | | search and replace "Enterprise Edition Premium" => "Premium" | Marcia Ramos | 2018-02-01 | 6 | -8/+8 |
| | | | | | |||||
| * | | | | search and replace "Enterprise Edition Starter" => "Starter" | Marcia Ramos | 2018-02-01 | 6 | -13/+13 |
| | | | | | |||||
| * | | | | search and replace EES, EEP, EEU with Starter, Premium, Ultimate | Marcia Ramos | 2018-02-01 | 10 | -30/+39 |
| | | | | | |||||
* | | | | | Merge branch 'master' into '26388-push-to-create-a-new-project' | Douwe Maan | 2018-02-06 | 4 | -13/+19 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | # Conflicts: # lib/gitlab/path_regex.rb | ||||
| * \ \ \ \ | Merge branch 'update-helm-chart-docs' into 'master' | Marcia Ramos | 2018-02-06 | 2 | -11/+12 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify Helm chart plans See merge request gitlab-org/gitlab-ce!16822 | ||||
| | * | | | | | Fix linksupdate-helm-chart-docs | Joshua Lambert | 2018-02-06 | 1 | -2/+2 |
| | | | | | | | |||||
| | * | | | | | Typos | Joshua Lambert | 2018-02-06 | 1 | -2/+2 |
| | | | | | | | |||||
| | * | | | | | Clarify that gitlab-omnibus is the best way to install gitlab | Joshua Lambert | 2018-02-06 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Minor cleanup 2.0 | Joshua Lambert | 2018-01-31 | 2 | -2/+2 |
| | | | | | | | |||||
| | * | | | | | Minor cleanup | Joshua Lambert | 2018-01-31 | 2 | -2/+2 |
| | | | | | | | |||||
| | * | | | | | Updates to helm chart docs | Joshua Lambert | 2018-01-31 | 2 | -11/+12 |
| | | | | | | | |||||
| * | | | | | | Merge branch '42669-allow-order_by-users-in-gitlab-api' into 'master' | Douwe Maan | 2018-02-06 | 1 | -0/+5 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add sorting options for /users API Closes #42669 See merge request gitlab-org/gitlab-ce!16945 | ||||
| | * | | | | | | Add sorting options for /users API (admin only)42669-allow-order_by-users-in-gitlab-api | Dmitriy Zaporozhets | 2018-02-06 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | | | | | update doc | Shinya Maeda | 2018-02-06 | 1 | -2/+2 |
| |/ / / / / / | |||||
* | | | | | | | Moves project creationg to git access check for git push | Tiago Botelho | 2018-02-06 | 1 | -10/+7 |
| | | | | | | | |||||
* | | | | | | | Adds documentation for the feature | Tiago Botelho | 2018-02-06 | 1 | -0/+38 |
|/ / / / / / | |||||
* | | | | | | 31885 - Ability to transfer a single group to another group | Mayra Cabrera | 2018-02-06 | 2 | -2/+15 |
| | | | | | | |||||
* | | | | | | Added ldap config setting to lower case usernames | Francisco Javier López | 2018-02-05 | 1 | -0/+39 |
| | | | | | | |||||
* | | | | | | Merge branch '41672-emphasize-gke-cluster-to-new-users' into 'master' | Clement Ho | 2018-02-05 | 3 | -0/+17 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add feature highlight blue dot to GKE "Clusters" sidebar item Closes #41672 See merge request gitlab-org/gitlab-ce!16379 | ||||
| * | | | | | Restore feature_highlight code41672-emphasize-gke-cluster-to-new-users | Eric Eastwood | 2018-02-05 | 3 | -0/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From https://gitlab.com/gitlab-org/gitlab-ce/issues/36760 Was reverted in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14373 | ||||
* | | | | | | Allow moving wiki pages from the UI | Francisco Javier López | 2018-02-05 | 3 | -0/+12 |
|/ / / / / | |||||
* | | | | | Merge branch '42684-set-up-ci-set-up-ci-cd' into 'master' | Filipa Lacerda | 2018-02-05 | 3 | -6/+6 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | Resolve "`Set up CI` => `Set up CI/CD`" Closes #42684 See merge request gitlab-org/gitlab-ce!16870 |