delta/gitlab/gitlab-ce.git/spec, branch feature/github-edit-path

modify github import JS and controller so we can now specify a namespace and/or name for a project.

2016-09-20T08:14:39+00:00

- Fixed and added specs.
- Added different namespace options depending on user privilages
- Updated docs.

Merge branch 'sh-fix-last-activity-at-specs' into 'master'

2016-09-20T07:20:17+00:00


Fix broken spec due to last_activity_at updates being throttled

In https://gitlab.com/gitlab-org/gitlab-ce/builds/4218398, the build failed because the last_activity_at column was only being updated once per hour. We
can fix this spec by stubbing out the throttling and adjusting the spec to test the right event timestamp.

See merge request !6424

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
  ...

Fix broken spec due to last_activity_at updates being throttled

2016-09-20T05:59:15+00:00

In https://gitlab.com/gitlab-org/gitlab-ce/builds/4218398, the build failed
because the last_activity_at column was only being updated once per hour. We
can fix this spec by stubbing out the throttling and adjusting the spec to
test the right event timestamp.

Merge branch 'strip-key-comments-for-gitlab-shell' into 'master'

2016-09-20T05:42:03+00:00


Strip comments before sending keys to gitlab-shell

## Why was this MR needed?

https://gitlab.com/gitlab-org/gitlab-ce/issues/22167 encoding issues in comment text.

## What are the relevant issue numbers?

https://gitlab.com/gitlab-org/gitlab-ce/issues/22167

See merge request !6381

Merge branch '22065-group-members-api-returning-null-user-details' into 'master'

2016-09-20T05:20:47+00:00


Ensure invitees are not returned in Members API

## What are the relevant issue numbers?

Closes #22065

See merge request !6370

Merge branch 'master' into '21961-issues-filtering-issue-with-labels-that-contain-spaces'

2016-09-19T19:33:23+00:00

# Conflicts:
#   app/assets/javascripts/gl_dropdown.js

Merge branch 'issue_20978' into 'master'

2016-09-19T15:53:40+00:00


Allow to set request_access_enabled for groups and projects using API

Closes #20978

See merge request !6359

Merge branch 'sh-prevent-duplicate-protected-branches-on-push' into 'master'

2016-09-19T15:36:57+00:00


Only create a protected branch upon a push to a new branch if a rule for that branch doesn't exist

A customer ran into an issue where a Sidekiq task retried over and over, leading to duplicate master branches in their protected branch list.
    
Closes #22177

See merge request !6399

Merge branch 'throttle-last-activity-at' into 'master'

2016-09-19T15:30:54+00:00


Restrict last_activity_at updates to one per hour

This MR reduces the number of updates to `projects.last_activity_at` to once per hour.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/22213

See merge request !6391