summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * Merge branch 'fix/gpg-tmp-dir-removal-race-condition' into 'master'Rémy Coutable2017-09-142-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | Fix: GPG tmp dir removal race condition Ignore any errors when removing the tmp directory, as we may run into a race condition: The `gpg-agent` agent process may clean up some files as well while `FileUtils.remove_entry` is iterating the directory and removing all its contained files and directories recursively, which could raise an error. Closes #36998 See merge request !14194
| * Merge branch 'zj-auto-devops-banner' into 'master'Kamil Trzciński2017-09-143-1/+25
| | | | | | | | | | | | | | AutoDevOps banner hidden on explicit CI config Closes #37652 See merge request !14207
| * Merge branch 'fly-out-nav-closest-undefined' into 'master'Tim Zallmann2017-09-141-1/+1
| | | | | | | | | | Fix JS error in fly-out nav See merge request !14212
| * Merge branch 'zj-usage-data-auto-devops' into 'master'Kamil Trzciński2017-09-144-0/+16
| | | | | | | | | | | | | | Add usage ping for Auto DevOps Closes #37648 See merge request !14162
| * Merge branch ↵Douwe Maan2017-09-144-1/+27
| | | | | | | | | | | | | | | | | | '37629-lazy-image-loading-breaks-notification-mails-for-an-added-screenshot' into 'master' Resolve "Lazy image loading breaks notification mails for an added screenshot" Closes #37629 See merge request !14161
| * Merge branch 'sh-exclude-api-responses' into 'master'Robert Speicher2017-09-141-1/+0
| | | | | | | | | | Exclude logging of API responses to prevent leakage of confidential data See merge request !14245
| * Merge branch 'zj-feature-flipper-disable-banner' into 'master'Kamil Trzciński2017-09-144-1/+34
| | | | | | | | | | | | | | Allow all AutoDevOps banners to be disabled Closes #37653 See merge request !14218
| * Merge branch '37730-image-onion-skin-does-not-work-anymore' into 'master'Clement Ho2017-09-142-4/+9
| | | | | | | | | | | | | | Resolve "Image onion skin + swipe does not work anymore" Closes #37730 and #37732 See merge request !14215
| * Merge branch 'docs/autodevops-fixes' into 'master'Achilleas Pipinellis2017-09-141-19/+61
| | | | | | | | | | | | | | Fix Auto DevOps quick start guide Closes #37768 See merge request !14230
| * Merge branch 'breadcrumbs-hover-underline' into 'master'Filipa Lacerda2017-09-141-0/+1
| | | | | | | | | | | | | | Fixed the breadcrumbs project name not having hover style Closes #37661 See merge request !14211
| * Merge branch 'detect-orphaned-repositories' into 'master'Douwe Maan2017-09-146-0/+285
|/ | | | | Detect orphaned repositories See merge request !14204
* Update VERSION to 10.0.0-rc2v10.0.0-rc2Robert Speicher2017-09-131-1/+1
|
* Revert "Remove db/migrate/20170828135939_migrate_user_external_mail_data.rb"Robert Speicher2017-09-131-0/+57
| | | | | | This reverts commit 5b1f1997bcb1ee8ee90c61831e7ea76a68692e66. [ci skip]
* Update VERSION to 10.0.0-rc1v10.0.0-rc1Robert Speicher2017-09-121-1/+1
|
* Remove db/migrate/20170828135939_migrate_user_external_mail_data.rbRobert Speicher2017-09-121-57/+0
| | | | | | | | | | This file is a duplicate of a post-deploy migration and appears to have been left in by mistake. Looping through the Users table in a foreground migration would've been a bad idea. [ci skip]
* Merge branch '10-0-stable-prepare-rc1' into '10-0-stable'Robert Speicher2017-09-1274-550/+1452
|\ | | | | | | | | Prepare 10.0 RC1 release See merge request !14143
| * Merge branch 'reset-events-primary-key-mysql' into 'master'10-0-stable-prepare-rc1Rémy Coutable2017-09-121-0/+24
| | | | | | | | | | Reset primary keys after swapping events tables See merge request !14182
| * Merge branch ↵Tim Zallmann2017-09-125-18/+60
| | | | | | | | | | | | | | | | | | '37644-update-prometheus-metric-library-to-support-multiple-series-and-colors' into 'master' Update Prometheus Metric Library to support multiple series and colors Closes #37644 See merge request !14155
| * Merge branch 'support-additional-colors' into 'master'Tim Zallmann2017-09-1210-72/+101
| | | | | | | | | | | | | | Supports additional colors and labels for the prometheus monitoring dashboard Closes #34629 See merge request !14065
| * Merge branch '37647-follow-up-from-update-helm-chart-docs-from-ce-docs' into ↵Achilleas Pipinellis2017-09-121-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve Follow-up from Update Helm Chart docs from CE - docs Closes #37647 See merge request !14166 # Conflicts: # doc/install/kubernetes/index.md
| * Merge branch 'dashboards-projects-controller' into 'master'Rémy Coutable2017-09-122-1/+6
| | | | | | | | | | | | | | Eager load namespace owners for project dashboards Closes #27376 See merge request !14188
| * Merge branch 'user-recent-push' into 'master'Douwe Maan2017-09-1213-86/+369
| | | | | | | | | | | | | | Rework how recent push events are retrieved Closes #35990 See merge request !13995
| * Merge branch '37608-reset-all-connections' into 'master'Robert Speicher2017-09-121-1/+3
| | | | | | | | | | Reset all connection schema cache after migration tests See merge request !14195
| * Merge branch 'jk-update-install-guide' into 'master'Robert Speicher2017-09-128-8/+364
| | | | | | | | | | | | | | Update installation and update instructions for 10.0 [ci skip] See merge request !14135
| * Merge branch 'docs-group-mrs-list-view-search-bar' into 'master'Clement Ho2017-09-122-2/+0
| | | | | | | | | | Docs group mrs list view search bar See merge request !14196
| * Merge branch 'sh-filter-runner-token' into 'master'Robert Speicher2017-09-121-2/+2
| | | | | | | | | | Expand filtered parameters to include `token` See merge request !14174
| * Merge branch 'changes-tab-jumping' into 'master'Filipa Lacerda2017-09-122-1/+6
| | | | | | | | | | | | | | Fixed changes bar jumping on merge requests Closes #37589 See merge request !14157
| * Merge branch 'docs/yaml-hidden-keys' into 'master'Marcia Ramos2017-09-121-11/+17
| | | | | | | | | | | | | | Clarify yaml hidden keys (jobs) Closes #37480 See merge request !14110
| * Merge branch '37603-preferences-settings-extra-line' into 'master'Phil Hughes2017-09-121-2/+2
| | | | | | | | | | | | | | Remove unused extra hr in preferences Closes #37603 See merge request !14127
| * Merge branch 'file-content-mobile' into 'master'Phil Hughes2017-09-121-2/+5
| | | | | | | | | | Reduce top and bottom margin on file viewer on mobile See merge request !14114
View Lorry Controller Status