delta/gitlab/gitlab-ce.git/app/controllers/application_controller.rb, branch feature/github-edit-path

remove Ability.abilities

2016-08-30T18:35:06+00:00

Remove gitorious

2016-08-25T09:10:10+00:00

Add Sentry logging to API calls

2016-08-24T19:09:51+00:00

Closes #21043

State specific default sort order for issuables

2016-08-01T09:28:56+00:00

Provide more sensible default sort order for issues and merge requests
based on the following table:

| type           | state  | default sort order |
|----------------|--------|--------------------|
| issues         | open   | last created       |
| issues         | closed | last updated       |
| issues         | all    | last created       |
| merge requests | open   | last created       |
| merge requests | merged | last updated       |
| merge requests | closed | last updated       |
| merge requests | all    | last created       |

Load Javascript U2F library selectively.

2016-07-14T02:49:09+00:00

1. Only on supported Chrome versions

2. Mainly, this lets us simplify the javascript-based U2F check to
   `window.u2f`, where `window.u2f` can either be loaded from the GitLab
   server (for Chrome) or from the Firefox extension.

3. This is a better way to provide browser detection for U2F.

Raise a new Gitlab::Access::AccessDeniedError when permission is not enough to destroy a member

2016-06-18T04:06:34+00:00

This is a try for a new approach to put the access checks at the service level.

Signed-off-by: Rémy Coutable

Merge branch 'feature/project-export' into 'master'

2016-06-17T15:35:27+00:00


Export project functionality

This is a MR for the export functionality of https://gitlab.com/gitlab-org/gitlab-ce/issues/3050, which adds the ability to export single projects.

- [x] members
- DB data
  - [x] issues
  - [x] issue comments
  - [x] merge requests
  - [x] merge request diff
  - [x] merge request comments
  - [x] labels
  - [x] milestones
  - [x] snippets
  - [x] releases
  - [x] events
  - [x] commit statuses
  - [x] CI builds
- File system data
  - [x] Git repository
  - [x] wiki
  - [x] uploads
  - [ ] ~~CI build traces~~
  - [ ] ~~CI build artifacts~~
  - [ ] ~~LFS objects~~
- DB configuration
  - [x] services
  - [x] web hooks
  - [x] protected branches
  - [x] deploy keys
  - [x] CI variables
  - [x] CI triggers

See merge request !3114

Implement @DouweM's feedback.

2016-06-16T02:54:13+00:00

- Extract a duplicated `redirect_to`
- Fix a typo: "token", not "certificate"
- Have the "Expires at" datepicker be attached to a text field, not inline
- Have both private tokens and personal access tokens verified in a
  single "authenticate_from_private_token" method, both in the
  application and API. Move relevant logic to
  `User#find_by_personal_access_token`
- Remove unnecessary constants relating to API auth. We don't need a
  separate constant for personal access tokens since the param is the
  same as for private tokens.

Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokens

2016-06-14T03:36:53+00:00

Merge branches 'feature/project-export-ui-experimental' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental

2016-06-13T12:00:19+00:00

# Conflicts:
#	Gemfile.lock
#	app/helpers/todos_helper.rb
#	app/models/todo.rb
#	app/views/projects/edit.html.haml
#	lib/gitlab/import_export/import_service.rb