Skip to content

GitLab Addon [#OSF-8169]#7418

Merged
sloria merged 5 commits intoCenterForOpenScience:developfrom
mfraezz:feature/gitlab-django
Nov 21, 2017
Merged

GitLab Addon [#OSF-8169]#7418
sloria merged 5 commits intoCenterForOpenScience:developfrom
mfraezz:feature/gitlab-django

Conversation

@mfraezz
Copy link
Member

@mfraezz mfraezz commented Jul 3, 2017 •
edited
Loading

Updates #5929

Purpose

Implement the GitLab addon according to the GitLab Integration Grant Spec at https://gist.github.com/felliott/cc3d48a492c174545b7f

Changes

"This add-on will allow users to specify a GitLab instance to communicate with, and then connect their GitLab account to their OSF account via an OAuth token. Users may then connect a project for which they have admin rights to one of their GitLab-hosted repositories. Users should also be able to change which repository is linked to a given project at any time and revoke permissions from any or all projects as desired."

Side effects

None expected

# MIGRATION WARNING
Not only does this share a migration number (0042) with #7409 , that migration has a conflicting action -- altering possible types for BaseFileNode.
### Running makemigrations --merge will NOT be sufficient.
Instead, whichever PR goes in last will need the migration recreated before being merged.

This has been fixed. This is true again for #7653

Ticket

[OSF-8169]

This was referenced Jul 3, 2017
Merged
Closed
@mfraezz mfraezz force-pushed the feature/gitlab-django branch 5 times, most recently from 90fe9d7 to 63a72d3 Compare July 10, 2017 14:25
@felliott felliott mentioned this pull request Aug 1, 2017
Closed
@mfraezz mfraezz force-pushed the feature/gitlab-django branch 6 times, most recently from b6bc8a6 to 9be0f8b Compare August 17, 2017 20:43
@mfraezz mfraezz force-pushed the feature/gitlab-django branch 2 times, most recently from 16cb9ef to 00e905e Compare August 22, 2017 21:24
@mfraezz mfraezz changed the title [WIP] GitLab Addon [#OSF-8169] GitLab Addon [#OSF-8169] Aug 22, 2017
@mfraezz mfraezz force-pushed the feature/gitlab-django branch from 00e905e to b3801d8 Compare October 24, 2017 15:47
@mfraezz mfraezz force-pushed the feature/gitlab-django branch from b3801d8 to 277b6ef Compare October 24, 2017 18:32
sloria
sloria reviewed Nov 21, 2017
View reviewed changes
addons.json
"github": "partial",
"gitlab": "partial",
"owncloud": "partial",
"gitlab": "partial",
Copy link
Contributor

@sloria sloria Nov 21, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a duplicate entry.

sloria
sloria approved these changes Nov 21, 2017
View reviewed changes
Copy link
Contributor

@sloria sloria left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me. Will get staging set up then merge this.

@sloria sloria merged commit 277b6ef into CenterForOpenScience:develop Nov 21, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@sloria sloria sloria approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@mfraezz @sloria @danielneis @luismulinari @rafaeldelucena