delta/gitlab/gitlab-ce.git/lib/api/helpers.rb, branch fix-include-description-commit-message

Merge branch 'fix-api-mr-permissions' into 'security'

2017-01-22T17:05:56+00:00

Ensure that only privileged users can access merge requests in the API

See merge request !2053

Merge branch '21698-redis-runner-last-build' into 'master'

2017-01-20T14:00:48+00:00


Reduce DB-load for build-queues by storing last_update in Redis

See merge request !8084

Merge branch 'time-tracking-api' into 'master'

2017-01-19T09:58:48+00:00


Time tracking API

Closes #25861

See merge request !8483

Fix a API deprecation warning

2017-01-15T23:38:25+00:00

fix pipelines/index.html.haml merge conflict

2017-01-02T23:24:37+00:00

Merge branch 'fix-api-deprecation' into 'master'

2016-12-28T11:36:28+00:00


Fix a Grape deprecation, use `#request_method` instead of `#route_method`

See merge request !8297

Fix a Grape deprecation, use `#request_method` instead of `#route_method`

2016-12-23T18:07:23+00:00

Signed-off-by: Rémy Coutable

Add more storage statistics

2016-12-21T15:39:49+00:00

This adds counters for build artifacts and LFS objects, and moves
the preexisting repository_size and commit_count from the projects
table into a new project_statistics table.

The counters are displayed in the administration area for projects
and groups, and also available through the API for admins (on */all)
and normal users (on */owned)

The statistics are updated through ProjectCacheWorker, which can now
do more granular updates with the new :statistics argument.

Remove redundant pagination helpers after a bad merge

2016-12-21T14:19:00+00:00

[ci skip]

Merge branch 'master' into auto-pipelines-vue

2016-12-21T11:09:06+00:00

* master: (367 commits)
  Set “Remove branch” button to default size
  remove unused helper method
  reduce common code even further to satisfy rake flay
  remove button class size alteration from revert and cherry pick links
  factor out common code to satisfy rake flay
  homogenize revert and cherry-pick button styles generated by commits_helper
  apply margin on alert banners only when there is one or more alerts
  Rename MattermostNotificationService back to MattermostService
  Rename SlackNotificationService back to SlackService
  Fix stage and pipeline specs and rubocop offenses
  Added QueryRecorder to test N+1 fix on Milestone#show
  Use gitlab-workhorse 1.2.1
  Make 'unmarked as WIP' message more consistent
  Improve specs for Files API
  Allow unauthenticated access to Repositories Files API GET endpoints
  Add isolated view spec for pipeline stage partial
  Move test for HTML stage endpoint to controller specs
  Fix sizing of avatar circles; add border
  Fix broken test
  Fix broken test Changes after review
  ...

Conflicts:
	app/assets/stylesheets/pages/pipelines.scss
	app/controllers/projects/pipelines_controller.rb
	app/views/projects/pipelines/index.html.haml
	spec/features/projects/pipelines/pipelines_spec.rb