Dmitriy Zaporozhets 15281bdd26 Merge branch 'ff-merge' into 'master' ...

Fast-forward merge button

For #337, #338 

- [x] fast-forward merge option in project settings
- [x] fast-forward merge button
- [x] message if ff is not possible
- [x] rebase button if ff is not possible and rebase is enabled
- [x] rebase button depends on ff-only setting
- [x] remove `rebase enabled by default` checkbox from project settings
- [x] implement rebase feature
- [x] write tests
- [x] update CHANGELOG and documentation
- [x] mention in 8.0 blog post

See merge request !485

2015-09-10 10:01:49 +00:00

..

blame

Improve perofrmance of git blame

2015-08-26 16:39:55 +03:00

blob

Merge master from CE

2015-08-17 14:01:32 +02:00

branches

Merge master from CE

2015-08-17 14:01:32 +02:00

buttons

UI Improvement for the project page

2015-08-25 17:58:29 +02:00

commit

Support commenting on a diff in side-by-side view

2015-06-16 06:11:59 -07:00

commits

Merge branch 'ui-improvements' into 'master'

2015-07-01 09:40:44 +00:00

compare

Remove disableButtonIf[Any]EmptyField calls from forms

2015-06-26 22:07:59 -04:00

deploy_keys

Limit content width for big screens except certain pages

2015-08-26 11:51:28 +02:00

diffs

Limit content width for big screens except certain pages

2015-08-26 11:51:28 +02:00

forks

Add a page title to every page.

2015-04-30 19:12:15 +02:00

git_hooks

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-ee

2015-05-05 10:18:27 +02:00

graphs

Change plots to bar graphs

2015-08-25 19:44:59 +02:00

group_links

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-ee

2015-05-05 10:18:27 +02:00

hooks

Add support for Webhook note events

2015-05-21 23:48:16 -04:00

imports

Add a page title to every page.

2015-04-30 19:12:15 +02:00

issues

Show who last edited a comment if it wasn't the original author

2015-07-30 14:45:54 +02:00

labels

Make edit/remove label buttons smaller

2015-07-10 14:27:12 +02:00

merge_requests

Merge branch 'ff-merge' into 'master'

2015-09-10 10:01:49 +00:00

milestones

Add support for destroying project milestones

2015-07-17 06:54:32 -07:00

network

Fix network graph when branch name has single quotes

2015-07-29 23:29:47 -07:00

notes

Merge branch 'master' into comment-updated-by

2015-08-07 15:05:17 +02:00

project_members

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-06-09 19:24:37 +02:00

protected_branches

Add a page title to every page.

2015-04-30 19:12:15 +02:00

refs

Fix commit data retrieval when branch name has single quotes

2015-07-26 03:47:01 -07:00

repositories

Align project download button with others in sidebar on project home page

2015-04-14 17:08:01 +03:00

services

Add a page title to every page.

2015-04-30 19:12:15 +02:00

snippets

Rename abilities to correspond contoller/model action names

2015-06-26 15:55:56 +02:00

tags

Capitalize "X" in "New X".

2015-04-30 21:33:02 +02:00

tree

Merge master from CE

2015-08-17 14:01:32 +02:00

wikis

Added a timestamp to the wikis page just below the title

2015-07-27 17:41:31 -04:00

_activity.html.haml

Allow user to specify content he wants to see on project page

2015-07-13 18:24:15 +02:00

_bitbucket_import_modal.html.haml

Import sources: show only enabled sources

2015-08-20 12:13:22 +02:00

_commit_button.html.haml

Remove mention of branch to commit to.

2015-03-19 17:43:21 -07:00

_errors.html.haml

alert-error to alert-danger

2013-12-31 16:34:14 +02:00

_github_import_modal.html.haml

Import sources: show only enabled sources

2015-08-20 12:13:22 +02:00

_gitlab_import_modal.html.haml

Import sources: show only enabled sources

2015-08-20 12:13:22 +02:00

_home_panel.html.haml

Improve project name/description look on project page

2015-08-26 10:21:51 +02:00

_last_push.html.haml

Show last push widget on several project pages

2015-07-08 23:21:35 +02:00

_md_preview.html.haml

Add negative tabindex to Markdown Write and Preview tabs

2015-06-10 16:34:51 -04:00

_merge_request_settings.html.haml

Fix name and description for ff-only merge checkbox

2015-09-01 11:01:55 +02:00

_readme.html.haml

Allow user to specify content he wants to see on project page

2015-07-13 18:24:15 +02:00

_zen.html.haml

Comment box/Placeholder text redo

2015-07-01 15:49:31 -07:00

activity.html.haml

Allow user to specify content he wants to see on project page

2015-07-13 18:24:15 +02:00

edit.html.haml

Rebase button depends on ff-only merge feature

2015-08-27 16:46:47 +02:00

empty.html.haml

Merge master from CE

2015-08-17 14:01:32 +02:00

go_import.html.haml

Render go-import meta tag for private repos.

2015-03-03 11:22:30 +01:00

new.html.haml

Import sources: show only enabled sources

2015-08-20 12:13:22 +02:00

no_repo.html.haml

Introduce shortcuts for routing helpers

2015-02-25 19:34:16 -08:00

show.atom.builder

Fix Atom feeds.

2015-05-21 11:39:33 +02:00

show.html.haml

Add size information back to project summary screen.

2015-08-20 12:47:55 +00:00

transfer.js.haml

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

update.js.haml

Move jQuery enable/disable extensions to extensions/jquery

2015-06-02 20:32:07 -04:00