delta/gitlab/gitlab-ce.git/spec/helpers, branch 35942_api_binary_encoding gitlab.com: gitlab-org/gitlab-ce.git Merge branch 'AshleyDumaine/gitlab-ce-36994-toggle-for-automatically-collapsing-outdated-diff-comments' into 'master' 2017-09-06T11:57:16+00:00 Douwe Maan douwe@gitlab.com 2017-09-06T11:57:16+00:00 99852965211166c21807522603818e41d03aa2d3 Add setting to collapse outdated diff comments on push Closes #36994 See merge request !14053 
Add setting to collapse outdated diff comments on push

Closes #36994

See merge request !14053
 Merge branch '19650-remove-admin-section-from-search-results-if-user-doesnt-have-access' into 'master' 2017-09-06T11:08:43+00:00 Rémy Coutable remy@rymai.me 2017-09-06T11:08:43+00:00 24fc7c878aa317e6f0163409fbf6d08256f7b324 Hide admin link from default search results for non-admins Closes #19650 See merge request !14015 
Hide admin link from default search results for non-admins

Closes #19650

See merge request !14015
 Resolve outdated diff discussions on push 2017-09-06T09:08:03+00:00 Sean McGivern sean@gitlab.com 2017-09-05T15:49:05+00:00 e8f29569bcb4a2d732a2c00b34958f58d5622836 






Hide admin link from default search results for non-admins
2017-09-06T02:02:04+00:00

Mark Fletcher
mark@gitlab.com

2017-09-03T05:49:19+00:00

ed43c6f1fd2c01307c4fe9fb8ba52a7c1a72f624












Merge branch 'remove-unused-code-issueshelper' into 'master'
2017-09-04T11:10:44+00:00

Rémy Coutable
remy@rymai.me

2017-09-04T11:10:44+00:00

970af9964ea9404942818d8c3394d2903955ed69

Remove unused methods from `IssuesHelper` and `IssuablesHelper`

See merge request !13793




Remove unused methods from `IssuesHelper` and `IssuablesHelper`

See merge request !13793






Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2017-09-03T21:09:59+00:00

Jose Ivan Vargas
jvargas@gitlab.com

2017-09-03T21:09:59+00:00

b623807682022a54344d8213d6f1c902be6ade37












Merge branch 'remove-finder-caching' into 'master'
2017-09-01T18:39:12+00:00

Robert Speicher
robert@gitlab.com

2017-09-01T18:39:12+00:00

dd825c0f5d00cef3cac89480bcf2027064c5d89d

Remove issuable finder count caching

See merge request !13959




Remove issuable finder count caching

See merge request !13959






Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2017-09-01T07:21:18+00:00

Marin Jankovski
maxlazio@gmail.com

2017-09-01T07:21:18+00:00

28060caa0ade7566a38e3ed17f2db8bf9116dc1b












Merge branch '31273-creating-an-project-within-an-internal-sub-group-gives-the-option-to-set-it-a-public' into 'master'
2017-08-31T17:17:05+00:00

Tim Zallmann
tzallmann@gitlab.com

2017-08-31T17:17:05+00:00

e58428382265f02639a7fc8c1bfcc6311564c0d0

Resolve various visibility level settings issues

Closes #31273

See merge request !13442




Resolve various visibility level settings issues

Closes #31273

See merge request !13442






`current_application_settings` belongs on `Gitlab::CurrentSettings`
2017-08-31T12:38:33+00:00

Sean McGivern
sean@gitlab.com

2017-08-31T09:47:03+00:00

5883ce95efcc4cc04f949f9b4e66d73fbede94e2

The initializers including this were doing so at the top level, so every object
loaded after them had a `current_application_settings` method. However, if
someone had rack-attack enabled (which was loaded before these initializers), it
would try to load the API, and fail, because `Gitlab::CurrentSettings` didn't
have that method.

To fix this:

1. Don't include `Gitlab::CurrentSettings` at the top level. We do not need
   `Object.new.current_application_settings` to work.
2. Make `Gitlab::CurrentSettings` explicitly `extend self`, as we already use it
   like that in several places.
3. Change the initializers to use that new form.





The initializers including this were doing so at the top level, so every object
loaded after them had a `current_application_settings` method. However, if
someone had rack-attack enabled (which was loaded before these initializers), it
would try to load the API, and fail, because `Gitlab::CurrentSettings` didn't
have that method.

To fix this:

1. Don't include `Gitlab::CurrentSettings` at the top level. We do not need
   `Object.new.current_application_settings` to work.
2. Make `Gitlab::CurrentSettings` explicitly `extend self`, as we already use it
   like that in several places.
3. Change the initializers to use that new form.