delta/gitlab/gitlab-ce.git/app/controllers/projects/blob_controller.rb, branch commit_status

Add directory feature button

2015-10-07T11:22:55+00:00

Change "+" icon under "Files" section to have three options:

* Create file
* Upload file
* New directory

Upload file is no longer accessible from the "Create file" page.
Users can now select a target branch in upload file as well.

Closes #2799: Fixes a bug where file modes were overwritten after a commit

Closes https://github.com/gitlabhq/gitlabhq/issues/8253: Existing files
can no longer be overwritten in the "Create file" section.

Closes #2557

Move partial locals out of controller

2015-09-17T14:24:45+00:00

Change the replace placeholder to use the filename

2015-09-15T20:07:32+00:00

Dynamically adjust placedholder for uploads and fix Dropzone event handlers

Override error handler to prevent error messages from being inserted underneath image preview

Fix tests

Use regexp instead of startsWith for better browser compatibility

Remove duplicate code in _replace.html.haml and use one template

Remove files upon error and retain alert messages until user adds a new file

Add "Replace" and "Upload" features

2015-09-15T00:12:56+00:00

    Refactor upload and replace functionality

    Rename file and move CSS

    Fix typo

    Make dropzone a div

    Remove unnecessary file

    Change color of "upload existing one"

    Add missing changes

Revert "Merge branch 'revert-satellites' into 'master' "

2015-08-11T12:33:31+00:00

This reverts commit 5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa, reversing
changes made to 2f706fbd231cabe7a76a5d17ac44285aaaf8592c.

Revert "Refactor web editor"

2015-08-11T09:49:09+00:00

This reverts commit dfccb06dda344819989fa8d6a9a3c56c5ca0b65f.

Signed-off-by: Dmitriy Zaporozhets

Refactor web editor

2015-06-05T13:01:38+00:00

* fix problem with editing non-master branch
* before commit make sure branch exists
* dont allow user change file in one branch and commit to another existing branch
* remove a lot of code duplication
* remove outdated statellite errors

Signed-off-by: Dmitriy Zaporozhets

Fixed the Rails/ActionFilter cop

2015-04-20T13:39:37+00:00

Signed-off-by: Jeroen van Baarsen

Web Editor: save to new branch

2015-02-24T09:43:20+00:00

Merge branch 'master' into rails-4.1.9

2015-02-21T19:55:28+00:00

Conflicts:
	app/views/projects/commits/_commit.html.haml
	app/views/projects/issues/_issue.html.haml
	app/views/projects/issues/_issue_context.html.haml
	app/views/projects/merge_requests/_merge_request.html.haml
	app/views/projects/merge_requests/show/_context.html.haml