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

Resolve "Верстка страницы статьи" #132

Merged
Yelisson merged 1 commits from 5- into master 2018-10-10 17:18:27 +04:00
Conversation 11 Commits 1 Files Changed 1 +47 -151
Yelisson commented 2018-09-26 15:36:55 +04:00 (Migrated from gitlab.com)
Copy Link

Closes #5

Closes #5
Yelisson commented 2018-09-26 15:37:04 +04:00 (Migrated from gitlab.com)
Copy Link

restored source branch 5-

restored source branch `5-`
alefly commented 2018-09-26 16:45:48 +04:00 (Migrated from gitlab.com)
Copy Link

added 9 commits

  • 88f42e90...f00a156c - 6 commits from branch master
  • 48d3b575 - add paper page
  • 5b16ac78 - Merge branch 'master' into 23-dashboard
  • fae56666 - Merge branch 'master' into 5-Page-of-paper

Compare with previous version

added 9 commits <ul><li>88f42e90...f00a156c - 6 commits from branch <code>master</code></li><li>48d3b575 - add paper page</li><li>5b16ac78 - Merge branch &#39;master&#39; into 23-dashboard</li><li>fae56666 - Merge branch &#39;master&#39; into 5-Page-of-paper</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/5/diffs?diff_id=23951047&start_sha=88f42e90b552fd5db7070944d5eb937803a147a7)
Yelisson commented 2018-10-04 10:42:48 +04:00 (Migrated from gitlab.com)
Copy Link

added 1 commit

Compare with previous version

added 1 commit <ul><li>f9f287c1 - Задача №5</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/5/diffs?diff_id=24447059&start_sha=fae5666694e7c191b1b3cf306d0ee3bb62598814)
Yelisson commented 2018-10-04 10:47:59 +04:00 (Migrated from gitlab.com)
Copy Link

unmarked as a Work In Progress

unmarked as a **Work In Progress**
romanov73 commented 2018-10-04 23:14:48 +04:00 (Migrated from gitlab.com)
Copy Link

Влейте изменения из ветки matser в свою ветку, там сейчас конфликты. Как это делать мы на последней нашей встрече рассматривали.

Влейте изменения из ветки matser в свою ветку, там сейчас конфликты. Как это делать мы на последней нашей встрече рассматривали.
Yelisson commented 2018-10-10 15:00:35 +04:00 (Migrated from gitlab.com)
Copy Link

added 14 commits

  • f9f287c1...2a493205 - 13 commits from branch master
  • 95e366ca - Merge branch 'master' into 5-Matveeva-Page

Compare with previous version

added 14 commits <ul><li>f9f287c1...2a493205 - 13 commits from branch <code>master</code></li><li>95e366ca - Merge branch &#39;master&#39; into 5-Matveeva-Page</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/5/diffs?diff_id=24822586&start_sha=f9f287c190ac96a3efba20b8cee8c67d81c47f52)
Yelisson commented 2018-10-10 15:31:07 +04:00 (Migrated from gitlab.com)
Copy Link

added 1 commit

Compare with previous version

added 1 commit <ul><li>31c7c857 - Задача №5 new</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/5/diffs?diff_id=24824668&start_sha=95e366ca20583a85b41500a545f0db1e79e25297)
romanov73 commented 2018-10-10 17:08:20 +04:00 (Migrated from gitlab.com)
Copy Link

added 1 commit

Compare with previous version

added 1 commit <ul><li>0219b0ce - fix paper view</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/5/diffs?diff_id=24831772&start_sha=31c7c8571ed0e151e375339724239293262a1caa)
romanov73 commented 2018-10-10 17:10:22 +04:00 (Migrated from gitlab.com)
Copy Link

enabled an automatic merge when the pipeline for 0219b0ce28 succeeds

enabled an automatic merge when the pipeline for 0219b0ce28439d75ad3b1804d739e01d5eab9248 succeeds
romanov73 commented 2018-10-10 17:18:27 +04:00 (Migrated from gitlab.com)
Copy Link

merged

merged
romanov73 commented 2018-10-10 17:18:27 +04:00 (Migrated from gitlab.com)
Copy Link

mentioned in commit 89f4b04a3f

mentioned in commit 89f4b04a3fc89140ee24544fd5bb87eb15c2646b
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
backend

   
bug

   
frontend

   
выполнить первой

   
выполняется

   
конференции

   
события

   
статьи
No Label
backend
bug
frontend
выполнить первой
выполняется
конференции
события
статьи
Milestone
Clear milestone
No items
No Milestone
Статьи
Projects
Clear projects
No project
Assignees
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#132
No description provided.
Delete Branch "5-"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?