Commit Graph
14604 Commits
Author SHA1 Message Date
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
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 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 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
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 f5a0ac0fc1 Codestyle: make sure we have space around operators 2016-05-13 04:46:56 -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
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
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
Douwe Maan 7fc51d1908 Merge branch 'health-check-route'
# Conflicts:
#	db/schema.rb
2016-05-12 16:39:03 -05:00
Annabel Dunstone e4d3e94955 Move broadcast msg into content-wrapper 2016-05-12 16:22:21 -05:00
Ahmad Sherif 0c22698bd4 Add API endpoints for un/subscribing from/to a label
Closes #15638
2016-05-12 22:48:09 +02:00
Douwe Maan 74c69709dc Merge branch 'otzy007/gitlab-ce-disable_oauth_sign_in_sources' 2016-05-12 15:11:37 -05:00
Jacob Schatz f2303f9df0 Merge branch 'send-incremental-build-log' into 'master'
Update build log incrementally

Proof of concept implementation of incremental sending of build log to browser.

cc @jschatz1 @vsizov @grzesiek @tmaczukin 


See merge request !3737
2016-05-12 16:48:42 +00:00
Takuya Noguchi 18fdbf0a03 Fix a description for default scope on builds 2016-05-13 01:28:55 +09:00
Rémy Coutable 7a5fbb4938 Merge branch '14272-forks-listed-when-permission-is-missing' into 'master'
Only show forks for users who can download code

The ForksController enforces this, so don't show the link if it won't go anywhere.

Closes #14272.

See merge request !4017
2016-05-12 16:12:05 +00:00
DJ Mountney ad77ab0376 Add Changelog entry
and drop exception handling around HealthCheck::Utils.process_checks, it wasn't needed
2016-05-12 09:04:04 -07:00
Rémy Coutable 66824e09e2 Merge branch 'fix/reuse-runner-edit-form-in-admin-area' into 'master'
Reuse runners edit form in admin and project area

Reuse runners edit form in admin and project area.

![reuse_runner_form](/uploads/d16e3ee196151b68f584d947f38a7c29/reuse_runner_form.png)

See merge request !4094
2016-05-12 15:25:56 +00:00
Sean McGivern 827fbc10f6 Only show forks for users who can download code
The ForksController enforces this, so don't show the link if it won't go
anywhere.
2016-05-12 16:22:02 +01:00
Rémy Coutable a9cc14e08b Merge branch '3870-commit-sorting-issue' into 'master'
Group commits by date in server timezone

`Time#to_date` just takes the (timezone-less) year, date, and month, and
creates a new date from that. Because the commits in the list are
grouped by date, rather than chunked when the date changes, a commit can
be shown in the wrong order if its CommitDate has a timezone-less date
that's different to other commits around it.

Convert all CommitDates to the server timezone before grouping, as that
will at least produce consistent results. Users can still see a
timestamp on the commit that doesn't match the date it's grouped under,
because the timestamp shown uses the user's local timezone, and the
grouping uses the server's timezone, but that was an issue anyway.

### Before
![image](/uploads/1ffe0e2f86e03590cb96126d4f340436/image.png)

### After
![image](/uploads/b1be1b08782385d13c56528242a5829b/image.png)

Closes #3870 and closes #17300.

See merge request !4052
2016-05-12 14:36:15 +00:00
Kamil Trzcinski 5bd356eb31 Fix specs 2016-05-12 09:27:58 -05:00
Andrei Gliga 260c88a758 no need to define the help block since there's no help block 2016-05-12 13:44:46 +03:00
Andrei Gliga 6cdce04937 Revert "Revert "no need to show the help about Github or the other authentication sources""
This reverts commit 075ace5686c63d40f7e9fa02bf37e1bd3168f7e7.
2016-05-12 13:44:46 +03:00
Andrei Gliga b17cca1d94 delete the enabled_oauth_sign_in_sources after getting it's value into enabled_oauth_sign_in_sources
just delete enabled_oauth_sign_in_sources and get it's value
2016-05-12 13:44:46 +03:00
Andrei Gliga 8313476f5e no schema info for ApplicationSetting 2016-05-12 13:44:46 +03:00
Andrei Gliga 9079b56bf4 Revert "no need to show the help about Github or the other authentication sources"
This reverts commit 78a832d0fd7ff445c707809134dbb2a42d2a9e03.

Show help only for the enabled OAuth Providers on oauth-providers-help block

aria: { describedby: help_block_id } instead of 'aria-describedby' => help_block_id

provider and not p

a more simple approach to the OmniAuth helper links for oauth-providers-help
2016-05-12 13:44:46 +03:00
Andrei Gliga 6bd8d3ad48 inline btn-group{ data: { toggle: 'buttons' } } 2016-05-12 13:44:46 +03:00
Andrei Gliga 46064cb84c << instead of += 2016-05-12 13:44:46 +03:00
Andrei Gliga e87c96eef6 enabled_button_based_providers.any? instead of ! empty? for button_based_providers_enabled? 2016-05-12 13:44:46 +03:00
Andrei Gliga 25ff3fd5bd button_based_providers.any? instead of !button_based_providers.empty? 2016-05-12 13:44:46 +03:00
Andrei Gliga ab7f9c9ae1 Array(enabled_oauth_sign_in_sources) instead of the if 2016-05-12 13:44:46 +03:00
Andrei Gliga 9bfa74fcfe enabled_oauth_sign_in_sources param doesn't need permit 2016-05-12 13:44:46 +03:00
Andrei Gliga 7818f7329a On Application Settings Page let the user select the enabled OAuth Sign in sources instead of the disabled ones 2016-05-12 13:44:46 +03:00
Andrei Gliga 81d0a4a473 typo 2016-05-12 13:44:46 +03:00
Andrei Gliga a2d4c349b5 unindent 1 level the Disable OAuth form 2016-05-12 13:44:46 +03:00
Andrei Gliga dad501a236 no need to show the help about Github or the other authentication sources 2016-05-12 13:44:46 +03:00
Andrei Gliga 3c3bc93747 if omniauth is enabled and if there are button_based_providers available show the disable OAuth sources 2016-05-12 13:44:46 +03:00
Andrei Gliga 47ee5125e8 validate disabled_oauth_sign_in_sources in ApplicationSe 2016-05-12 13:44:46 +03:00
Andrei Gliga 7c7c5b7e40 text for the disable_oauth_signin_sources label 2016-05-12 13:44:46 +03:00
Andrei Gliga 28da3a88de show only the eanbled oauth providers 2016-05-12 13:44:46 +03:00
Andrei Gliga 284eccb5e6 render the omniauth_box if there are any button_based_providers 2016-05-12 13:44:46 +03:00
Andrei Gliga d943e5f691 method to check if oauth button based providers are enabled 2016-05-12 13:44:46 +03:00
Andrei Gliga 8d26836e94 method to get the enabled_button_based_providers 2016-05-12 13:44:46 +03:00
Andrei Gliga cf30044314 OAuth Providers disable from the ApplicationSettings page 2016-05-12 13:44:46 +03:00