summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | Don't extend from struct as rubocop suggestsLin Jen-Shin2017-07-041-1/+9
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Add test for RequestStoreWrapLin Jen-Shin2017-07-041-0/+99
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Make sure that retryable_builds would preload projectLin Jen-Shin2017-07-041-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Introduce Gitlab::Cache::RequestStoreWrapLin Jen-Shin2017-07-043-3/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So that we cache the result of UserAccess#can_push_or_merge_to_branch? in RequestStore, avoiding querying ProtectedBranch over and over for the list of pipelines (i.e. in PipelineSerializer) I don't think this is ideal because I don't like the idea of RequestStore in general, but this is the easiest way to cache it without changing the architecture. In the future we should cache more explicitly rather than this kind of global store.
| * | | | | | | | | | | | | Update tests due to permission changesLin Jen-Shin2017-07-0414-46/+51
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix bad conflict resolutionLin Jen-Shin2017-07-044-19/+21
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-04281-2168/+5780
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (119 commits) Speed up operations performed by gitlab-shell Change the force flag to a keyword argument add image - issue boards - moving card copyedit == ee !2296 Reset @full_path to nil when cache expires Replace existing runner links with icons and tooltips, move into btn-group. add margin between captcha and register button Eagerly create a milestone that is used in a feature spec Adjust readme repo width Resolve "Issue Board -> "Remove from board" button when viewing an issue gives js error and fails" Set force_remove_source_branch default to false. Fix rubocop offenses Make entrypoint and command keys to be array of strings Add issuable-list class to shared mr/issue lists to fix new responsive layout New navigation breadcrumbs Restore timeago translations in renderTimeago. Fix curl example paths (missing the 'files' segment) Automatically hide sidebar on smaller screens Fix typo in IssuesFinder comment Make Project#ensure_repository force create a repo ...
| * | | | | | | | | | | | | | Consistently check permission for creating pipelines,Lin Jen-Shin2017-07-046-42/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updating builds and updating pipelines. We check against being able to merge or push if the ref is protected.
| * | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-06-294-1/+143
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: Make membership required for create_user_by_membership Fix sa use go instead of let proc Fixed typo and hash alighment Improve description_for Fix static analysis IMprove access_matchers Remove author. Replace Result to Got. Fix static analysys Resolve static analysis Add changelog. Add AccessMatchersForController Use authorize_update_pipeline_schedule in PipelineSchedulesController
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-06-292502-20759/+52918
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (1168 commits) Job details won't scroll horizontally to show long lines Bring back branches badge to main project page Limit OpenGraph image size to 64x64 Improve changelog Split up MergeRequestsController Add parent_id back to the tests Make changelog more descriptive Improve tests text Rename members_count to members_count_with_descendants and expose only to group admins Fix a bug where an invalid sort param value was passed to Gitaly Drop default ORDER scope when calling a find method on a Sortable model Add tests for project import state transition: [:started] => [:finished] Add CHANGELOG Perform housekeeping only when an import of a fresh project is completed Strip trailing whitespace in relative submodule URL Adjust projects spec on namespace fields Add "members_count" and "parent_id" data on namespaces API Removes redundant pending delete checks Fix gitaly ref encoding bugs Add ProjectWiki#ensure_repository ...
| * | | | | | | | | | | | | | | | Fix other tests which tested against error message30634-protected-pipelineLin Jen-Shin2017-06-072-2/+4
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-06-0780-1056/+1666
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: Fix missing tooltip and ARIA labels for accessibility Add info on using self-signed certs with Registry Introduce optimistic locking support via optional parameter last_commit_id on File Update API Move issuable bulk edit form into a new sidebar. Add PowerShell to CI variable docs Responsive environment tables Accept a username for User-level Events API Introduce an Events API Update GitLab Pages to v0.4.3 Allow numeric pages domain Remove references to old settings location Resolve "API: Environment info missed" Fix Projects API spec Update explanation of job-level variable override to fit example Per discussion Make sketch dynamic and link back to production architecture
| * | | | | | | | | | | | | | | | | Still allow legacy triggers, feedback:Lin Jen-Shin2017-06-062-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11910#note_31632911
| * | | | | | | | | | | | | | | | | Try to report why it's failing and fix testsLin Jen-Shin2017-06-068-20/+35
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Disallow legacy trigger without a ownerLin Jen-Shin2017-06-062-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11910#note_31594492 https://gitlab.com/gitlab-org/gitlab-ce/issues/30634#note_31601001
| * | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-06-06110-723/+2323
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (56 commits) Resolve "When changing project visibility setting, change other dropdowns automatically" change headings to improve SEO backports changed import logic from pull mirroring feature into CE Fix header component spec Add a Rake task to aid in rotating otp_key_base Remove unnecessary variable Add changelog entry Allow users to be hard-deleted from the admin user show page Allow users to be hard-removed from the admin users list page Support hard deletion in Admin::UsersController#destroy Add changelog entry Extract and memoize `user_access` Remove GitAccessStatus (no longer needed) Refactor construction of response Refactor to remove a special case Fix would-be regression Clarify error messages Refactor to let GitAccess errors bubble up Refactor to let `GitAccess` check protocol config Specify new Git-LFS-over-HTTP behavior ...
| * | | | | | | | | | | | | | | | | | Don't check permission, only protected ref if no userLin Jen-Shin2017-06-062-3/+64
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Add changelog entryLin Jen-Shin2017-06-061-0/+5
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Move the check to Pipeline.allowed_to_create?Lin Jen-Shin2017-06-064-13/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So that we could use it for the schedule before trying to use CreatePipelineService
| * | | | | | | | | | | | | | | | | | Forbid creating pipeline if it's protected andLin Jen-Shin2017-06-052-1/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cannot create the tag if it's a tag, and cannot merge the branch if it's a branch.
* | | | | | | | | | | | | | | | | | | Update CHANGELOG.md for 9.4.1James Edwards-Jones2017-07-2510-37/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | | | | | | | Merge branch 'bvl-fix-api-in-path-regex' into 'master'Dmitriy Zaporozhets2017-07-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `api` prefix as a top level route in the spec. See merge request !13077
| * | | | | | | | | | | | | | | | | | | Add `api` prefix as a top level route in the spec.bvl-fix-api-in-path-regexBob Van Landuyt2017-07-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that it has been removed from the rails routes. But it still needs to be a reserved top-level word, so the tests should know about this.
* | | | | | | | | | | | | | | | | | | | Merge branch '35000_add_ukrainian_translations_of_pipeline_schedules' into ↵Rémy Coutable2017-07-251-41/+64
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add Ukrainian translations of Pipeline Schedules Closes #35000 See merge request !12827
| * | | | | | | | | | | | | | | | | | | | synchronize ukrainian translation in zanata again黄涛2017-07-251-2/+2
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | synchronize ukrainian translation in zanata黄涛2017-07-251-39/+41
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | merge uk part.po to gitlab.po黄涛2017-07-202-42/+25
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | rebase to master黄涛2017-07-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '35000_add_ukrainian_translations_of_pipeline_schedules' of gitlab.com:htve/gitlab-ce into 35000_add_ukrainian_translations_of_pipeline_schedules
| | * | | | | | | | | | | | | | | | | | | | Add uk translation difference of Pipeline Schedules黄涛2017-07-131-0/+38
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Add uk translation difference of Pipeline Schedules黄涛2017-07-201-0/+38
| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch '35474-fix-new-issue' into 'master'Phil Hughes2017-07-252-2/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move relative_path to the element that is being clicked Closes #35474 See merge request !13079
| * | | | | | | | | | | | | | | | | | | | | | Move relative_path to the element that is being clickedJarka Kadlecova2017-07-252-2/+20
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'patch-24' into 'master'Filipa Lacerda2017-07-251-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add directives to Vue component ordering See merge request !13065
| * | | | | | | | | | | | | | | | | | | | | | Add directives to Vue component orderingSimon Knox2017-07-251-0/+1
| |/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'issue_34622' into 'master'Sean McGivern2017-07-2512-254/+544
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Group milestones API endpoint Closes #34622 See merge request !12819
| * | | | | | | | | | | | | | | | | | | | | | Add group milestones API endpointissue_34622Felipe Artur2017-07-2113-255/+545
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'clarify-v3-end-date-undefined' into 'master'Douwe Maan2017-07-251-3/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | v3 API is unsupported after 9.5, but may not be removed See merge request !13074
| * | | | | | | | | | | | | | | | | | | | | v3 API is unsupported after 9.5, but may not be removedSean McGivern2017-07-251-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That is, it may not _necessarily_ be removed. We do not provide guarantees for when API v3 will be available until beyond 9.5.
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'backport-ee-2328' into 'master'Sean McGivern2017-07-253-4/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2328 See merge request !13022
| * | | | | | | | | | | | | | | | | | | | | | Backport changes from ↵Nick Thomas2017-07-213-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2328
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'add-instrumentation-to-link-to-gfm' into 'master'Sean McGivern2017-07-252-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds link_to_gfm method instrumentation See merge request !13069
| * | | | | | | | | | | | | | | | | | | | | | | Adds link_to_gfm method instrumentationadd-instrumentation-to-link-to-gfmTiago Botelho2017-07-252-0/+7
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'new-navigation-custom-logo' into 'master'Filipa Lacerda2017-07-252-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed custom logo sizing in new navigation header Closes #35439 See merge request !13034
| * | | | | | | | | | | | | | | | | | | | | | | Fixed custom logo sizing in new navigation headernew-navigation-custom-logoPhil Hughes2017-07-242-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #35439
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bvl-port-inverse-protected-ref-to-ce' into 'master'Rémy Coutable2017-07-251-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly define inverse of acces_level relations See merge request !13068
| * | | | | | | | | | | | | | | | | | | | | | | | Explicitly define inverse of acces_level relationsbvl-port-inverse-protected-ref-to-ceBob Van Landuyt2017-07-251-1/+7
| | |_|_|_|_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bvl-free-unused-names' into 'master'Dmitriy Zaporozhets2017-07-253-20/+66
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Free some unused reserved top-level words. Closes #35053 See merge request !12932
| * | | | | | | | | | | | | | | | | | | | | | | | Take ee words into accountBob Van Landuyt2017-07-252-15/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to reserve these words in EE to support the upgrade path from CE to EE.
| * | | | | | | | | | | | | | | | | | | | | | | | Add contents of `public` as forbidden top-level routesBob Van Landuyt2017-07-251-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Remove a bunch of reserved top level routesBob Van Landuyt2017-07-251-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These don't seem to be used anywhere, so can be removed.