Commit Graph
27541 Commits
Author SHA1 Message Date
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
Phil Hughes bb50edb16d Loads group & projects on search page with ajax 2016-04-26 09:03:04 +01:00
Phil Hughes b3af3930c6 Started updating search UI 2016-04-26 09:03:04 +01:00
Robert Speicher 6ff740ff94 Merge branch 'upgrade-gitlab-grit' into 'master'
Upgrade gitlab-grit gem to 2.8.1, loosening the mime-types gem's version dependency.

Changelog for mime-types: https://github.com/mime-types/ruby-mime-types/blob/master/History.rdoc

Resolves #15101.

See merge request !3901
2016-04-25 22:26:13 +00:00
Robert Speicher 48f516a843 Merge branch 'link_user_avatar_in_activity_page_to_profile' into 'master'
Link user avatar in activity page to user profile

Closes #14927

See merge request !3910
2016-04-25 21:34:37 +00:00
Jacob Schatz 9182c93c00 Merge branch 'fix-changelog' into 'master'
Move CHANGELOG entry to 8.8

Fixes CHANGELOG entry for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3686

See merge request !3914
2016-04-25 20:15:08 +00:00
Jacob Schatz 8fc0eed357 Merge branch 'emoji-unicode-fix' into 'master'
Fixes issue with emoji comments not showing correct emoji image

Previously it would look for the unicode character inside the award menu. But this menu might not always be there.

Now, the unicode characters are loaded onto the page in an array which the award emoji that looks in to get the correct emoji unicode character

Fixes #15512

See merge request !3885
2016-04-25 20:04:35 +00:00
Jacob Schatz 3d115d6748 Merge branch 'diff-line-colors' into 'master'
Update diff blue & yellow to match design

<img src="/uploads/60e1351fb04ab1c8969685fbc8b61c88/Screen_Shot_2016-04-22_at_9.12.17_AM.png" width="500px">
<img src="/uploads/6812b22ec53f3041811261daa0584822/Screen_Shot_2016-04-22_at_9.12.05_AM.png" width="500px">

See merge request !3883
2016-04-25 19:30:15 +00:00
Achilleas Pipinellis ad46466cb9 Merge branch 'fix/ci-docker-images-documentation' into 'master'
Replace '-n' with '--name' in docker related documentation

`-n` for `docker run` is outdated. We should use `--name` instead. This MR fixes the example in documentation.

Fixes #15174

See merge request !3908
2016-04-25 19:29:02 +00:00
Achilleas Pipinellis 19fc0ea776 Merge branch 'fix/ci-php-docker-example' into 'master'
Fix php-docker example (for new docker versions)

`/.dockerinit` file doesn't exists in new Docker versions. Instead `/.dockerenv` can be used. This MR fixes the PHP example which was working only for older Docker versions.

Fixes gitlab-org/gitlab-ci-multi-runner#1241

See merge request !3907
2016-04-25 19:28:35 +00:00
Jacob Schatz 103b1444bd Merge branch 'blur-award-btn' into 'master'
Triggers blur after clicking award button

![blur](/uploads/6cd53a5ac314e8048c656685935747e2/blur.gif)

Fixes #15511

See merge request !3881
2016-04-25 19:27:36 +00:00
Alfredo Sumaran 1a79613df2 Move CHANGELOG entry to 8.8 2016-04-25 14:21:55 -05:00
Jacob Schatz d809507e05 Merge branch 'issue_14904' into 'master'
Add new shortcuts

Closes #14904

- On a project: `i` To navigate to New Issue page.
- On a issuable: `l` To open Label dropdown on a issuable.
- Global: Typing `?` multiple times now toggles the modal.

See merge request !3686
2016-04-25 19:13:25 +00:00
Jacob Schatz af569f32e9 Merge branch 'project-dropdown-link-click-fix' into 'master'
Fixed issue with project dropdown links not being clickable



See merge request !3870
2016-04-25 18:47:30 +00:00
Jacob Schatz 99c4513eaa Merge branch 'word-break' into 'master'
Don't break line in middle of word

<img src="/uploads/cceb1a4212ff7785ace03cd6468edf85/Screen_Shot_2016-04-21_at_3.32.00_PM.png" width="500px">

See merge request !3864
2016-04-25 18:42:14 +00:00
Robert Speicher f89fea54e4 Merge branch 'fix/error-on-builds-page' into 'master'
Fix error on commit builds page

This MR fixes error on commit builds page that occurs before CI commit
(Pipeline) had been updated.

Closes #15509

See merge request !3874
2016-04-25 17:23:55 +00:00
Dmitriy Zaporozhets b79c5c40e1 Merge branch 'rs-503-page' into 'master'
Add a branded 503 static error page

[ci skip]

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15398

See merge request !3894
2016-04-25 17:13:23 +00:00
Grzegorz Bizon b822f65a52 Add Changelog entry for commit builds page fix 2016-04-25 18:39:58 +02:00
Robert Speicher c295f0d2cc Merge branch 'update-jquery-rails' into 'master'
Upgrade jQuery Rails from 4.0.5 to 4.1.1

Upgrades jQuery to 1.12.1 and jquery-ujs to 1.2.1.

Changelogs:
- https://github.com/rails/jquery-rails/blob/master/CHANGELOG.md
- https://blog.jquery.com/2016/01/08/jquery-2-2-and-1-12-released/
- https://github.com/rails/jquery-ujs/releases

See merge request !3642
2016-04-25 16:12:08 +00:00
Rémy Coutable 533cd8c2ee Throttle the update of project.last_activity_at to 1 minute
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-25 17:25:46 +02:00
Grzegorz Bizon ef032bb9f1 Fix error on commit builds page when no builds yet
Closes #15509
2016-04-25 17:19:57 +02:00
Yorick Peterse 81cb636e4f Merge branch 'fix-cache-invalidations' into 'master'
Fix Error 500 due to stale cache when projects are renamed or transferred

See merge request !3865
2016-04-25 14:57:16 +00:00
Stan Hu 6dff1a9a2b Fix Error 500 due to stale cache when projects are renamed or transferred
Closes gitlab-org/gitlab-ee#506
2016-04-25 06:57:50 -07:00
Arinde Eniola 0c0f634050 link user avatar in activity page to user profile 2016-04-25 13:13:43 +01:00
Jacob Schatz be85fde663 Merge branch 'scss-empty-rule' into 'master'
Enable the EmptyRule SCSS Linter

Prevents empty SCSS rules from being included in the SCSS.

Also fixes the handful of lints caught by the linter.

Regarding the `.gh` rule in monokai.scss, which was added in [this commit](https://gitlab.com/gitlab-org/gitlab-ce/commit/bf079c24afb8ad2991a4eaf60a71a7bc45dd775d), it appears to be empty in [the original file as well](https://github.com/richleland/pygments-css/blob/master/monokai.css). So I think it's fine to delete the selector.

cc: @jschatz1 

See merge request !3769
2016-04-25 11:30:50 +00:00