Skip to content
Snippets Groups Projects

[WIP] Blob edit commit and continue editing button.

Closed gitlab-qa-bot requested to merge github/fork/cirosantilli/commit-continue-edit into master

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
44 44
45 45 def after_edit_path
46 46 @after_edit_path ||=
47 if from_merge_request
48 diffs_project_merge_request_path(from_merge_request.target_project, from_merge_request) +
49 "#file-path-#{hexdigest(@path)}"
47 if params[:continue_editing] == '1'
48 project_edit_tree_path(@project, @id)
50 49 else
51 project_blob_path(@project, @id)
50 if from_merge_request
51 diffs_project_merge_request_path(
  • Created by: houndci-bot

    Line is too long. [99/80]

    By Administrator on 2014-08-13T11:44:38 (imported from GitLab project)

    By Administrator on 2014-08-13T11:44:38 (imported from GitLab)

  • Created by: jvanbaarsen

    @dosire What do you think? Maybe this gets a little bit confusing?

    By Administrator on 2014-09-01T07:32:52 (imported from GitLab project)

    By Administrator on 2014-09-01T07:32:52 (imported from GitLab)

  • Created by: cirosantilli

    I agree that it is a bit confusing. But is there another alternative for this and the analogous AMR: http://feedback.gitlab.com/forums/176466-general/suggestions/5900530-add-button-on-wiki-edit-pages-to-save-continue-e

    Alternatives:

    • always continue editing by default with a single button
    • checkbox to continue editing. But that would kind of beat the purpose of having the button, which is to be able to very easily continue editing.

    By Administrator on 2014-09-01T07:37:38 (imported from GitLab project)

    By Administrator on 2014-09-01T07:37:38 (imported from GitLab)

  • Created by: dosire

    @cirosantilli Thanks for asking. Why only add this for blobs and not for all pages?

    By Administrator on 2014-09-01T08:09:46 (imported from GitLab project)

    By Administrator on 2014-09-01T08:09:46 (imported from GitLab)

  • Created by: cirosantilli

    @dosire I'm not sure what you mean by "all pages". Can you give an example of the other pages?

    By Administrator on 2014-09-01T08:15:27 (imported from GitLab project)

    By Administrator on 2014-09-01T08:15:27 (imported from GitLab)

  • Created by: dosire

    @cirosantilli Non blob pages? Or doesn't that make sense, I haven't looked into it very much.

    By Administrator on 2014-09-01T08:21:24 (imported from GitLab project)

    By Administrator on 2014-09-01T08:21:24 (imported from GitLab)

  • Created by: cirosantilli

    @dosire This feature makes most sense for objects that have commit history: blobs and wikis, as you will want to break up changes into logical chunks.

    It wouldn't make sense for objects like say, issues and comments, which don't have history.

    By Administrator on 2014-09-01T08:23:59 (imported from GitLab project)

    By Administrator on 2014-09-01T08:23:59 (imported from GitLab)

  • Created by: dosire

    @cirosantilli OK, thanks.

    @randx do you think a 'save and continue' button for the wiki should be added to GitLab in this form?

    By Administrator on 2014-09-01T09:39:22 (imported from GitLab project)

    By Administrator on 2014-09-01T09:39:22 (imported from GitLab)

  • Created by: dblessing

    @randx thoughts?

    By Administrator on 2014-10-24T03:30:11 (imported from GitLab project)

    By Administrator on 2014-10-24T03:30:11 (imported from GitLab)

  • Created by: jvanbaarsen

    ping @randx

    By Administrator on 2014-12-13T20:13:57 (imported from GitLab project)

    By Administrator on 2014-12-13T20:13:57 (imported from GitLab)

  • Created by: dzaporozhets

    The concept is ok but UI is not. I think buttons should be visually separated. Maybe something like this: screenshot 2014-12-31 11 12 21

    By Administrator on 2014-12-31T09:13:48 (imported from GitLab project)

    By Administrator on 2014-12-31T09:13:48 (imported from GitLab)

  • Created by: jvanbaarsen

    @cirosantilli I'll close this PR for now, since it also is using Travis CI, when you have time to continue working on this feature I propose you create a new PR and link to this one. If you don't agree, please let me know and I can re-open this one!

    By Administrator on 2015-02-07T22:08:49 (imported from GitLab project)

    By Administrator on 2015-02-07T22:08:49 (imported from GitLab)

  • Please register or sign in to reply
    Loading