Labels Milestones

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

Merged

Yelisson merged 1 commits from 5- into master 6 years ago

Conversation 11 Commits 1 Files Changed 1

Yelisson commented 6 years ago (Migrated from gitlab.com)

Closes #5

Closes #5

Yelisson commented 6 years ago (Migrated from gitlab.com)

restored source branch 5-

restored source branch `5-`

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

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 6 years ago (Migrated from gitlab.com)

added 1 commit

• f9f287c1 - Задача №5

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 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)

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

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

Yelisson commented 6 years ago (Migrated from gitlab.com)

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 6 years ago (Migrated from gitlab.com)

added 1 commit

• 31c7c857 - Задача №5 new

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 6 years ago (Migrated from gitlab.com)

added 1 commit

• 0219b0ce - fix paper view

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 6 years ago (Migrated from gitlab.com)

enabled an automatic merge when the pipeline for 0219b0ce28 succeeds

enabled an automatic merge when the pipeline for 0219b0ce28439d75ad3b1804d739e01d5eab9248 succeeds

romanov73 commented 6 years ago (Migrated from gitlab.com)

merged

merged

romanov73 commented 6 years ago (Migrated from gitlab.com)

mentioned in commit 89f4b04a3f

mentioned in commit 89f4b04a3fc89140ee24544fd5bb87eb15c2646b

The pull request has been merged as 89f4b04a3f.

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 5- master

git pull origin 5-

Step 2:

Merge the changes and update on Gitea.

git checkout master

git merge --no-ff 5-

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

Subscribe

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

Write Preview

Loading…

Cancel

Save

There is no content yet.