summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Include CI Variable Key in its uniqueness validation error message43275-improve-variables-validation-messageMatija Čupić2018-02-234-4/+10
|
* Add CHANGELOG entryMatija Čupić2018-02-221-0/+5
|
* Skip variables duplicates validator if variable is already a duplicateMatija Čupić2018-02-223-1/+4
|
* Condition associated variable validation in Project and GroupMatija Čupić2018-02-222-2/+3
|
* Do not validate individual Variables when saving Project/GroupMatija Čupić2018-02-222-2/+2
|
* Merge branch '42431-add-auto-devops-and-clusters-button-to-projects' into ↵Rémy Coutable2018-02-2228-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-projectsOswaldo Ferreira2018-02-222-2/+2
| |
| * Use select instead rejectOswaldo Ferreira2018-02-221-2/+2
| |
| * Move can_current_user_push_to_branch to PresenterOswaldo Ferreira2018-02-223-8/+10
| |
| * Simplify project check with duck typingOswaldo Ferreira2018-02-221-1/+1
| |
| * Move project presenter instance creation to controllerOswaldo Ferreira2018-02-223-2/+2
| |
| * Update enabled Kubernetes cluster button to "Kubernetes configured"Eric Eastwood2018-02-223-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-projectsEric Eastwood2018-02-22895-10376/+10646
| |\
| * | Remove indent and reduce bloat with link_to_ifEric Eastwood2018-02-221-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 anchorsEric Eastwood2018-02-211-4/+4
| | |
| * | Link "add a Kubernetes cluster" to new cluster pageEric Eastwood2018-02-211-1/+1
| | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/16900#note_59936315
| * | Make ruby-lint happyOswaldo Ferreira2018-02-211-2/+2
| | |
| * | Use method call instead hash accessesOswaldo Ferreira2018-02-211-4/+4
| | |
| * | Memoize method which is called multiple times on presenterOswaldo Ferreira2018-02-201-4/+7
| | |
| * | Add unit tests to presenter methodsOswaldo Ferreira2018-02-202-33/+315
| | |
| * | Use OpenStruct instead Hash for statistics buttonsOswaldo Ferreira2018-02-202-100/+62
| | |
| * | Improve methods namingOswaldo Ferreira2018-02-203-9/+9
| | |
| * | Move default_project_view tests to presenterOswaldo Ferreira2018-02-204-102/+97
| | |
| * | Move button list logic to project presenterOswaldo Ferreira2018-02-2015-381/+416
| | |
| * | Switch back to using a single partialEric Eastwood2018-02-202-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 pageEric Eastwood2018-02-1616-195/+627
| | |
* | | Merge branch 'ui-bundle-tag-remove' into 'master'Clement Ho2018-02-221-2/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove bundle tag for ui help Closes #41341 See merge request gitlab-org/gitlab-ce!17301
| * | | Remove bundle tag for ui helpJacob Schatz2018-02-221-2/+0
| | | |
* | | | Merge branch '43373-fix-cache-index-appending' into 'master'Kamil Trzciński2018-02-223-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-appendingTomasz Maczukin2018-02-211-0/+5
| | | | |
| * | | | Change cache index delimiter to character not recognizable as variable partTomasz Maczukin2018-02-212-2/+2
| | | | |
* | | | | Update CHANGELOG.md for 10.5.1Ian Baum2018-02-221-0/+4
| | | | | | | | | | | | | | | [ci skip]
* | | | | Merge branch 'dispatcher-import-batch-3' into 'master'Jacob Schatz2018-02-2222-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 Ho2018-02-2222-131/+32
|/ / / / /
* | | | | Merge branch 'patch-28' into 'master'Marcia Ramos2018-02-221-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 docsPedro Moreira da Silva2018-02-221-1/+1
| | | | | |
* | | | | | Merge branch 'docs-milestones-refactor' into 'master'Marcia Ramos2018-02-228-40/+88
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | Docs milestones refactor See merge request gitlab-org/gitlab-ce!17247
| * | | | | Update docs milestonesdocs-milestones-refactorVictor Wu2018-02-218-40/+88
| | | | | |
* | | | | | Merge branch 'docs-replace-prod-names' into 'master'🚄 Job van der Voort 🚀2018-02-2211-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 applicableMarcia Ramos2018-02-2211-22/+45
|/ / / / / /
* | | | | | Merge branch 'fix-500-for-invalid-upload-path' into 'master'Sean McGivern2018-02-226-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 URLSean McGivern2018-02-226-1/+40
| | | | | | |
* | | | | | | Merge branch 'revert-3487441b' into 'master'Sean McGivern2018-02-223-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-3487441bVictor Wu2018-02-213-12/+3
| | | | | | | | | | | | | | | | | | | | | | | | This reverts merge request !17257
* | | | | | | | Merge branch ↵Achilleas Pipinellis (🌴 Feb 23 - Mar 04 🌴)2018-02-221-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-logsDiana Stanley2018-02-191-0/+4
| | | | | | | |
* | | | | | | | Merge branch 'reduce-ce-ee-disrepancies-in-js' into 'master'Filipa Lacerda2018-02-2222-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-jsRémy Coutable2018-02-2222-44/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | Fix the groupLabelsPath in app/assets/javascripts/api.jsRémy Coutable2018-02-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | Merge branch '42332-actionview-template-error-366-524-out-of-range' into ↵Douwe Maan2018-02-223-1/+38
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "ActionView::Template::Error: 366..524 out of range" Closes #42332 See merge request gitlab-org/gitlab-ce!17262