delta/gitlab/gitlab-ce.git/spec/features/projects, branch koding-setting-api

Revert "Merge branch '18297-i-would-like-text-to-wrap-when-in-edit-mode-on-web-app' into 'master'"

2016-09-29T00:56:30+00:00

This reverts merge request !6188

Added soft wrap logic and button to editor

2016-09-28T16:11:11+00:00

Added tests

Added awesomeeeeee icons

Fix snippets pagination

2016-09-26T10:42:12+00:00

Signed-off-by: Rémy Coutable

fixing security specs after merge

2016-09-21T12:36:28+00:00

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

2016-09-21T09:22:02+00:00

Merge branch 'slash-commands-load-fix' into 'master'

2016-09-20T19:16:15+00:00


Fixed slash commands not loading

## What does this MR do?

Fixes an issue with slash commands not working when the autocomplete source is loading & then the new issue button is clicked. This also fixes an issue where the autocomplete source is loaded on pages where it isn't actually needed.

## What are the relevant issue numbers?

Closes #21774, #21807

See merge request !6207

Merge remote-tracking branch 'upstream/master' into fix-download-artifacts-button-link

2016-09-20T06:10:48+00:00

* upstream/master: (80 commits)
  Contributing via GH no longer encouraged.
  Update README.md to really fix icon
  Update README.md to fix icon
  Allow to set request_access_enabled for groups and projects using API
  Restrict last_activity_at updates to one per hour
  Solve code review comments
  Properly support Gitlab::Auth::Result
  Revert all changes introduced by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6043
  Move Gitlab::Auth.Result to separate file
  Added CHANGELOG
  Fix spec failures
  Support pushing via SSH
  Fix specs failures
  Don't leak build tokens in build logs
  Fix permissions for creating container images
  Fix old CHANGELOG entries
  Add linting for duplicate CHANGELOG versions (!6039)
  Ensure validation messages are shown within the milestone form
  Fix validation regexs (+1 squashed commit) Squashed commits: [f9a9315] Use : to test invalid environment name
  Fix scope of the CI config key nodes in jobs entry
  ...

Merge branch 'feature/import-export-security-specs' into 'master'

2016-09-20T04:44:54+00:00


Import/Export security specs

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

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

See merge request !1987

squashed - Fix DB exceptions raised importing some specific projects.

2016-09-19T07:18:37+00:00

Better import of labels, milestones and protected branches. Updated relevant specs.
Loose pipeline validation on importing, so it does not fail when there are missing fields, which are not validated at DB level. Also, updated spec with relevant test.

Fix download artifacts button link:

2016-09-19T05:12:45+00:00

Rails ignored unused arguments and ref_name_and_path is the last
path argument, therefore we need to concatenate that parts ourselves.

Otherwise, 'download' won't be shown at all.