Skip to content

Navigation Menu

Appearance settings

View all features
- BY COMPANY SIZE
  Enterprises
  Small and medium teams
  Startups
  Nonprofits
- BY USE CASE
  App Modernization
  DevSecOps
  DevOps
  CI/CD
  View all use cases
- BY INDUSTRY
  Healthcare
  Financial services
  Manufacturing
  Government
  View all industries
View all solutions
- EXPLORE BY TOPIC
  AI
  Software Development
  DevOps
  Security
  View all topics
- EXPLORE BY TYPE
  Customer stories
  Events & webinars
  Ebooks & reports
  Business insights
  GitHub Skills
- SUPPORT & SERVICES
  Documentation
  Customer support
  Community forum
  Trust center
  Partners
View all resources
- COMMUNITY
  GitHub SponsorsFund open source developers
- PROGRAMS
  Security Lab
  Maintainer Community
  Accelerator
  GitHub Stars
  Archive Program
- REPOSITORIES
  Topics
  Trending
  Collections
- ENTERPRISE SOLUTIONS
  Enterprise platformAI-powered developer platform
- AVAILABLE ADD-ONS
  GitHub Advanced SecurityEnterprise-grade security features
  Copilot for BusinessEnterprise-grade AI features
  Premium SupportEnterprise-grade 24/7 support
Pricing

Search code, repositories, users, issues, pull requests...

Search

Clear

Search syntax tips

Provide feedback

We read every piece of feedback, and take your input very seriously.

Include my email address so I can be contacted

Saved searches

Use saved searches to filter your results more quickly

Name

Query

To see all available qualifiers, see our documentation.

Appearance settings

You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session. You switched accounts on another tab or window. Reload to refresh your session.

Dismiss alert

Ada-C4 / typo Public

forked from publify/publify

Notifications You must be signed in to change notification settings
Fork 19
Star 0

Code
Pull requests 13
Actions
Projects
Wiki
Security and quality
Insights

Additional navigation options

Code
Pull requests
Actions
Projects
Wiki
Security and quality
Insights

Create Merge Feature#34

Open

jbuechs wants to merge 38 commits intoAda-C4:masterAda-C4/typo:masterfrom

jbuechs:masterjbuechs/typo:masterCopy head branch name to clipboard

Conversation Commits38 (38)Checks Files changed

Open

Create Merge Feature#34
jbuechs wants to merge 38 commits intoAda-C4:masterfrom
jbuechs:master

Commits

Commits on Mar 28, 2016

complete setup
jbuechs
committed
add better errors
jbuechs
committed
add pry
jbuechs
committed
create stubs for adding and editing category features
jbuechs
committed
check for id in params to determine whether new or editing category
jbuechs
committed
bugfix for empty category name
jbuechs
committed
update dbs
jbuechs
committed
add tests for new category
jbuechs
committed
create cucumber tests for creating a category
jbuechs
committed
create feature tests for category
jbuechs
committed
create tests for valid and invalid updating of category
jbuechs
committed
spec/controllers/accounts_controller_spec.rb
jbuechs
committed
add update category tests to cucumber
jbuechs
committed
add update category tests to cucumber
jbuechs
committed
update dbs
jbuechs
committed
remove db files from commit
jbuechs
committed
remove pry
jbuechs
committed
change test description for clarity
jbuechs
committed

Commits on Mar 29, 2016

create test for adding merge to new article form
jbuechs
committed
add test that contributor does not see merge form
jbuechs
committed
showing merge form for admin
jbuechs
committed
create test for merging text
jbuechs
committed
format tables
jbuechs
committed
separate article_merge tests into admin and not admin
jbuechs
committed
update admin features to not show merge on new page
jbuechs
committed
complete tests for merging text of two articles
jbuechs
committed
implement feature for merging text of two articles
jbuechs
committed

Commits on Mar 31, 2016

create test for merging comments
jbuechs
committed
merge comments
jbuechs
committed
create test for deleting merged article
jbuechs
committed
delete merged article
jbuechs
committed
delete merged article
jbuechs
committed
Merge branch 'master' of github.com:jbuechs/typo
jbuechs
committed
remove pry and rename variable to be more meaningful
jbuechs
committed

Commits on Apr 1, 2016

move merge function to model and create transaction
jbuechs
committed
add db file to gitignore
jbuechs
committed
only query all articles when admin and editing
jbuechs
committed
refactor merging comments
jbuechs
committed

Footer

© 2026 GitHub, Inc.

Footer navigation

Terms
Privacy
Security
Status
Community
Docs
Contact

You can’t perform that action at this time.