gitlab-org--gitlab-foss/spec
Dmitriy Zaporozhets e09d573e2f Merge branch '18338-change-admin-navigation-to-match-new-ui' into 'master'
Resolve "Change admin navigation to match new UI"

## What does this MR do?
Moves admin navigation to layout nav to match Project, Groups, and Profile navigation

## Are there points in the code the reviewer needs to double check?

## Why was this MR needed?

## What are the relevant issue numbers?
Closes #18338

## Screenshots (if relevant)
![Screen_Shot_2016-06-14_at_10.26.40_AM](/uploads/f0b8c8b259da16d929be2b36e8eeafb8/Screen_Shot_2016-06-14_at_10.26.40_AM.png)
![Screen_Shot_2016-06-14_at_10.26.44_AM](/uploads/07d9ece2063dfcfec1f0f2647d8ee782/Screen_Shot_2016-06-14_at_10.26.44_AM.png)
## Does this MR meet the acceptance criteria?

- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- [ ] Tests
  - [ ] Added for this feature/bug
  - [ ] All builds are passing
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !4650
2016-06-15 16:35:46 +00:00
..
config Enable the Rubocop DeprecatedClassMethods cop 2016-05-08 15:33:34 -06:00
controllers Merge branch 'stanhu/gitlab-ce-fix-error-500-false-binary-negative' 2016-06-15 15:56:02 +02:00
factories Improve validations 2016-06-15 12:03:49 +02:00
features Merge branch '18338-change-admin-navigation-to-match-new-ui' into 'master' 2016-06-15 16:35:46 +00:00
finders Fix notes on confidential issues through JSON to users without access 2016-06-14 17:51:17 -03:00
fixtures Add support for Docker Registry manifest v1 2016-06-15 12:53:23 +02:00
helpers UI and copywriting improvements 2016-06-14 13:18:14 +02:00
initializers Add tests for setting trusted_proxies 2016-05-04 15:49:39 -07:00
javascripts Prevent default disabled buttons and links. 2016-06-15 11:37:45 -04:00
lib Merge branch 'docker-registry-manifest-v1' into 'master' 2016-06-15 15:07:39 +00:00
mailers UI and copywriting improvements 2016-06-14 13:18:14 +02:00
models Merge branch 'environments-and-deployments' into 'master' 2016-06-15 13:48:09 +00:00
requests Merge branch '18451-track-new-redis-connections' into 'master' 2016-06-15 09:56:42 +00:00
routing Merge branch 'health-check-route' 2016-05-12 16:39:03 -05:00
services Merge branch 'environments-and-deployments' into 'master' 2016-06-15 13:48:09 +00:00
support Fix Error 500 when viewing a blob with binary characters after the 1024-byte mark 2016-06-12 07:36:25 -07:00
tasks/gitlab Switch the gitlab:db:configure task to use tables.any? instead of looking specifically for the schema_migrations table 2016-05-25 10:47:09 -07:00
views
workers Merge branch 'dont-drop-stuck-builds' into 'master' 2016-06-15 02:54:19 +00:00
factories_spec.rb Enable RSpec/NotToNot cop and auto-correct offenses 2016-05-24 15:40:29 -04:00
rails_helper.rb
spec_helper.rb Enable Knapsack only in CI environment 2016-06-08 11:43:13 +02:00
teaspoon_env.rb Add leading comment space cop 2016-05-31 19:33:46 -03:00