delta/gitlab/gitlab-ce.git/features, branch ci-https

MergeRequest new form load diff asynchronously

2016-10-06T09:19:14+00:00

Merge commit 'dev/security' into 'master'

2016-10-06T06:33:11+00:00

Signed-off-by: Rémy Coutable

Merge branch 'master' into revert-c676283b

2016-10-04T07:17:05+00:00

Merge branch 'fix/import-export-admin' into 'master'

2016-10-03T11:45:01+00:00


Enable Import/Export for non-admin users

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21315

Related https://gitlab.com/gitlab-org/gitlab-ce/issues/20857 and https://gitlab.com/gitlab-org/gitlab-ce/issues/20821/

See merge request !6080

Convert "SSH Keys" Spinach features to RSpec

2016-10-03T09:00:05+00:00

Enable import/export back for non-admins

2016-10-03T08:53:18+00:00

Merge branch 'master' into revert-c676283b

2016-10-03T08:10:20+00:00

Enforce the fork_project permission in Projects::CreateService

2016-09-27T12:17:56+00:00

Projects::ForkService delegates to this service almost entirely, but needed
one small change so it would propagate create errors correctly.

CreateService#execute needs significant refactoring; it is now right at the
complexity limit set by Rubocop. I avoided doing so in this commit to keep the
diff as small as possible.

Several tests depend on the insecure behaviour of ForkService, so fi them up at
the same time.

Add organization field to user profile

2016-09-27T11:04:39+00:00

Signed-off-by: Dmitriy Zaporozhets

Merge branch 'full-width-new-snippet-button' into 'master'

2016-09-26T21:09:19+00:00


Added full-width new snippet button on mobile and corrected capitalization

## What does this MR do?

Adds full-width `New snippet` button to snippet mobile views and corrects `New Snippet` to `New snippet` throughout.

## Are there points in the code the reviewer needs to double check?

## Why was this MR needed?

@connorshea Spotted that I missed this in !6210 :)

## Screenshots (if relevant)

![Screen_Shot_2016-09-16_at_10.40.21](/uploads/ddca2da3a5ef787298bfc87e129db820/Screen_Shot_2016-09-16_at_10.40.21.png)

## Does this MR meet the acceptance criteria?

- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
  - [ ] Added for this feature/bug
  - [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?

See merge request !6380