diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-30 14:18:19 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-30 14:18:19 -0700 |
| commit | 661c9f0f8fb2b1bce8ec0d4580d3684b0da856b9 (patch) | |
| tree | 61fb2a18b580c0b235c1b353e83575d4a673aa84 | |
| parent | 6574bffef6b01a45e3b02f72f9f2c1eb6b39aea8 (diff) | |
| parent | fe7992a5249b84376aced47696ee1306f3d9799b (diff) | |
| download | gitlab-ce-661c9f0f8fb2b1bce8ec0d4580d3684b0da856b9.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | docker/Dockerfile | 2 | ||||
| -rw-r--r-- | lib/api/projects.rb | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index 90bd9db8c33..37054da46b8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -47,6 +47,9 @@ v 7.10.0 (unreleased) - Prevent holding Control-Enter or Command-Enter from posting comment multiple times. - Prevent note form from being cleared when submitting failed. - Improve file icons rendering on tree (Sullivan Sénéchal) + - API: Add pagination to project events + +v 7.9.0 - Send EmailsOnPush email when branch or tag is created or deleted. - Faster merge request processing for large repository - Prevent doubling AJAX request with each commit visit via Turbolink diff --git a/docker/Dockerfile b/docker/Dockerfile index b228a66832a..f0a8b9f53df 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -11,7 +11,7 @@ RUN apt-get update -q \ # If the Omnibus package version below is outdated please contribute a merge request to update it. # If you run GitLab Enterprise Edition point it to a location where you have downloaded it. RUN TMP_FILE=$(mktemp); \ - wget -q -O $TMP_FILE https://downloads-packages.s3.amazonaws.com/ubuntu-14.04/gitlab_7.9.0-omnibus.2-1_amd64.deb \ + wget -q -O $TMP_FILE https://downloads-packages.s3.amazonaws.com/ubuntu-14.04/gitlab_7.9.1-omnibus.1-1_amd64.deb \ && dpkg -i $TMP_FILE \ && rm -f $TMP_FILE diff --git a/lib/api/projects.rb b/lib/api/projects.rb index 620922092de..e3fff79d68f 100644 --- a/lib/api/projects.rb +++ b/lib/api/projects.rb @@ -88,7 +88,7 @@ module API present user_project, with: Entities::ProjectWithAccess, user: current_user end - # Get a single project events + # Get events for a single project # # Parameters: # id (required) - The ID of a project |