delta/gitlab/gitlab-ce.git/app/models, branch feature/github-edit-path gitlab.com: gitlab-org/gitlab-ce.git Fix broken spec due to last_activity_at updates being throttled 2016-09-20T05:59:15+00:00 Stan Hu stanhu@gmail.com 2016-09-20T02:59:29+00:00 cf9ee8fda7dbb42f388f0044b22bd3ff2b30048c 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. 
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 'throttle-last-activity-at' into 'master' 2016-09-19T15:30:54+00:00 Rémy Coutable remy@rymai.me 2016-09-19T15:30:54+00:00 9335953d12a9c72a3de7bb6ed48bcbeb9ff0357f 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 

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
 Restrict last_activity_at updates to one per hour 2016-09-19T14:48:58+00:00 Yorick Peterse yorickpeterse@gmail.com 2016-09-16T14:05:12+00:00 028c086f902f56e26db6382caa6131404ce74dcd The lock in turn is only obtained when actually needed, reducing some load on Redis. Fixes gitlab-org/gitlab-ce#22213 
The lock in turn is only obtained when actually needed, reducing some
load on Redis.

Fixes gitlab-org/gitlab-ce#22213
Merge branch 'per-build-token-without-lfs' into 'master' 2016-09-19T13:36:54+00:00 Rémy Coutable remy@rymai.me 2016-09-19T13:36:54+00:00 fe084819b4c0aa83ec80b5915e7b3f444b693e9f Make CI to use the permission of the user who is trigger the build This is continuation of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5735, but with removed all LFS code that is added by: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6043. This also incorporates most of LFS code added in !6043 to simplify further merge. See merge request !6409 

Make CI to use the permission of the user who is trigger the build

This is continuation of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5735, but with removed all LFS code that is added by: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6043.

This also incorporates most of LFS code added in !6043 to simplify further merge.

See merge request !6409
 Merge branch 'fix/import-export-db-errors' into 'master' 2016-09-19T13:02:49+00:00 Rémy Coutable remy@rymai.me 2016-09-19T13:02:49+00:00 1e72de669018252c2eb0bc086d66c74cfbbe1a0a Fix import/export database errors Fixes protected branches errors when importing a project including them Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21295 Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21799 See merge request !6099 

Fix import/export database errors

Fixes protected branches errors when importing a project including them

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

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

See merge request !6099
 Merge branch 'master' into per-build-token 2016-09-19T11:31:42+00:00 Kamil Trzcinski ayufan@ayufan.eu 2016-09-19T11:31:42+00:00 967eb8fb550b8225177b8cb7f87afd81cfd0c213 






Don't leak build tokens in build logs
2016-09-19T10:38:10+00:00

Kamil Trzcinski
ayufan@ayufan.eu

2016-09-19T10:38:03+00:00

b51ededc5fef05f94a632aa7651b5a1f7395bd4e












Cleanup changes
2016-09-19T08:07:14+00:00

Kamil Trzcinski
ayufan@ayufan.eu

2016-09-15T19:59:01+00:00

abfceb1e565490bb75e9a4fba0571cb2390fa5d8












Update support for dynamic environments
2016-09-19T08:07:13+00:00

Kamil Trzcinski
ayufan@ayufan.eu

2016-09-14T21:00:15+00:00

6b979687459ad1ab5f1953bf451ee80fdb899b96












Properly create deployment using all possible options
2016-09-19T08:07:12+00:00

Kamil Trzcinski
ayufan@ayufan.eu

2016-09-14T20:33:56+00:00

2cc9a785dfdada5e2976b8341d3c9e6eae8fa66f