delta/gitlab/gitlab-ce.git, branch gitlab-git-http-server

Be more defensive when running 'kill'

2015-08-31T14:15:41+00:00

Merge remote-tracking branch 'gitlab.com/master' into gitlab-git-http-server

2015-08-31T13:51:41+00:00

Replace grack with gitlab-git-http-server

2015-08-31T13:30:15+00:00

Ordering of GitHub issues import is now fixed

2015-08-31T05:24:50+00:00

See https://gitlab.com/gitlab-org/gitlab-ce/commit/4a203aab57c69ea402939cf8fc423a0e5aaa1cab

Merge branch 'dont-notify-users-without-project-access' into 'master'

2015-08-30T23:56:34+00:00

Don't notify users without access to the project when they are (accidentally) mentioned in a note.

Addresses #2366.

See merge request !1216

Merge branch 'joelkoglin/gitlab-ce-feature_fix_ldap_auth_issue_993'

2015-08-29T18:51:46+00:00

Move changelog item

2015-08-29T18:49:59+00:00

Merge branch 'master' into joelkoglin/gitlab-ce-feature_fix_ldap_auth_issue_993

2015-08-29T18:49:14+00:00

Minor refactor

2015-08-29T18:48:54+00:00

Merge branch 'fix-session_expire_delay' into 'master'

2015-08-28T07:55:51+00:00

read session_expire_delay from database if table & column exists;

Previous code only ends up using the default value for session_expire_delay, not the value stored in the database, making the session always 1 week.

See merge request !1217