Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Include CI Variable Key in its uniqueness validation error message43275-improve-variables-validation-message | Matija Čupić | 2018-02-23 | 4 | -4/+10 |
| | |||||
* | Add CHANGELOG entry | Matija Čupić | 2018-02-22 | 1 | -0/+5 |
| | |||||
* | Skip variables duplicates validator if variable is already a duplicate | Matija Čupić | 2018-02-22 | 3 | -1/+4 |
| | |||||
* | Condition associated variable validation in Project and Group | Matija Čupić | 2018-02-22 | 2 | -2/+3 |
| | |||||
* | Do not validate individual Variables when saving Project/Group | Matija Čupić | 2018-02-22 | 2 | -2/+2 |
| | |||||
* | Merge branch '42431-add-auto-devops-and-clusters-button-to-projects' into ↵ | Rémy Coutable | 2018-02-22 | 28 | -449/+1156 |
|\ | | | | | | | | | | | | | | | | | 'master' Add a button on the project page to set up a Kubernetes cluster and enable Auto DevOps Closes #42431 See merge request gitlab-org/gitlab-ce!16900 | ||||
| * | Unify use of can_current_user_push_code Presenter42431-add-auto-devops-and-clusters-button-to-projects | Oswaldo Ferreira | 2018-02-22 | 2 | -2/+2 |
| | | |||||
| * | Use select instead reject | Oswaldo Ferreira | 2018-02-22 | 1 | -2/+2 |
| | | |||||
| * | Move can_current_user_push_to_branch to Presenter | Oswaldo Ferreira | 2018-02-22 | 3 | -8/+10 |
| | | |||||
| * | Simplify project check with duck typing | Oswaldo Ferreira | 2018-02-22 | 1 | -1/+1 |
| | | |||||
| * | Move project presenter instance creation to controller | Oswaldo Ferreira | 2018-02-22 | 3 | -2/+2 |
| | | |||||
| * | Update enabled Kubernetes cluster button to "Kubernetes configured" | Eric Eastwood | 2018-02-22 | 3 | -6/+6 |
| | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/16900#note_60175507 | ||||
| * | Merge branch 'master' into 42431-add-auto-devops-and-clusters-button-to-projects | Eric Eastwood | 2018-02-22 | 895 | -10376/+10646 |
| |\ | |||||
| * | | Remove indent and reduce bloat with link_to_if | Eric Eastwood | 2018-02-22 | 1 | -10/+6 |
| | | | | | | | | | | | | | | | | | | | | | See - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/16900#note_60163789 - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/16900#note_60164324 | ||||
| * | | Fix enabled filtering on stat anchors | Eric Eastwood | 2018-02-21 | 1 | -4/+4 |
| | | | |||||
| * | | Link "add a Kubernetes cluster" to new cluster page | Eric Eastwood | 2018-02-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/16900#note_59936315 | ||||
| * | | Make ruby-lint happy | Oswaldo Ferreira | 2018-02-21 | 1 | -2/+2 |
| | | | |||||
| * | | Use method call instead hash accesses | Oswaldo Ferreira | 2018-02-21 | 1 | -4/+4 |
| | | | |||||
| * | | Memoize method which is called multiple times on presenter | Oswaldo Ferreira | 2018-02-20 | 1 | -4/+7 |
| | | | |||||
| * | | Add unit tests to presenter methods | Oswaldo Ferreira | 2018-02-20 | 2 | -33/+315 |
| | | | |||||
| * | | Use OpenStruct instead Hash for statistics buttons | Oswaldo Ferreira | 2018-02-20 | 2 | -100/+62 |
| | | | |||||
| * | | Improve methods naming | Oswaldo Ferreira | 2018-02-20 | 3 | -9/+9 |
| | | | |||||
| * | | Move default_project_view tests to presenter | Oswaldo Ferreira | 2018-02-20 | 4 | -102/+97 |
| | | | |||||
| * | | Move button list logic to project presenter | Oswaldo Ferreira | 2018-02-20 | 15 | -381/+416 |
| | | | |||||
| * | | Switch back to using a single partial | Eric Eastwood | 2018-02-20 | 2 | -8/+8 |
| | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/16900#note_59334967 https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/16900#note_59714883 | ||||
| * | | Add Auto DevOps and Kubernetes cluster button to project page | Eric Eastwood | 2018-02-16 | 16 | -195/+627 |
| | | | |||||
* | | | Merge branch 'ui-bundle-tag-remove' into 'master' | Clement Ho | 2018-02-22 | 1 | -2/+0 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Remove bundle tag for ui help Closes #41341 See merge request gitlab-org/gitlab-ce!17301 | ||||
| * | | | Remove bundle tag for ui help | Jacob Schatz | 2018-02-22 | 1 | -2/+0 |
| | | | | |||||
* | | | | Merge branch '43373-fix-cache-index-appending' into 'master' | Kamil Trzciński | 2018-02-22 | 3 | -2/+7 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "cache key for CI stopped working" Closes #43373 See merge request gitlab-org/gitlab-ce!17260 | ||||
| * | | | | Add CHANGELOG entry43373-fix-cache-index-appending | Tomasz Maczukin | 2018-02-21 | 1 | -0/+5 |
| | | | | | |||||
| * | | | | Change cache index delimiter to character not recognizable as variable part | Tomasz Maczukin | 2018-02-21 | 2 | -2/+2 |
| | | | | | |||||
* | | | | | Update CHANGELOG.md for 10.5.1 | Ian Baum | 2018-02-22 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | [ci skip] | ||||
* | | | | | Merge branch 'dispatcher-import-batch-3' into 'master' | Jacob Schatz | 2018-02-22 | 22 | -131/+32 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Use dynamic imports in dispatcher (Part 3) See merge request gitlab-org/gitlab-ce!17277 | ||||
| * | | | | | Use dynamic imports in dispatcher (Part 3) | Clement Ho | 2018-02-22 | 22 | -131/+32 |
|/ / / / / | |||||
* | | | | | Merge branch 'patch-28' into 'master' | Marcia Ramos | 2018-02-22 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add link to project visibility settings in push to create project docs See merge request gitlab-org/gitlab-ce!17292 | ||||
| * | | | | | Add link to project visibility settings in push to create project docs | Pedro Moreira da Silva | 2018-02-22 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge branch 'docs-milestones-refactor' into 'master' | Marcia Ramos | 2018-02-22 | 8 | -40/+88 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | Docs milestones refactor See merge request gitlab-org/gitlab-ce!17247 | ||||
| * | | | | | Update docs milestonesdocs-milestones-refactor | Victor Wu | 2018-02-21 | 8 | -40/+88 |
| | | | | | | |||||
* | | | | | | Merge branch 'docs-replace-prod-names' into 'master' | 🚄 Job van der Voort 🚀 | 2018-02-22 | 11 | -22/+45 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: search/replace "Enterprise Edition" and adjust when applicable See merge request gitlab-org/gitlab-ce!17161 | ||||
| * | | | | | | Docs: search/replace "Enterprise Edition" and adjust when applicable | Marcia Ramos | 2018-02-22 | 11 | -22/+45 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'fix-500-for-invalid-upload-path' into 'master' | Sean McGivern | 2018-02-22 | 6 | -1/+40 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 500 error when loading an invalid upload URL Closes gitlab-ee#4998 See merge request gitlab-org/gitlab-ce!17267 | ||||
| * | | | | | | Fix 500 error when loading an invalid upload URL | Sean McGivern | 2018-02-22 | 6 | -1/+40 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'revert-3487441b' into 'master' | Sean McGivern | 2018-02-22 | 3 | -12/+3 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'tc-info-version-check' into 'master'" See merge request gitlab-org/gitlab-ce!17269 | ||||
| * | | | | | | | Revert "Merge branch 'tc-info-version-check' into 'master'"revert-3487441b | Victor Wu | 2018-02-21 | 3 | -12/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts merge request !17257 | ||||
* | | | | | | | | Merge branch ↵ | Achilleas Pipinellis (🌴 Feb 23 - Mar 04 🌴) | 2018-02-22 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '43416-document-where-user-clone-fetch-activity-appears-in-the-logs' into 'master' Resolve "document where user clone/fetch activity appears in the logs" Closes #43416 See merge request gitlab-org/gitlab-ce!17227 | ||||
| * | | | | | | | add lines describing how to find user clone/fetch activity43416-document-where-user-clone-fetch-activity-appears-in-the-logs | Diana Stanley | 2018-02-19 | 1 | -0/+4 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'reduce-ce-ee-disrepancies-in-js' into 'master' | Filipa Lacerda | 2018-02-22 | 22 | -45/+59 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Harmonize CE and EE JS code See merge request gitlab-org/gitlab-ce!17264 | ||||
| * | | | | | | | | Harmonize CE and EE JS codereduce-ce-ee-disrepancies-in-js | Rémy Coutable | 2018-02-22 | 22 | -44/+58 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | | | | | Fix the groupLabelsPath in app/assets/javascripts/api.js | Rémy Coutable | 2018-02-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | | | | | | | Merge branch '42332-actionview-template-error-366-524-out-of-range' into ↵ | Douwe Maan | 2018-02-22 | 3 | -1/+38 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "ActionView::Template::Error: 366..524 out of range" Closes #42332 See merge request gitlab-org/gitlab-ce!17262 |