Commit Graph
27570 Commits
Author SHA1 Message Date
Annabel Dunstone 129c6fbc2d Add Safari search box bug fix to changelog 2016-04-27 10:48:29 -05:00
Dmitriy Zaporozhets 6c0ed63990 Merge branch 'ie-browser-update' into 'master'
Changes support from IE 10+ to IE 11+

IE 11 was released 17 October 2013; 2 years ago. Generally what I have experienced is that support for browsers (when newer ones are available) continues for up to 2 years. Based on that info we would drop support for IE 10 and the latest IE we would support would be IE 11. 

I also think this is more realistic since no one is really testing anything on IE 10 at the moment.  We should start testing on all the browser that we currently support. 

Also we can then have real support for flexbox and not need things like `-ms-flexbox` and other IE specific hacks. 

cc @iamphill @annabeldunstone @elvongray @alfredo1 @rspeicher 

See merge request !3913
2016-04-27 13:25:02 +00:00
Dmitriy Zaporozhets 47d269c1aa Merge branch 'rs-letter_opener_web' into 'master'
Add letter_opener_web gem

Sent emails in the development environment will no longer automatically
be opened in the browser. If a sent email needs to be viewed, it can be
found at the `/rails/letter_opener` route.

See merge request !3893
2016-04-27 13:23:40 +00:00
Jacob Schatz c01ff1f54b Merge branch 'issue_4271' into 'master'
Add button to toggle whitespace changes

Closes #4271 

**Merge Request**

<img src="/uploads/ea857269faed38a25b63b768d7f3a85b/Screen_Shot_2016-03-23_at_11.32.41_AM.png" width="1157" />


**Diff view**

<img src="/uploads/bc2ac3e4855584f9214c8f3ddf325b06/Screen_Shot_2016-03-23_at_11.32.53_AM.png" width="1211" />

See merge request !3367
2016-04-26 19:52:25 +00:00
Alfredo Sumaran 19d8f6731a Update CHANGELOG 2016-04-26 14:01:40 -05:00
Alfredo Sumaran c98b25f420 Update CHANGELOG 2016-04-26 14:01:40 -05:00
Alfredo Sumaran 4d6c40df9a Hide button on mobile 2016-04-26 14:01:40 -05:00
Alfredo Sumaran 22bd7f4d83 Allow to pass custom classes to button 2016-04-26 14:01:40 -05:00
Alfredo Sumaran 99296b2efd Hide button on mobile 2016-04-26 14:01:40 -05:00
Alfredo Sumaran b82af5ef2f Update CHANGELOG 2016-04-26 14:01:40 -05:00
Alfredo Sumaran 5ba79f49a4 Syntax and code improvements 2016-04-26 14:01:40 -05:00
Alfredo Sumaran 7f263ca1de Use variables instead of let 2016-04-26 14:01:40 -05:00
Alfredo Sumaran 0392dffdb6 Update wording 2016-04-26 14:01:40 -05:00
Alfredo Sumaran 89df29e09f Use click_link 2016-04-26 14:01:40 -05:00
Alfredo Sumaran 5d5df26ab1 Add documentation for "Hide whitespace changes" button 2016-04-26 14:01:40 -05:00
Alfredo Sumaran a1a9a1cf8d Specs for toggle Whitespaces Changes 2016-04-26 14:01:40 -05:00
Alfredo Sumaran 66a5d0fd26 Rename method 2016-04-26 14:01:40 -05:00
Alfredo Sumaran 64c2d9bd3c Use new method hide_whitespaces? 2016-04-26 14:01:40 -05:00
Alfredo Sumaran 4735914031 Update syntax 2016-04-26 14:01:40 -05:00
Alfredo Sumaran f0bdf5c692 Hide whitespace toggle button for new merge requests 2016-04-26 14:01:40 -05:00
Alfredo Sumaran d8d00b5bc2 Add Hide/show whitespace changes button on diff and commit view 2016-04-26 14:01:40 -05:00
Jacob Schatz dfe0ec8f72 Merge branch 'parallel-diff-alignment' into 'master'
Reduce width of parallel diffs

At 50% width the alignment is off on parallel diffs (see https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3785/diffs and view in Side-by-Side)  
Reducing width lines them up:

<img src="/uploads/5775d35b0e86397abd10db6195a8a54d/Screen_Shot_2016-04-22_at_2.19.21_PM.png" width="400px">

Also shifted comment button over to center it properly:  
<img src="/uploads/c2468e15bb65523464a941001c3d7298/Screen_Shot_2016-04-22_at_2.24.33_PM.png" width="200px">

See merge request !3891
2016-04-26 19:01:24 +00:00
Jacob Schatz 18e00e3ba3 Merge branch '15606-discussion-styling' into 'master'
Increase screen width breakpoint for hide/show discussion

Closes #15606

See merge request !3915
2016-04-26 18:43:58 +00:00
Hannes Rosenögger 17ac7c7f72 Merge branch 'changelog-alternates' into 'master'
Allow alternative names for the CHANGELOG file.

"CHANGELOG", "NEWS", "HISTORY", and "CHANGES" are recognized as Changelog files.

Also adds relevant tests for each of these names.

Resolves #14864.

See merge request !3768
2016-04-26 18:35:28 +00:00
Connor Shea c402aeef02 Allow alternative names for the CHANGELOG file.
"CHANGELOG", "NEWS", "HISTORY", and "CHANGES" are recognized as Changelog files.

Also adds relevant tests for each of these names.

Resolves #14864.
2016-04-26 11:40:35 -06:00
Rémy Coutable 88e4802d10 Merge branch 'remove-devise-async' into 'master'
Remove devise async

The extra gem isn’t necessary anymore since Devise + Rails 4.2 has ActiveJob integration.

Fixes #15575. Working towards #14286.

cc: @dzaporozhets @rspeicher 

See merge request !3902
2016-04-26 17:34:54 +00:00
Rémy Coutable 7f3a8e1899 Merge branch 'patch-1' into 'master'
Add usage example for the Office 365 GetPersonaPhoto-service.



See merge request !2462
2016-04-26 16:48:26 +00:00
Connor Shea 1cc614f2bd Remove the Devise Async gem.
The extra gem isn’t necessary anymore since Rails 4.2 has ActiveJob integration.

Resolves #15575.
2016-04-26 10:41:48 -06:00
Rémy Coutable b65c4abd74 Merge branch 'skip-fresh-repo-fsck' into 'master'
Do not fsck projects less than a day old

This should bring the number of false positives down.

Helps https://gitlab.com/gitlab-org/gitlab-ce/issues/15423

See merge request !3926
2016-04-26 16:23:57 +00:00
Jacob Schatz df8fda60fb Merge branch 'master' into 'master'
Fixed width of .search-location-badge as it was causing issues in Safari.

Fixed width of .search-location-badge as it was causing issues in Safari.

Fixes issue #15541 and is a minor CSS only change so [ci skip]

# Before

Safari:
![Screen_Shot_2016-04-24_at_22.35.38](/uploads/74388670fde3af94429d83b954833bd3/Screen_Shot_2016-04-24_at_22.35.38.png)

# After

Safari:
![Screen_Shot_2016-04-24_at_21.59.49](/uploads/177d0d8fda665165dff5006930604fc6/Screen_Shot_2016-04-24_at_21.59.49.png)

Chrome:
![Screen_Shot_2016-04-24_at_21.59.40](/uploads/6764cd5864901210f4f8eff4388fd6db/Screen_Shot_2016-04-24_at_21.59.40.png)

# CSS class referenced in the following files:

`./app/assets/javascripts/search_autocomplete.js.coffee`

`./app/assets/stylesheets/pages/search.scss`

…and is visible on the search bar on every page.

See merge request !3900
2016-04-26 15:28:26 +00:00
Rémy Coutable 6a5cced6bc Merge branch 'patch-3' into 'master'
Emphasize that GitLab must be partially running when restoring backups.

This caused me a lot of pain until I caught on.
I also enhanced the GitLab Omnibus application data backup restore procedure.  I verified the procedure by executing it with GitLab 8.6.4.

See merge request !3844
2016-04-26 15:19:43 +00:00
Robert Speicher 31c10e0362 Merge branch 'search-ui-update' into 'master'
Search ui update

Closes #2537 

See merge request !3751
2016-04-26 15:12:16 +00:00
Rémy Coutable 110bb65130 Revert "Merge branch 'patch-2' into 'master'"
This reverts merge request !3839
2016-04-26 14:59:26 +00:00
Rémy Coutable 6d9f1e0b1c Merge branch 'patch-2' into 'master'
Document that only unicorn and sidekiq should be stopped.

And the rest of GitLab should remain running.
Also clarified the rest of the GitLab Omnibus restore procedure.

See merge request !3839
2016-04-26 14:56:28 +00:00
Rémy Coutable d3aed10d70 Merge branch 'patch-1' into 'master'
Update PROCESS.md

Fix grammar by adding missing "we" 
Add extra newline so example isn't part of list.

See merge request !3845
2016-04-26 14:45:58 +00:00
Jacob Vosmaer 3c0ab15a74 Do not fsck projects less than a day old
This should bring the number of false positives down.
2016-04-26 13:35:52 +02:00
Jacob Vosmaer f127edd012 Merge branch '15094-throttle-update-of-last_activity_at' into 'master'
Throttle the update of `project.last_activity_at` to 1 minute

This implement [the solution](https://gitlab.com/gitlab-org/gitlab-ce/issues/15094#note_4769387) proposed by @jacobvosmaer.

See merge request !3848
2016-04-26 09:34:51 +00:00
Phil Hughes 97c1a1ef64 Updated based on feedback
Changed some variable names
Fixed CHANGELOG entry
2016-04-26 09:04:35 +01:00
Phil Hughes 7ee5de1980 Consistent border radius 2016-04-26 09:03:04 +01:00
Phil Hughes 06276bd355 Correctly shows no results text
Correct search results count
2016-04-26 09:03:04 +01:00
Phil Hughes 3137559dfd Fixed issue with dropdown option not sticking
CHANGELOG item
2016-04-26 09:03:04 +01:00
Phil Hughes f5bea9df53 Fixed tests 2016-04-26 09:03:04 +01:00
Phil Hughes 262a3dd482 Humanize scope text 2016-04-26 09:03:04 +01:00
Phil Hughes 3b5879e50c Truncate issue description 2016-04-26 09:03:04 +01:00
Phil Hughes d369d52938 Focus field 2016-04-26 09:03:04 +01:00
Phil Hughes 6ac549c1de Use helper method 2016-04-26 09:03:04 +01:00
Phil Hughes aa316cbfff Changes dropdown toggle on search dropdowns 2016-04-26 09:03:04 +01:00
Phil Hughes 1c8d01b05a Removed category icons 2016-04-26 09:03:04 +01:00
Phil Hughes be521d7d76 icons on search bar 2016-04-26 09:03:04 +01:00
Phil Hughes 8e4aa6e391 Mobile updates for search UI 2016-04-26 09:03:04 +01:00