Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
le-parental-control
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
le6
le-parental-control
Merge requests
!4
Fixed le-lab annoucement and added conflicts with le-conf
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Fixed le-lab annoucement and added conflicts with le-conf
conflicts-leconf
into
master
Overview
2
Commits
2
Pipelines
3
Changes
3
Merged
Davisson Henrique Paulino
requested to merge
conflicts-leconf
into
master
7 years ago
Overview
2
Commits
2
Pipelines
3
Changes
3
Expand
O le-parental-control não estava habilitando e desabilitando o family shield na rede, resolvi isso
Adicionado conflicts com a versão do le-conf onde o family shield não foi removido ainda
Aceitar só se for aceitar o merge request: le-conf!37, pois remove completamente o family shield do le-conf
Problemas encontrados que não foram resolvidos nesse merge request:
SCRUM#423
Edited
7 years ago
by
Davisson Henrique Paulino
0
0
Merge request reports
Activity
All activity
Filter activity
Deselect all
Approvals
Assignees & reviewers
Comments (from bots)
Comments (from users)
Commits & branches
Edits
Labels
Lock status
Mentions
Merge request status
Tracking
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Please
register
or
sign in
to reply
Loading