summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update VERSION to 10.0.0-rc5v10.0.0-rc5Jarka Kadlecova2017-09-211-1/+1
|
* Merge branch '10-0-stable-prepare-rc5' into '10-0-stable'Robert Speicher2017-09-2094-928/+658
|\ | | | | | | | | Prepare 10.0 RC5 release See merge request gitlab-org/gitlab-ce!14352
| * Merge branch 'ce-backport-new-sidebar-boards' into 'master'10-0-stable-prepare-rc5Filipa Lacerda2017-09-203-7/+23
| | | | | | | | | | | | | | | | CE backport of new-sidebar-boards See merge request !14246 # Conflicts: # app/views/layouts/nav/sidebar/_project.html.haml
| * Merge branch 'revert-feature-highlight' into 'master'Jacob Schatz2017-09-2013-736/+8
| | | | | | | | | | | | | | | | | | | | Revert feature highlight Closes #38087 See merge request gitlab-org/gitlab-ce!14373 # Conflicts: # app/views/layouts/nav/sidebar/_project.html.haml
| * Merge branch '37894-handle-if-auto-devops-domain-is-not-set' into 'master'Stan Hu2017-09-207-12/+118
| | | | | | | | | | | | | | Resolve "Handle if Auto DevOps domain is not set" Closes #37894 See merge request gitlab-org/gitlab-ce!14319
| * Merge branch 'fix/gitaly-commit-diff-rpc-encoding-error' into 'master'Robert Speicher2017-09-202-1/+5
| | | | | | | | | | | | | | Encode paths properly for Gitaly Commit{Diff,Delta} Closes gitaly#589 See merge request gitlab-org/gitlab-ce!14361
| * Merge branch 'fix/gb/fix-moving-issue-with-ambiguous-references' into 'master'Rémy Coutable2017-09-207-24/+77
| | | | | | | | | | | | | | Fix rewriting issue references with group milestones Closes #37746 See merge request gitlab-org/gitlab-ce!14294
| * Merge branch 'do-not-perform-disk-check' into 'master'Stan Hu2017-09-194-3/+8
| | | | | | | | | | | | | | Do not perform hard check (presence of file on storage) Closes #37945 See merge request gitlab-org/gitlab-ce!14369
| * Merge branch '38060-fix-groups-api-owned-groups' into 'master'Douwe Maan2017-09-192-1/+4
| | | | | | | | | | | | | | Fix the groups API endpoint to handle ?owned=true correctly Closes #38060 See merge request gitlab-org/gitlab-ce!14362
| * Merge branch 'backstage/gb/qa/fix-admin-area-selector' into 'master'Rémy Coutable2017-09-191-1/+1
| | | | | | | | | | | | | | Fix admin area selector in GitLab QA Closes gitlab-qa#66 See merge request gitlab-org/gitlab-ce!14356
| * Merge branch 'sh-stop-loading-issue-discussions' into 'master'Douwe Maan2017-09-192-3/+5
| | | | | | | | | | | | | | Remove unnecessary loading of discussions in `IssuesController#show` Closes #38034 See merge request gitlab-org/gitlab-ce!14351
| * Merge branch 'reoganize-deployment-indexes' into 'master'Stan Hu2017-09-195-5/+58
| | | | | | | | | | | | | | Reorganize indexes for the "deployments" table Closes #36877 See merge request gitlab-org/gitlab-ce!14348
| * Merge branch 'fix-rails-migrations-for-partial-indexes' into 'master'Yorick Peterse2017-09-192-2/+2
| | | | | | | | | | Fix regular expression used for opclasses to not be confused by partial index clause See merge request gitlab-org/gitlab-ce!14343
| * Merge branch ↵Stan Hu2017-09-192-0/+7
| | | | | | | | | | | | | | | | | | '37890-auto-devops-banner-is-not-shown-when-the-repository-is-empty-new-project' into 'master' Resolve "Auto DevOps banner is not shown when the repository is empty (new project)" Closes #37890 See merge request gitlab-org/gitlab-ce!14321
| * Merge branch 'zj-update-project-settings' into 'master'Grzegorz Bizon2017-09-193-3/+46
| | | | | | | | | | | | | | Allow updating of project auto devops settings Closes #37893 See merge request gitlab-org/gitlab-ce!14291
| * Merge branch 'issue_37640_9_5_stable' into '9-5-stable'Grzegorz Bizon2017-09-191-1/+1
| | | | | | | | | | | | | | | | | | Fix project feature being deleted when updating project with invalid visibility level See merge request gitlab-org/gitlab-ce!14235 # Conflicts: # db/schema.rb # spec/services/projects/update_service_spec.rb
| * Merge branch ↵Grzegorz Bizon2017-09-193-6/+6
| | | | | | | | | | | | | | | | | | '36907-new-issue-from-failed-build-no-longer-links-to-failed-build' into 'master' Resolve "New issue from failed build no longer links to failed build" Closes #36907 See merge request !13790
| * Merge branch 'role-badge-fix' into 'master'Douwe Maan2017-09-191-1/+1
| | | | | | | | | | IssueNotes: Fix role badge styling. See merge request gitlab-org/gitlab-ce!14279
| * Merge branch '37590-pipelines-mr' into 'master'Annabel Dunstone Gray2017-09-192-0/+10
| | | | | | | | | | | | | | Fix mini graph pipeline breaking in merge request view Closes #37590 See merge request gitlab-org/gitlab-ce!14306
| * Merge branch '37465-fix-line-resolve-all-green-checkmark-icon' into 'master'Annabel Dunstone Gray2017-09-193-2/+12
| | | | | | | | | | | | | | Update "x/x discussions resolved" checkmark icon to be green when all discussions resolved Closes #37465 See merge request gitlab-org/gitlab-ce!14255
| * Merge branch '33287-fix-mr-widget-errors-with-external-services' into 'master'Fatih Acet2017-09-1910-25/+157
| | | | | | | | | | | | | | Fix MR widget with external CI services/integrations Closes #33287 See merge request gitlab-org/gitlab-ce!13977
| * Merge branch '37259-some-mr-ready-mobile-fixes' into 'master'Fatih Acet2017-09-194-3/+16
| | | | | | | | | | | | | | Fix MR widget with ready to merge buttons/controls at mobile breakpoint Closes #37259 See merge request gitlab-org/gitlab-ce!14242
| * Merge branch '37957-fix-groups-members-flyout-link' into 'master'Phil Hughes2017-09-191-1/+1
| | | | | | | | | | | | | | Use correct group members path for members flyout link Closes #37957 See merge request gitlab-org/gitlab-ce!14329
| * Merge branch 'issue_37640' into 'master'Grzegorz Bizon2017-09-196-6/+67
| | | | | | | | | | | | | | Fix project feature being deleted when updating project with invalid visibility level Closes #37640 See merge request gitlab-org/gitlab-ce!14234
| * Merge branch 'docs-replace-pipelines-cicd' into 'master'Achilleas Pipinellis2017-09-196-17/+17
| | | | | | | | | | Change Pipelines to CI/CD for Settings page See merge request gitlab-org/gitlab-ce!14168
| * Merge branch '37857-build-header-gap' into 'master'Phil Hughes2017-09-192-7/+7
| | | | | | | | | | | | | | Remove gaps under nav on build page Closes #37857 See merge request gitlab-org/gitlab-ce!14283
| * Merge branch 'fix_wiki_md' into 'master'Achilleas Pipinellis2017-09-191-0/+2
| | | | | | | | | | Fix broken link in docs/api/wiki.md See merge request gitlab-org/gitlab-ce!14296
| * Merge branch '37454-remove-confidential-cb-edit-issue' into 'master'Phil Hughes2017-09-197-62/+0
|/ | | | | | | Remove confidential toggle checkbox while editing issue inline Closes #37454 See merge request !14142
* Update VERSION to 10.0.0-rc4v10.0.0-rc4Jarka Kadlecova2017-09-181-1/+1
|
* Merge branch '10-0-stable-prepare-rc4' into '10-0-stable'Jarka Kadlecova2017-09-1822-31/+279
|\ | | | | | | | | Prepare 10.0 RC4 release See merge request gitlab-org/gitlab-ce!14310
| * Merge branch 'rs-default-user-entity' into 'master'10-0-stable-prepare-rc4Stan Hu2017-09-171-1/+1
| | | | | | | | | | Ensure we use `Entities::User` for non-admin `users/:id` API requests See merge request gitlab-org/gitlab-ce!14314
| * Merge branch 'rs-incoming-email-domain-docs' into 'security-10-0'Robert Speicher2017-09-171-2/+29
| | | | | | | | | | | | | | Add Security Concerns section to reply by email documentation [ci skip] See merge request gitlab/gitlabhq!2191
| * Merge branch 'fix-share-with-group-lock-update' into 'master'Robert Speicher2017-09-154-4/+51
| | | | | | | | | | | | | | Fix setting share_with_group_lock Closes #37916 See merge request gitlab-org/gitlab-ce!14300
| * Merge branch '37886-typo-in-protected-runners-setting-checkbox' into 'master'Grzegorz Bizon2017-09-151-1/+1
| | | | | | | | | | | | | | Resolve "Typo in Protected Runners setting checkbox" Closes #37886 See merge request gitlab-org/gitlab-ce!14284
| * Merge branch '37844-layout-nav-space' into 'master'Phil Hughes2017-09-151-1/+1
| | | | | | | | | | | | | | Remove extra space between profile header and navbar Closes #37844 See merge request gitlab-org/gitlab-ce!14275
| * Merge branch 'indexes-for-recent-push-events' into 'master'Robert Speicher2017-09-152-2/+42
| | | | | | | | | | Add missing index for getting recent push events See merge request gitlab-org/gitlab-ce!14273
| * Merge branch 'ci-environment-status-performance' into 'master'Stan Hu2017-09-155-3/+32
| | | | | | | | | | | | | | Constrain environment deployments to project IDs Closes #36877 See merge request gitlab-org/gitlab-ce!14252
| * Merge branch 'projects-controller-show' into 'master'Rémy Coutable2017-09-157-16/+121
| | | | | | | | | | SQL performance improvements for ProjectsController#show See merge request gitlab-org/gitlab-ce!14226
| * Merge branch 'docs-my-reaction-filter' into 'master'Achilleas Pipinellis2017-09-151-2/+2
|/ | | | | Docs filter by my reaction See merge request gitlab-org/gitlab-ce!14197
* Update VERSION to 10.0.0-rc3v10.0.0-rc3Jarka Kadlecova2017-09-151-1/+1
|
* Merge branch '10-0-stable-prepare-rc3' into '10-0-stable'Jarka Kadlecova2017-09-1549-80/+584
|\ | | | | | | | | Prepare 10.0 RC3 release See merge request gitlab-org/gitlab-ce!14266
| * Merge branch '37845-fix-oauth-provider-forced-encoding' into 'master'10-0-stable-prepare-rc3Grzegorz Bizon2017-09-142-5/+4
| | | | | | | | | | | | | | Don't force the encoding of the OAuth provider in Gitlab::OAuth::AuthHash#provider Closes #37845 See merge request gitlab-org/gitlab-ce!14263
| * Merge branch '37759-also-treat-newlines-as-separator' into 'master'Kamil Trzciński2017-09-143-14/+30
| | | | | | | | | | | | | | Treat newlines as separators for pipeline emails service Closes #37759 See merge request gitlab-org/gitlab-ce!14250
| * Merge branch 'repo-cache-fix' into 'master'Kamil Trzciński2017-09-142-2/+8
| | | | | | | | | | Restore has_visible_content? to improve performance (cache) See merge request gitlab-org/gitlab-ce!14264
| * Merge branch '35978-milestone-title' into 'master'Phil Hughes2017-09-144-3/+15
| | | | | | | | | | | | | | Truncate milestone text on collapse; add tooltip for title Closes #35978 See merge request gitlab-org/gitlab-ce!14123
| * Merge branch ↵Douwe Maan2017-09-144-3/+22
| | | | | | | | | | | | | | | | | | '37576-renamed-files-have-escaped-html-for-the-inline-diff-in-the-header' into 'master' Resolve "Renamed files have escaped HTML for the inline diff in the header" Closes #37576 See merge request gitlab-org/gitlab-ce!14121
| * Merge branch '37573-fix-sidebar-active-color' into 'master'Phil Hughes2017-09-142-16/+18
| | | | | | | | | | | | | | Update badge color to match theme; lighten active color in sidebar Closes #37573 See merge request gitlab-org/gitlab-ce!14116
| * Merge branch ↵Kamil Trzciński2017-09-143-1/+9
| | | | | | | | | | | | | | 'fix/sm/37559-pipeline-triggered-through-api-not-showing-trigger-variables' into 'master' Fix `ci_builds` to have an associated `trigger_request_id` See merge request !14244
| * Merge branch 'fix_default_navigation_theme_selection' into 'master'Robert Speicher2017-09-141-1/+1
| | | | | | | | | | | | | | Fix default navigation theme selection Closes #37777 See merge request !14260
| * Merge branch 'sub-group-dropdown-width' into 'master'Annabel Dunstone Gray2017-09-141-3/+3
| | | | | | | | | | | | | | Fixed width of sub-group in breadcrumb dropdown Closes #37745 See merge request !14210