summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Session stored globally per requestjej/session-stored-globalyJames Edwards-Jones2019-05-025-0/+103
| | | | | - This can be accessed with Session.current and is restored after. - Data can be stored under a key with NamespacedSessionStore
* Merge branch '60687-enviro-dropdown' into 'master'Fatih Acet2019-04-244-2/+8
|\ | | | | | | | | | | | | Fix Metrics environments dropdown Closes #60687 See merge request gitlab-org/gitlab-ce!27586
| * Fix Metrics environments dropdown60687-enviro-dropdownSimon Knox2019-04-244-2/+8
| | | | | | | | Also bring back EE dashboard component
* | Merge branch 'fix-api-ide-relative-url-root' into 'master'Fatih Acet2019-04-245-11/+27
|\ \ | | | | | | | | | | | | Fix API and IDE path with `/` relative_url_root See merge request gitlab-org/gitlab-ce!27635
| * | Fix API and IDE path with `/` relative_url_rootPaul Slaughter2019-04-245-11/+27
| | | | | | | | | | | | | | | | | | | | | | | | **Why?** Previously we simply concatenated our paths, which led to requesting `//api/v4/...` and obviously failed. The BE supports a relative_url_root of `/`. It's a bug that the FE does not.
* | | Merge branch 'autodevops_remote_private_helm_repository' into 'master'Stan Hu2019-04-243-1/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Adding ability to specify helm chart repo using environment variables Closes #49520 See merge request gitlab-org/gitlab-ce!27123
| * | | Added changelogStuart Moore2019-04-081-0/+6
| | | |
| * | | Adding ability to specify helm chart repo using environment variablesStuart Moore2019-04-082-1/+4
| | | | | | | | | | | | | | | | | | | | Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/49520 (Covers helm charts; does not cover docker repos)
* | | | Merge branch '60387-use-icons-in-user-popovers' into 'master'Tim Zallmann2019-04-244-4/+44
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show category icons in user popover Closes #60387 See merge request gitlab-org/gitlab-ce!27254
| * | | | Add changelog entry60387-use-icons-in-user-popoversKushal Pandya2019-04-221-0/+5
| | | | |
| * | | | Show category icons in user popoverKushal Pandya2019-04-223-4/+39
| | | | | | | | | | | | | | | | | | | | Show bio, organization and location icons within user popover.
* | | | | Merge branch 'quarantine-flaky-specs' into 'master'Douglas Barbosa Alexandre2019-04-242-6/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Put some flaky specs in quarantine See merge request gitlab-org/gitlab-ce!27633
| * | | | | Put some flaky specs in quarantineRémy Coutable2019-04-242-6/+3
| | |_|/ / | |/| | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch 'i18n-extract-app/views/projects-forks' into 'master'Clement Ho2019-04-244-25/+57
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | i18n: externalize strings from 'app/views/projects/forks' See merge request gitlab-org/gitlab-ce!27497
| * | | | | [CE] i18n: externalize strings from 'app/views/projects/forks'i18n-extract-app/views/projects-forksTao Wang2019-04-234-25/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Tao Wang <twang2218@gmail.com> Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'update-workhorse-master' into 'master'Douglas Barbosa Alexandre2019-04-242-1/+6
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | Update Workhorse to v8.7.0 See merge request gitlab-org/gitlab-ce!27630
| * | | | | Update Workhorse to v8.7.0Nick Thomas2019-04-242-1/+6
| | | | | |
* | | | | | Merge branch 'ce-issue_10439' into 'master'Nick Thomas2019-04-241-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport EE cache update See merge request gitlab-org/gitlab-ce!27626
| * | | | | | Backport EE cache updateFelipe Artur2019-04-241-1/+1
|/ / / / / /
* | | | | | Merge branch '54656-500-error-on-save-of-general-pipeline-settings-timeout' ↵Stan Hu2019-04-243-1/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "500 error on save of general pipeline settings timeout" Closes gitlab-ee#11281 See merge request gitlab-org/gitlab-ce!27416
| * | | | | | Add CHANGELOG entry54656-500-error-on-save-of-general-pipeline-settings-timeoutMatija Čupić2019-04-241-0/+5
| | | | | | |
| * | | | | | Redirect to settings page on invalid updateMatija Čupić2019-04-242-1/+10
| | | | | | |
* | | | | | | Merge branch 'fj-60827-fix-web-strategy-error' into 'master'Stan Hu2019-04-243-4/+18
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug when project export to remote url fails Closes #60827 See merge request gitlab-org/gitlab-ce!27614
| * | | | | | | Fix bug when project export to remote url failsFrancisco Javier López2019-04-243-4/+18
|/ / / / / / /
* | | | | | | Merge branch 'add-ci-variable-protected-ref' into 'master'Grzegorz Bizon2019-04-246-3/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add CI variable CI_REF_PROTECTED See merge request gitlab-org/gitlab-ce!26716
| * | | | | | | Make sure that CI_COMMIT_REF_PROTECTED is a boolJason van den Hurk2019-04-182-2/+2
| | | | | | | |
| * | | | | | | Change CI_REF_PROTECTED variable to CI_COMMIT_REF_PROTECTEDJason van den Hurk2019-04-106-6/+6
| | | | | | | |
| * | | | | | | Change release version of CI_REF_PROTECTED to 11.11Jason van den Hurk2019-04-101-1/+1
| | | | | | | |
| * | | | | | | Add changelog entryJason van den Hurk2019-04-101-0/+5
| | | | | | | |
| * | | | | | | Added documentation for CI_REF_PROTECTED ci variableJason van den Hurk2019-04-101-0/+1
| | | | | | | |
| * | | | | | | Added the CI_REF_PROTECTED variable to the Gitlab runnerJason van den Hurk2019-04-104-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This variable shows if the branch the runner is executing is protected or not. References: #50909
* | | | | | | | Merge branch '60475-add-ce-ee-vue-template-danger-check' into 'master'Rémy Coutable2019-04-242-0/+58
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Add rule to Danger to detect possible CE/EE Vue <template> issues" Closes #60475 See merge request gitlab-org/gitlab-ce!27328
| * | | | | | | | Add Danger rule for EE/CE templatesNathan Friend2019-04-242-0/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds a rule to Danger that warns the developer when their MR includes changes to a CE .vue file that has a counterpart in the EE repo or vice-versa.
* | | | | | | | | Merge branch '60540-merge-request-popover-is-not-working-on-the-to-do-page' ↵Phil Hughes2019-04-245-10/+53
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Merge Request Popover is not working on the To Do page" Closes #60540 See merge request gitlab-org/gitlab-ce!27382
| * | | | | | | | | Resolve "Merge Request Popover is not working on the To Do page"Sam Bigelow2019-04-245-10/+53
|/ / / / / / / / /
* | | | | | | | | Merge branch '10099-ee-differences-for-ready-to-merge' into 'master'Phil Hughes2019-04-242-9/+15
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move EE differences for `ready_to_merge.vue` See merge request gitlab-org/gitlab-ce!27587
| * | | | | | | | | Move EE differences for `ready_to_merge.vue`Natalia Tepluhina2019-04-242-9/+15
|/ / / / / / / / /
* | | | | | | | | Merge branch 'sh-disable-internal-ids-available-check' into 'master'Sean McGivern2019-04-243-3/+21
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always use internal ID tables in development and production Closes #60718 See merge request gitlab-org/gitlab-ce!27544
| * | | | | | | | | Always use internal ID tables in development and productionsh-disable-internal-ids-available-checkStan Hu2019-04-223-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To avoid quiet failures that cause consistency errors in the database, we should now assume that the internal_ids table is available since we've had this table for close to a year. For tests that have migrations, we make this check thread-safe via SafeRequestStore. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/60718
* | | | | | | | | | Merge branch 'pedroms-master-patch-06843' into 'master'Achilleas Pipinellis2019-04-241-2/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify UX debt label See merge request gitlab-org/gitlab-ce!27548
| * | | | | | | | | | Clarify UX debt labelPedro Moreira da Silva2019-04-241-2/+3
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'ce-remove-already-signed-in' into 'master'Nick Thomas2019-04-244-10/+30
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove "You are already signed in" banner See merge request gitlab-org/gitlab-ce!27377
| * | | | | | | | | Remove "You are already signed in" bannerIllya Klymov2019-04-244-10/+30
|/ / / / / / / / /
* | | | | | | | | Merge branch '10096-gfm-autocomplete-ce' into 'master'Kushal Pandya2019-04-246-7/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move EE specific GfmAutocomplete code to EE file See merge request gitlab-org/gitlab-ce!27611
| * | | | | | | | | Move EE specific GfmAutocomplete code to EE file10096-gfm-autocomplete-ceRajat Jain2019-04-246-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor GfmAutocomplete and create a new EE counterpart which is referenced through `ee_else_ce`
* | | | | | | | | | Merge branch 'sh-upgrade-grpc-and-protobuf' into 'master'Nick Thomas2019-04-243-7/+12
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump gRPC to 1.19.0 and protobuf to 3.7.1 See merge request gitlab-org/gitlab-ce!27086
| * | | | | | | | | | Bump gRPC to 1.19.0 and protobuf to 3.7.1sh-upgrade-grpc-and-protobufStan Hu2019-04-223-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These upgrades are necessary to support Ruby 2.6. This matches the Gitaly MR: https://gitlab.com/gitlab-org/gitaly/merge_requests/1066
* | | | | | | | | | | Merge branch '10504-single-codebase-ce' into 'master'Sean McGivern2019-04-242-3/+6
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Epics in issuable list when EE See merge request gitlab-org/gitlab-ce!27545
| * | | | | | | | | | | Add Epics in issuable list when EERajat Jain2019-04-242-3/+6
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a method in LabelsHelper which returns the correct list of `issuable_types` to the view.
* | | | | | | | | | | Merge branch '60800-properly-authorize-our-own-graphql-scalar-types' into ↵Dmitriy Zaporozhets2019-04-242-4/+18
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Properly authorize our own GraphQL scalar types Closes #60800 See merge request gitlab-org/gitlab-ce!27563