Skip to content

GitLab

Merged
Created by Administrator@rootOwner

updated fork feature to use gitlab-shell for v5 of gitlab

Created by: amacarthur

Replaces pull request https://github.com/gitlabhq/gitlabhq/pull/3382

Dependent upon gitlab-shell pull request: https://github.com/gitlabhq/gitlab-shell/pull/45

This will provide a button on the project page which will create a fork of a project into their own namespace. The fork from/to relationship is recorded in anticipation of gitlab handling cross-repo pull requests.

Loading
Loading
  • Administrator
    Administrator @root ·
    Owner

    Created by: coveralls

    Coverage decreased (-11.91%) when pulling ae33fdf2 on amacarthur:fork-pull-request into 63b78a39 on gitlabhq:master.

    View Details

    By Administrator on 2013-04-15T07:00:04 (imported from GitLab project)

  • Administrator
    Administrator @root ·
    Owner

    Created by: elestedt

    Too bad that the build faild :(

    By Administrator on 2013-04-17T15:37:52 (imported from GitLab project)

  • Administrator
    Administrator @root ·
    Owner

    Created by: amacarthur

    Is there anyway to retry the build? The failure is in an area entirely unrelated to my changeset, and from what I've seen, capybara is prone to intermittent falure.

     1) On a merge request diff with muliple note forms posting a note should be added as discussion

Failure/Error: find('a[data-line-code="342e16cbbd482ac2047dc679b2749d248cc1428f_18_17"]').click

Capybara::Ambiguous:

Ambiguous match, found 2 elements matching css "a[data-line-code=\"342e16cbbd482ac2047dc679b2749d248cc1428f_18_17\"]"

# ./spec/features/notes_on_merge_requests_spec.rb:128:in `block (3 levels) in <top (required)>'

    By Administrator on 2013-04-18T19:36:15 (imported from GitLab project)

  • Administrator
    Administrator @root ·
    Owner

    Created by: fbender

    So if I understand correctly, you cannot merge (PR/MR) forks back into any branch of the original repo. However, I think it is vital for this feature to actually allow to send your work in the forked repo back to the original one. Is this being worked on somewhere else?

    By Administrator on 2013-04-28T22:17:20 (imported from GitLab project)

  • Administrator
    Administrator @root ·
    Owner

    Created by: amacarthur

    @fbender Yes - this is actively being worked on.

    By Administrator on 2013-04-29T03:26:56 (imported from GitLab project)

  • Administrator
    Administrator @root started a thread on commit ec638048
    app/models/ability.rb
    Unable to load the diff
    • Administrator
      Administrator @root ·
      Owner

      Created by: dzaporozhets

      allowing fork project for guest role is bad. Guest role does not have access to source code

      By Administrator on 2013-05-02T20:44:04 (imported from GitLab project)

  • Administrator
    Administrator @root started a thread on commit ec638048
    db/migrate/20130319214458_create_forked_project_links.rb
    1 class CreateForkedProjectLinks < ActiveRecord::Migration
    2 def change
    3 create_table :forked_project_links do |t|
    4 t.integer :forked_to_project_id, null: false
  • Administrator
    Administrator @root ·
    Owner

    Created by: dzaporozhets

    @amacarthur its almost in upstream. Few notes left :)

    By Administrator on 2013-04-30T08:47:02 (imported from GitLab project)

  • Administrator
    Administrator @root ·
    Owner

    Created by: amacarthur

    Excellent! Thanks @randx

    By Administrator on 2013-05-01T00:44:00 (imported from GitLab project)

  • Administrator
    Administrator @root ·
    Owner

    Created by: amacarthur

    I hope to update this pull request today. I have encountered a bug that I need to address before this should be merged.

    By Administrator on 2013-05-01T13:13:58 (imported from GitLab project)

  • Administrator
    Administrator @root ·
    Owner

    Created by: coveralls

    Coverage Status

    Coverage decreased (-12.81%) when pulling ec638048 on amacarthur:fork-pull-request into 63b78a39 on gitlabhq:master.

    By Administrator on 2013-05-02T21:08:47 (imported from GitLab project)

  • Administrator
    Administrator @root ·
    Owner

    Created by: amacarthur

    Travis build failed only when attempting to run with Ruby 2.0.0. The failure is due to a known Ruby 2.0.0 issue. See https://github.com/rails/rails/issues/9417#issuecomment-14054219

    By Administrator on 2013-05-02T21:13:24 (imported from GitLab project)

  • Administrator
    Administrator @root ·
    Owner

    Created by: dzaporozhets

    @amacarthur thank you. Lets merge it :)

    By Administrator on 2013-05-03T06:41:03 (imported from GitLab project)

  • Administrator
    Administrator @root ·
    Owner

    Created by: elestedt

    Wonderful. Thanks @amacarthur for all your work on this. And for not giving up 👍

    By Administrator on 2013-05-03T07:05:06 (imported from GitLab project)

  • Administrator
    Administrator @root ·
    Owner

    Created by: dzaporozhets

    @amacarthur since

    private method `initialize_dup' called for #<Project

    for ruby 2.0 we should find a better solution. We already use 3.2.13 and I'm not sure its rails related (even if true they are not going to provide a release in closest month I guess) so we should fix it.

    By Administrator on 2013-05-03T07:14:01 (imported from GitLab project)

  • Administrator
    Administrator @root ·
    Owner

    Created by: dzaporozhets

    @amacarthur Can you please make it work with ruby 2.0 today or should I fix it?

    By Administrator on 2013-05-03T07:14:52 (imported from GitLab project)

  • Administrator
    Administrator @root ·
    Owner

    Created by: PEM-FR

    This feature is an awesome addition to gitlab! 👍

    By Administrator on 2013-05-03T07:45:43 (imported from GitLab project)

  • Administrator
    Administrator @root ·
    Owner

    Created by: amacarthur

    @randx Looking into it now.

    By Administrator on 2013-05-03T13:52:42 (imported from GitLab project)

  • Administrator
    Administrator @root ·
    Owner

    Created by: amacarthur

    Thanks @PEM-FR and @elestedt .

    Thanks especially to @randx for being open-minded and accepting a change he was initially unsure of.
    GitLab rocks!

    By Administrator on 2013-05-03T13:55:41 (imported from GitLab project)

  • Administrator
    Administrator @root ·
    Owner

    Created by: amacarthur

    Fix for failure using ruby 2.0:

    https://github.com/gitlabhq/gitlabhq/pull/3829

    By Administrator on 2013-05-03T16:16:26 (imported from GitLab project)

  • Administrator
    Administrator @root ·
    Owner

    Created by: dzaporozhets

    @amacarthur thank you for quick fix :) Also thank you again for good contribution!

    By Administrator on 2013-05-05T10:41:41 (imported from GitLab project)

  • Administrator
    Administrator @root ·
    Owner

    Created by: junxy

    Suggest fork feature add configurable options, and default project features settings, Just like: gitlab.yml

        ## Default project features settings
    default_projects_features:
      issues: true
      merge_requests: true
      wiki: true
      wall: false
      snippets: false
      fork: false ##here

    Thanks!

    By Administrator on 2013-05-30T07:11:20 (imported from GitLab project)

Please register or sign in to reply

Menu

Help