Commit Graph
28163 Commits
Author SHA1 Message Date
Kamil Trzcinski 5c19476286 Merge branch 'docker-registry' into docker-registry-view 2016-05-14 14:28:08 -05:00
Kamil Trzcinski 715a8cfa2f Fix authentication service 2016-05-14 14:27:56 -05:00
Kamil Trzcinski 9eeea4245b Merge branch 'docker-registry' into docker-registry-view 2016-05-14 14:23:00 -05:00
Kamil Trzcinski d40bd7419f Fix authentication service 2016-05-14 14:22:45 -05:00
Kamil Trzcinski 284dc3285a Fix abilities 2016-05-14 14:22:10 -05:00
Kamil Trzcinski 46cc04ce7a Add TODO 2016-05-14 14:17:04 -05:00
Kamil Trzcinski ee725db8e0 Add TODO 2016-05-14 14:16:44 -05:00
Kamil Trzcinski a77686d593 Merge branch 'docker-registry' into docker-registry-view 2016-05-14 14:05:57 -05:00
Kamil Trzcinski 393459b2b2 Improve code design after review 2016-05-14 14:04:04 -05:00
Kamil Trzcinski 4f1e0014a7 Simplify registry configuration 2016-05-14 14:03:41 -05:00
Kamil Trzcinski 9496f7a71a Merge branch 'docker-registry' into docker-registry-view 2016-05-14 11:16:21 -05:00
Kamil Trzcinski 0a9979d9ef Rename specs 2016-05-14 11:16:11 -05:00
Kamil Trzcinski 654d5ad3f4 Merge branch 'docker-registry' into docker-registry-view 2016-05-14 11:15:33 -05:00
Kamil Trzcinski 63cdf1aeb0 Use Auth::ContainerRegistryAuthenticationService 2016-05-14 11:11:48 -05:00
Kamil Trzcinski 906c880400 Merge branch 'docker-registry' into docker-registry-view 2016-05-14 09:39:43 -05:00
Kamil Trzcinski 774a510782 Fix specs 2016-05-14 09:39:33 -05:00
Kamil Trzcinski f4f59d0f13 Merge branch 'docker-registry' into docker-registry-view 2016-05-13 17:15:01 -05:00
Kamil Trzcinski 0958f331d1 Merge remote-tracking branch 'origin/master' into docker-registry
# Conflicts:
#	config/initializers/1_settings.rb
2016-05-13 17:14:46 -05:00
Kamil Trzcinski 692b5e0b47 Merge branch 'docker-registry' into docker-registry-view
# Conflicts:
#	app/controllers/jwt_controller.rb
#	app/services/jwt/container_registry_authentication_service.rb
2016-05-13 16:43:49 -05:00
Kamil Trzcinski 509654b378 Improve JWT::RSAToken::kid 2016-05-13 16:41:30 -05:00
Kamil Trzcinski e900ff972a Improve JwtController code 2016-05-13 16:23:02 -05:00
Kamil Trzcinski 9ef9e008fe Move JWT to Gitlab::JWT 2016-05-13 16:22:50 -05:00
Achilleas Pipinellis d7a28f3c12 Merge branch 'revert-3955' into 'master'
Revert "Merge branch 'doc-fix-db-gem-install-instructions' into 'master'"

This reverts commit 66d8ef1ad9, reversing
changes made to 6a8359f3d3.

The `--with` option was added in Bundler 1.10 but in this case it
shouldn't even be needed: I've tested the original command locally and
the pg gem was installed, so I believe the user that opened the original
MR ran the wrong command (i.e. `sudo -u git -H bundle install --without
development test postgres --deployment` instead of `sudo -u git -H bundle
install --without development test mysql --deployment`.

See discussion at
https://gitlab.com/gitlab-org/gitlab-ce/commit/66d8ef1ad9d5952b7e7f026658f71aafc861950e
for more context.

See merge request !4144
2016-05-13 20:51:06 +00:00
Douwe Maan 710ebf164f Merge branch 'remove-deprecated-finders' into 'master'
Remove activerecord-deprecated_finders gem

We don’t use any of the deprecated finders, so it should be safe to remove.

See https://github.com/rails/activerecord-deprecated_finders#active-record-deprecated-finders for more information.

Resolves #17015.

See merge request !3981
2016-05-13 20:49:38 +00:00
Robert Speicher 5e130c3e39 Merge branch 'rubocop/space-around-operators' into 'master'
Rubocop: require space round operators

This enables rubocop to require space around opertators and fix offenses in the codebase.
There is another merge-request to solve remaining offenses in EE codebase, merge it first: gitlab-org/gitlab-ee!388

Fixes #17398 

See merge request !4112
2016-05-13 19:22:14 +00:00
Dmitriy Zaporozhets 7a83f2c35c Merge branch '17338-sidebar-width' into 'master'
Reduce width of side nav

Closes #17338    
Part of #14838    
Left: old; Right: new    
<img src="/uploads/7dba5f22d6bdf1249bab5166addb25b5/Screen_Shot_2016-05-10_at_4.34.07_PM.png" width="500px">

See merge request !4109
2016-05-13 18:16:16 +00:00
Kamil Trzcinski 9e318bd99d Fix container registry permissions 2016-05-13 12:20:23 -05:00
Dmitriy Zaporozhets 8ece393a16 Merge branch '17501-dropdown-bug' into 'master'
Fix mobile dropdown bug

Closes #17501     
![dropdown](/uploads/d0cc6d9472bd8aa1aaf392d5c4eb3791/dropdown.gif)



See merge request !4142
2016-05-13 17:16:04 +00:00
Dmitriy Zaporozhets 0808a87f46 Merge branch 'dz-fix-issue-sidebar' into 'master'
Fix UI issues caused by header height decrease to 50px

- fix blank spacing for issue sidebar
- fix login btn alignment for non logged in users

See merge request !4143
2016-05-13 17:13:56 +00:00
Robert Speicher 76d16c26d2 Merge branch 'dz-update-changelog' into 'master'
Add UI changes in 8.8 to changelog

For !3824 and !3980

[ci skip]

See merge request !4140
2016-05-13 17:08:55 +00:00
Rémy Coutable 935c684ad3 Revert "Merge branch 'doc-fix-db-gem-install-instructions' into 'master' "
This reverts commit 66d8ef1ad9, reversing
changes made to 6a8359f3d3.

The `--with` option was added in Bundler 1.10 but in this case it
shouldn't even be needed: I've tested the original command locally and
the pg gem was installed, so I believe the user that opened the original
MR ran the wrong command (i.e. `sudo -u git -H bundle install --without
development test postgres --deployment` instead of `sudo -u git -H bundle
install --without development test mysql --deployment`.

See discussion at
https://gitlab.com/gitlab-org/gitlab-ce/commit/66d8ef1ad9d5952b7e7f026658f71aafc861950e
for more context.
2016-05-13 18:39:32 +02:00
Dmitriy Zaporozhets 9a7a041553 Fix login btn vertical align
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-13 11:24:00 -05:00
Dmitriy Zaporozhets 2148566b3d Fix issue sidebar top position after header height change
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-13 11:21:31 -05:00
Annabel Dunstone 16b1d3a34f Fix mobile dropdown bug 2016-05-13 11:12:49 -05:00
Dmitriy Zaporozhets 22ff0d3421 Merge branch 'dz-improve-sidebar-design' into 'master'
Remove background color differentiation from gitlab logo/text in sidebar

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

cc @annabeldunstone @skyruler 

See merge request !4139
2016-05-13 15:44:11 +00:00
Dmitriy Zaporozhets 6da2405603 Add UI changes in 8.8 to changelog
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-13 10:05:52 -05:00
Dmitriy Zaporozhets ae89161db5 Remove background color differentiation from gitlab logo/text in sidebar
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-13 09:25:38 -05:00
Kamil Trzcinski 575a73c896 Fix specs 2016-05-13 08:45:57 -05:00
Dmitriy Zaporozhets c37006fa4f Merge branch '17485-broadcast-msg' into 'master'
Move broadcast msg into content-wrapper

Closes #17485  

<img src="/uploads/ab365f471209c55d2ee876cf558d4032/Screen_Shot_2016-05-12_at_4.21.22_PM.png" width="800px">

See merge request !4132
2016-05-13 13:04:36 +00:00
Gabriel Mazetto 8d58e691c6 remove extra space to fix codestyle 2016-05-13 04:51:13 -03:00
Gabriel Mazetto f5a0ac0fc1 Codestyle: make sure we have space around operators 2016-05-13 04:46:56 -03:00
Gabriel Mazetto 311fb58c44 Require space around operators 2016-05-13 04:45:52 -03:00
Douwe Maan 6aef256733 Merge branch 'fix_health_check_type' into 'master'
Fix minor typos in admin health check page

Fix minor typos from gitlab-org/gitlab-ce!3888

cc/ @DouweM @twk3 

See merge request !4134
2016-05-12 23:03:36 +00:00
Douwe Maan d2fb451c8f Merge branch 'rs-cleanup-events_helper_spec' into 'master'
Clean up EventsHelper spec

Extracted from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4090

See merge request !4133
2016-05-12 22:41:19 +00:00
Robert Speicher 4735a75340 Merge branch 'deprecated-class-methods-cop' into 'master'
Enable the Rubocop DeprecatedClassMethods cop

This reports uses of `File.exists?` and `Dir.exists?`, which were both
deprecated in Ruby and will eventually be removed in favor of `.exist?`.
Also fixes all existing uses of the deprecated methods.

See merge request !4087
2016-05-12 22:41:01 +00:00
Drew Blessing 4fea5cda0b Fix minor typos in admin health check page 2016-05-12 17:11:37 -05:00
Annabel Dunstone 7bc594735b Undo changes; reduce sidebar internal width 2016-05-12 17:06:47 -05:00
Robert Speicher 5186f6e3bd Merge branch 'default-scope-on-builds-page' into 'master'
Fix a description for default scope on builds

Should be "**All* builds (from this project)" for the {project,admin}
builds page without scope.

Fix a regression on !2243 (#4240).

See merge request !4118
2016-05-12 22:01:40 +00:00
Robert Speicher 05bbad5817 Clean up EventsHelper spec 2016-05-12 16:52:56 -05:00
Douwe Maan 850234ebd2 Merge branch 'feature/label-subscription-api' into 'master'
Add API endpoints for un/subscribing from/to a label



See merge request !4051
2016-05-12 21:51:21 +00:00