delta/gitlab/gitlab-ce.git/lib, branch gitlab-flow gitlab.com: gitlab-org/gitlab-ce.git Merge pull request #7558 from bbodenmiller/patch-4 2014-08-23T20:50:09+00:00 Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com 2014-08-23T20:50:09+00:00 eddfdc9eddd89040eb1b7067c2e78fcb9185f4c6 change X-Frame-Options to SAMEORIGIN for nginx SSL config 
change X-Frame-Options to SAMEORIGIN for nginx SSL config
 Merge branch 'blacklist/unsubscribes' into 'master' 2014-08-23T20:47:40+00:00 Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com 2014-08-23T20:47:40+00:00 3cbacad86c2eac40fb1f41cf6afffb7ac53a881e Add 'unsubscribes' to the paths blacklist This is to prevent issues with the admin email feature in GitLab EE. See merge request !1034 
Add 'unsubscribes' to the paths blacklist

This is to prevent issues with the admin email feature in GitLab EE.

See merge request !1034
Merge branch 'always_set_satellite_origin' into 'master' 2014-08-23T20:46:36+00:00 Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com 2014-08-23T20:46:36+00:00 fcbf9841c745cc4eb26f7911e273d5a6ae6afd89 Always set satellite origin See merge request !1036 
Always set satellite origin

See merge request !1036
unify nginx config files 2014-08-23T08:08:12+00:00 Ben Bodenmiller bbodenmiller@hotmail.com 2014-08-22T20:51:59+00:00 3663354cb9b661b77185ff172dcea6ad44345d9d 






change X-Frame-Options to SAMEORIGIN
2014-08-23T08:05:31+00:00

Ben Bodenmiller
bbodenmiller@hotmail.com

2014-08-20T20:31:15+00:00

a3953a46f401e075c4319a49cf4c88825d78ce17

needed to allow sidekiq to load on background jobs tab




needed to allow sidekiq to load on background jobs tab






Simplify the description of single hash lines based on comments of Ben Bodenmiller.
2014-08-22T17:10:07+00:00

Sytse Sijbrandij
sytses@gmail.com

2014-08-22T17:10:07+00:00

06fade7545c9006ed7d83b22ef4d0c58296dc560












Always set the origin remote in satellite actions
2014-08-22T12:32:04+00:00

Jacob Vosmaer
contact@jacobvosmaer.nl

2014-08-22T12:32:04+00:00

3dbd8d2293bf0ef4a211db2591382113aee48cfc

This prevents issues with satellites containing outdated origin remotes
after administrators move the git repositories directory.





This prevents issues with satellites containing outdated origin remotes
after administrators move the git repositories directory.







Add 'unsubscribes' to the paths blacklist
2014-08-22T08:25:13+00:00

Jacob Vosmaer
contact@jacobvosmaer.nl

2014-08-22T08:25:13+00:00

abb415276f3854f09dc06f68523f10e927ecc5c3

GitLab EE has a /unsubscribes/ route.





GitLab EE has a /unsubscribes/ route.







Use one word per line in Gitlab::Blacklist
2014-08-22T08:21:04+00:00

Jacob Vosmaer
contact@jacobvosmaer.nl

2014-08-22T08:21:04+00:00

e4f75fd26275bfa40064fa01e537d1cb4c7fde08












Fix tests after #7526
2014-08-20T18:34:55+00:00

Robert Schilling
rschilling@student.tugraz.at

2014-08-20T18:34:55+00:00

66f6ca0770fa91a3763d45f8c1d2194d95b3c67b