Commit Graph
28097 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 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
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
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
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
Yorick Peterse 95163307ae Merge branch 'update-changelog-875' into 'master'
Updated CHANGELOG for 8.7.5

See merge request !4129
2016-05-12 16:13:16 +00: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
Yorick Peterse 0641fe6f72 Updated CHANGELOG for 8.7.5
[ci skip]
2016-05-12 18:11:11 +02: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
Rémy Coutable 5298c3cc02 Merge branch 'total-method-time' into 'master'
Removed tracking of total method execution times

See #17239 and 945c5b3fe6 for more details. The Grafana dashboards used to visualize performance data were updated a while ago to no longer display this data.

See merge request !4124
2016-05-12 15:23:50 +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
Marin Jankovski 9393d6b6f2 Merge branch 'patch-2' into 'master'
Update cas.md to reflect the current syntax, and added that gitlab-ctl reconfigure should be run.

I spent a while trying to figure our why the cas wasn't working!

Someone may need to update the source code section of the wiki

See merge request !3850
2016-05-12 14:12:48 +00:00
Yorick Peterse 945c5b3fe6 Removed tracking of total method execution times
Because method call timings are inclusive (that is, they include the
time of any sub method calls) this would lead to the total method
execution time often being far greater than the total transaction time.
Because this is incredibly confusing it's best to simply _not_ track the
total method execution time, after all it's not that useful to begin
with.

Fixes gitlab-org/gitlab-ce#17239
2016-05-12 15:15:45 +02:00
Andrei Gliga d66833bca5 schema fix 😓 2016-05-12 13:56:04 +03: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 5553ad24e4 Revert "new screenshot for the docs on how to enabled/disable OmniAuth Sign In" [ci skip]
This reverts commit 7b295370efc124360d52e37e8e709914028f6443.
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 9e5042e40f Revert "disabled_oauth_sign_in_sources column" and keep on schema only the disabled_oauth_sign_in_sources column
This reverts commit 95358e0095403ad44149d11922d52e4590285a20.
2016-05-12 13:44:46 +03:00
Andrei Gliga c0c2cd4ed7 new screenshot for the docs on how to enabled/disable OmniAuth Sign In 2016-05-12 13:44:46 +03:00
Andrei Gliga 2576a55e35 config/gitlab.yml between `` 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