romanov73
/
ng-tracker
1
0
Fork 0
Code Issues 18 Pull Requests 4 Projects Releases Wiki Activity

Labels Milestones

Resolve "Фильтр статей" #145

Merged
alefly merged 1 commits from 14-filter-frontend into master 6 years ago
Conversation 7 Commits 1 Files Changed 2
alefly commented 6 years ago (Migrated from gitlab.com)

Closes #14

Closes #14
alefly commented 6 years ago (Migrated from gitlab.com)

added 36 commits

  • 4c0ccbe2...e84e5423 - 31 commits from branch master
  • 02f762b4 - filter
  • 5eff1bac - Merge branch 'master' of C:\Users\катя\IdeaProjects\ng-tracker with conflicts.
  • df6bc223 - Merge remote-tracking branch 'origin/master'
  • a9ea796b - Merge branch 'master' into 14-filter-frontend
  • f5068f8b - filter

Compare with previous version

added 36 commits <ul><li>4c0ccbe2...e84e5423 - 31 commits from branch <code>master</code></li><li>02f762b4 - filter</li><li>5eff1bac - Merge branch &#39;master&#39; of C:\Users\катя\IdeaProjects\ng-tracker with conflicts.</li><li>df6bc223 - Merge remote-tracking branch &#39;origin/master&#39;</li><li>a9ea796b - Merge branch &#39;master&#39; into 14-filter-frontend</li><li>f5068f8b - filter</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/18/diffs?diff_id=27985343&start_sha=4c0ccbe2858e2eeb55faf64b5620c80a5ac53a6f)
alefly commented 6 years ago (Migrated from gitlab.com)

assigned to @romanov73

assigned to @romanov73
alefly commented 6 years ago (Migrated from gitlab.com)

unmarked as a Work In Progress

unmarked as a **Work In Progress**
romanov73 commented 6 years ago (Migrated from gitlab.com)

added 1 commit

Compare with previous version

added 1 commit <ul><li>13f9081a - fix failed commit</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/18/diffs?diff_id=28015390&start_sha=f5068f8be94caa6d791ffd0b93f0970d30ae9bb7)
romanov73 commented 6 years ago (Migrated from gitlab.com)

enabled an automatic merge when the pipeline for 13f9081aee succeeds

enabled an automatic merge when the pipeline for 13f9081aee467645bef58644fdee1aa38dffc73f succeeds
romanov73 commented 6 years ago (Migrated from gitlab.com)

mentioned in commit aee396f686

mentioned in commit aee396f686e911ef16298d92afb0267428b4fbff
romanov73 commented 6 years ago (Migrated from gitlab.com)

merged

merged
The pull request has been merged as aee396f686.
You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.
git checkout -b 14-filter-frontend master
git pull origin 14-filter-frontend

Step 2:

Merge the changes and update on Gitea.
git checkout master
git merge --no-ff 14-filter-frontend
git push origin master
Sign in to join this conversation.
Reviewers
Request review
No reviewers
Labels
Apply labels
Clear labels   
backend
   
bug
   
frontend
   
выполнить первой
   
выполняется
   
конференции
   
события
   
статьи
No Label
backend
bug
frontend
выполнить первой
выполняется
конференции
события
статьи
Milestone
Set milestone
Clear milestone
No items
No Milestone
Статьи
Projects
Set Project
Clear projects
No project
Assignees
Assign users
Clear assignees
No Assignees
1 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: romanov73/ng-tracker#145
Write Preview
Loading…
Cancel
Save
There is no content yet.
Delete Branch '14-filter-frontend'

Deleting a branch is permanent. It CANNOT be undone. Continue?

No
Yes