summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix "Resolve conflicts" button not appearing for some userssh-fix-resolve-button-not-availableStan Hu2019-06-113-3/+79
| | | | | | | | | | | | | | | | | | | | Previously the frontend assumed that the user had to be able to merge to that project in order to resolve conflicts. However, this is overly restrictive, as the user only has to be able to push to the source branch. In fact, appending the text /conflicts to the merge request would bring up the conflict resolution page. This confusion happens when a project contains a protected branch that only allows maintainers to push. Users with Developer access no longer have permission to merge, but they still can create branches in that project. To fix this issue, we now loosen the permission check for the "Resolve conflicts" button and only check for access to push to the source branch. This is consistent with what the backend does in MergeRequests::Conflicts::ListService#can_be_resolved_by?. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/47954
* Merge branch 'docs/add_groups_video' into 'master'Evan Read2019-06-121-0/+2
|\ | | | | | | | | Add link to Groups video See merge request gitlab-org/gitlab-ce!29530
| * Add link to Groups videoRussell Dickenson2019-06-121-0/+2
|/
* Merge branch 'docs-62889-update-cycle-analytics-docs' into 'master'Evan Read2019-06-121-6/+5
|\ | | | | | | | | | | | | Update docs regarding cycle analytics Closes #62889 See merge request gitlab-org/gitlab-ce!29431
| * Update docs regarding cycle analyticsdocs-62889-update-cycle-analytics-docsMałgorzata Ksionek2019-06-101-6/+5
| |
* | Merge branch 'docs-sunset-glossary' into 'master'Evan Read2019-06-124-709/+8
|\ \ | | | | | | | | | | | | | | | | | | Sunset Glossary in docs and make necessary doc edits to clarify terms that need it Closes #58413 See merge request gitlab-org/gitlab-ce!29527
| * | Remove glossary content and make necessary doc edits to clarify termsMike Lewis2019-06-124-709/+8
|/ / | | | | | | | | This after reviewing each and every glossary entry to ensure it was covered in GitLab docs, or about.gitlab, or not needed.
* | Merge branch 'gitlab-runner-mr-1386-docs' into 'master'Evan Read2019-06-121-0/+95
|\ \ | | | | | | | | | | | | Update docs to reflect MR#1386 changes to gitlab-runner See merge request gitlab-org/gitlab-ce!29136
| * | Docs for Gitlab Runner docker use of private registriesAndrei Burd2019-06-121-0/+95
|/ / | | | | | | Docs for https://gitlab.com/gitlab-org/gitlab-runner/merge_requests/1386
* | Merge branch 'mc/docs/metrics-reports-docs' into 'master'Evan Read2019-06-121-0/+5
|\ \ | | | | | | | | | | | | | | | | | | Metrics reports documentation is incomplete Closes gitlab-ee#11942 See merge request gitlab-org/gitlab-ce!29345
| * | Metrics reports documentation is incompleteMatija Čupić2019-06-121-0/+5
|/ /
* | Merge branch 'patch-71' into 'master'Evan Read2019-06-121-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Fixed documentationmarkdown link in Docker compose note Closes #63114 See merge request gitlab-org/gitlab-ce!29502
| * | Fixed markdown link in Docker compose noteDanial Khoshkhou2019-06-111-1/+1
| | |
* | | Merge branch 'docs/link-priority-on-issues-list' into 'master'Evan Read2019-06-111-1/+3
|\ \ \ | | | | | | | | | | | | | | | | Update issues/index.md with note on label priority sorting See merge request gitlab-org/gitlab-ce!29365
| * | | Update issues/index.md with note on label priority sortingLucas Charles2019-06-111-1/+3
|/ / /
* | | Merge branch 'feature-jp-issue-permission' into 'master'Thong Kuah2019-06-114-10/+6
|\ \ \ | | | | | | | | | | | | | | | | API issues - minor cleanup of permission check See merge request gitlab-org/gitlab-ce!29423
| * | | API issues - minor cleanup of permission checkJan Provaznik2019-06-114-10/+6
|/ / / | | | | | | | | | | | | | | | Adds `set_issue_updated_at` similar to `set_issue_created_at` permission and cleans up the related permission check in issues API.
* | | Merge branch 'fe-fix-gl-dropdown-scrolling-to-top' into 'master'Fatih Acet2019-06-112-1/+6
|\ \ \ | | | | | | | | | | | | | | | | Fix gl_dropdown scrolling to top on assignee click See merge request gitlab-org/gitlab-ce!29500
| * | | Fix gl_dropdown scrolling to top on assignee clickPaul Slaughter2019-06-112-1/+6
| |/ / | | | | | | | | | | | | | | | | | | **How?** It looks like when assignees are clicked, the child of the `<a>`. We fix our propogation check by looking at `.closest` which traverses through the element itself and parent.
* | | Merge branch 'patch-70' into 'master'Marcia Ramos2019-06-111-0/+1
|\ \ \ | | | | | | | | | | | | | | | | Adds a space to fix code display See merge request gitlab-org/gitlab-ce!29463
| * | | Adds a space to fix code displayEzekiel Kigbo2019-06-111-0/+1
| | | |
* | | | Merge branch 'rnienaber-component-diagram-docs' into 'master'Marcia Ramos2019-06-112-0/+15
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Add high level component overview back to architecture page See merge request gitlab-org/gitlab-ce!28729
| * | | Final doc reviewRachel Nienaber2019-06-112-0/+15
|/ / / | | | | | | | | | | | | - Wrap text - Move image to /img/
* | | Merge branch 'docs/admin_groups' into 'master'Marcia Ramos2019-06-111-3/+22
|\ \ \ | | | | | | | | | | | | | | | | Documented the Admin Area's *Groups* page See merge request gitlab-org/gitlab-ce!28038
| * | | Documented the Admin Area's *Groups* pageRussell Dickenson2019-06-111-3/+22
|/ / /
* | | Merge branch 'docs-issue-data' into 'master'Marcia Ramos2019-06-119-101/+161
|\ \ \ | | | | | | | | | | | | | | | | Docs: Updating issue data and actions doc See merge request gitlab-org/gitlab-ce!28810
| * | | Docs: Updating issue data and actions docMarcel Amirault2019-06-119-101/+161
|/ / /
* | | Merge branch 'revert-28513' into 'master'Douwe Maan2019-06-1114-381/+223
|\ \ \ | | | | | | | | | | | | | | | | Revert "Automatically update MR merge-ref along merge status" See merge request gitlab-org/gitlab-ce!29492
| * | | Revert "Automatically update MR merge-ref along merge status"Oswaldo Ferreira2019-06-1114-381/+223
| | | |
* | | | Merge branch 'docs-autodevops-notes-review' into 'master'Achilleas Pipinellis2019-06-113-78/+57
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove unnecessary notes from AutoDevOps documentation See merge request gitlab-org/gitlab-ce!27433
| * | | | Remove unnecessary notes from AutoDevOps documentationMike Lewis2019-06-113-78/+57
|/ / / /
* | | | Merge branch 'patch-58' into 'master'Achilleas Pipinellis2019-06-111-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Alertmanager on omnibus requires configuration See merge request gitlab-org/gitlab-ce!28398
| * | | | Alertmanager on omnibus requires configurationpatch-58Ben Bodenmiller2019-06-091-1/+1
| | | | |
* | | | | Merge branch 'patch-23' into 'master'Achilleas Pipinellis2019-06-111-0/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Docs: enable numeric UIDs and GIDs for NFS See merge request gitlab-org/gitlab-ce!21712
| * | | | | Docs: enable numeric UIDs and GIDs for NFSBen Bodenmiller2019-06-111-0/+8
|/ / / / /
* | | | | Merge branch '62788-graphql-pagination' into 'master'Phil Hughes2019-06-115-9/+140
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creates pagination component graphql Closes #62788 See merge request gitlab-org/gitlab-ce!29277
| * | | | | Creates pagination component graphqlFilipa Lacerda2019-06-115-9/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | creates a pagination component for the graphql api
* | | | | | Merge branch 'cg-gitlab-ce-admin-ha-title' into 'master'Achilleas Pipinellis2019-06-111-2/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Take out JN title in text See merge request gitlab-org/gitlab-ce!29376
| * | | | | | Take out JN title in textCassiana Gudgenov2019-06-111-2/+1
|/ / / / / /
* | | | | | Merge branch 'jl-improve-wording-license-docs' into 'master'Achilleas Pipinellis2019-06-111-9/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve wording for automatic license import See merge request gitlab-org/gitlab-ce!29330
| * | | | | | Improve wording for automatic license importJoshua Lambert2019-06-111-9/+3
|/ / / / / /
* | | | | | Merge branch 'docs-ci-videos' into 'master'Achilleas Pipinellis2019-06-116-16/+32
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: CI - link videos Closes #62293 See merge request gitlab-org/gitlab-ce!29491
| * | | | | | Docs: CI - link videosMarcia Ramos2019-06-116-16/+32
|/ / / / / /
* | | | | | Merge branch 'docs-ssot-review-ci-examples' into 'master'Achilleas Pipinellis2019-06-1117-108/+148
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update CI Examples section to confirm to SSOT Documentation standards Closes #61507 See merge request gitlab-org/gitlab-ce!29397
| * | | | | | Doc types on tutorials in top level examples folder, minor editsMike Lewis2019-06-1117-108/+148
|/ / / / / / | | | | | | | | | | | | | | | | | | Variety of edits to conform with SSOT doc style standards
* | | | | | Merge branch '62813-show-inline-diff-example-rendered' into 'master'Marcia Ramos2019-06-112-1/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show inline diff example rendered Closes #62813 See merge request gitlab-org/gitlab-ce!29239
| * | | | | | Replace rendered example with imageMark Lapierre2019-06-112-1/+5
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Because the markdown wouldn't have been rendered on docs.gitlab.com
* | | | | | Merge branch '62760-use-time-zone-now' into 'master'Rémy Coutable2019-06-111-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Time.zone.now for Ci::PipelineSchedule#ideal_next_run_at Closes #62760 See merge request gitlab-org/gitlab-ce!29275
| * | | | | | Use Time.zone.now for Ci::PipelineSchedule#ideal_next_run_atLin Jen-Shin2019-06-111-1/+2
|/ / / / / /
* | | | | | Merge branch 'docs-fix-alert-box' into 'master'Marcia Ramos2019-06-111-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | Use correct alert box See merge request gitlab-org/gitlab-ce!28268
View Lorry Controller Status