delta/gitlab/gitlab-ce.git/spec/features, branch ide-diff-inline

Merge branch 'dz-improve-app-settings-2' into 'master'

2018-03-28T09:34:56+00:00

Redesign application settings to match project settings (part 2)

See merge request gitlab-org/gitlab-ce!18019

Merge branch '43603-ci-lint-support' into 'master'

2018-03-28T08:01:33+00:00

Resolve "/ci/lint should support include keyword in config file"

Closes #43603

See merge request gitlab-org/gitlab-ce!17729

Fix admin settings spec

2018-03-27T16:20:03+00:00

Signed-off-by: Dmitriy Zaporozhets

Move ci/cd, influx and prometheus app settings to expandable sections

2018-03-27T15:13:16+00:00

Signed-off-by: Dmitriy Zaporozhets

Merge branch 'test-hook-logs-xss' into 'master'

2018-03-27T09:15:16+00:00

Add a test to make sure there's no XSS for hook logs

See merge request gitlab-org/gitlab-ce!18005

Make ci/lint page context aware:

2018-03-26T23:03:11+00:00

- Create ci/lints controller inside project/
- Move js pages to be inside projects/
- Copy view ci/lint view to be inside project folder
- Remove ci/lint view and js files

Closes #43603

Merge branch 'dz-improve-app-settings' into 'master'

2018-03-26T19:49:54+00:00

Redesign application settings to match project settings (part 1)

See merge request gitlab-org/gitlab-ce!17937

Add a test to make sure there's no XSS for hook logs

2018-03-26T18:55:11+00:00

Merge branch '43316-controller-parameters-handling-sensitive-information-should-use-a-more-specific-name' into 'master'

2018-03-26T12:36:51+00:00

Resolve "Controller parameters handling sensitive information should use a more specific name"

Closes #43316

See merge request gitlab-org/gitlab-ce!17796

Move UI of several application settings to expandable block

2018-03-26T12:10:56+00:00

To make design consistent with project settings

Next admin area application settings are afected by this commit:

* Visibility and access control
* Account and limit settings
* Sign in
* Sign up
* Help page
* Pages

Signed-off-by: Dmitriy Zaporozhets