delta/gitlab/gitlab-ce.git/config, branch docs-specific-review-examples gitlab.com: gitlab-org/gitlab-ce.git Inline script cleanup globals and easy 2017-08-01T08:50:59+00:00 Tim Zallmann tzallmann@gitlab.com 2017-08-01T08:50:59+00:00 423d31a300370c9c0acd9e8faae4d7bda2ac7d61 






Fix LDAP documentation and example config
2017-07-31T15:43:27+00:00

Michael Kozono
mkozono@gmail.com

2017-07-31T15:43:27+00:00

7b5a96b53c801d7fabef529481a525f3ab2ed2e3












Merge branch 'inline-js-removal-projects-other' into 'master'
2017-07-31T09:14:43+00:00

Phil Hughes
me@iamphill.com

2017-07-31T09:14:43+00:00

1782aa7081ef177ef86da5db33d257ed26e253a9

Inline js removal projects other

See merge request !13075




Inline js removal projects other

See merge request !13075






Ensure Gitlab::Application.routes.default_url_options are set correctly in Capybara + :js specs
2017-07-28T14:33:30+00:00

Rémy Coutable
remy@rymai.me

2017-07-27T09:15:57+00:00

60797a42b419841e14f50f85bf8daa2a115a72f9

Signed-off-by: Rémy Coutable <remy@rymai.me>





Signed-off-by: Rémy Coutable <remy@rymai.me>







Merge branch 'backport-2844-ldap-ee-license-checks' into 'master'
2017-07-28T09:13:50+00:00

Douwe Maan
douwe@gitlab.com

2017-07-28T09:13:50+00:00

da3100254f446bcb1f27516606f25d92893f81b8

Backport some recent changes related to LDAP from EE

See merge request !13119




Backport some recent changes related to LDAP from EE

See merge request !13119






Merge branch 'sh-augment-lograge-output' into 'master'
2017-07-28T08:30:26+00:00

Sean McGivern
sean@mcgivern.me.uk

2017-07-28T08:30:26+00:00

190fae5f0cef11d68c7385be0c4013931796f958

Add remote IP, user ID and username to JSON lograge output

See merge request !13147




Add remote IP, user ID and username to JSON lograge output

See merge request !13147






Merge branch '35224-transform-user-profile-javascript-into-async-bundle' into 'master'
2017-07-28T07:27:13+00:00

Tim Zallmann
tzallmann@gitlab.com

2017-07-28T07:27:13+00:00

7e17f9bc89b04496e062d56c119f75fbb3f81208

Resolve "Transform user profile javascript into async bundle"

Closes #35224

See merge request !12929




Resolve "Transform user profile javascript into async bundle"

Closes #35224

See merge request !12929






Merge branch 'master' into 'sh-augment-lograge-output'
2017-07-28T07:26:08+00:00

Sean McGivern
sean@mcgivern.me.uk

2017-07-28T07:26:08+00:00

96c4a15eae9b93a2bfb512309e860da50d2e2636

# Conflicts:
#   config/initializers/lograge.rb




# Conflicts:
#   config/initializers/lograge.rb






Merge branch 'sh-fix-lograge-exception' into 'master'
2017-07-28T07:22:18+00:00

Sean McGivern
sean@mcgivern.me.uk

2017-07-28T07:22:18+00:00

b5aac468693f6ffaada170aebedc623768ce87d4

Fix lograge exclusion in params section

See merge request !13146




Fix lograge exclusion in params section

See merge request !13146






Add remote IP, user ID and username to JSON lograge output
2017-07-28T05:48:03+00:00

Stan Hu
stanhu@gmail.com

2017-07-28T05:48:03+00:00

9bc176b2c39f1c27ce8ed4c13cf06e53331c16c9

This makes the logs a bit more useful to search requests by users.





This makes the logs a bit more useful to search requests by users.