Commit graph

48109 commits

Author SHA1 Message Date
Rémy Coutable
153b594c06 Merge branch '28058-hide-emails-in-atom-feeds' into 'security'
Only show public emails in atom feeds

See merge request 
2017-03-20 18:45:45 -07:00
James Lopez
770a703bd8 Update CHANGELOG.md for 8.17.4
[ci skip]
2017-03-19 21:12:11 +01:00
James Lopez
b730fb450f Update CHANGELOG.md for 8.16.8
[ci skip]
2017-03-19 21:06:35 +01:00
James Lopez
4ccf874d31 Update CHANGELOG.md for 8.15.8
[ci skip]
2017-03-19 15:19:26 +01:00
Robert Speicher
0eff4f14cc Merge branch 'all-ci-offline-migrations' into 'master'
All CI offline migrations

See merge request 
2017-03-17 23:06:12 +00:00
Kamil Trzciński
12dd5ac221 All CI offline migrations 2017-03-17 23:06:11 +00:00
Annabel Dunstone Gray
94246c7aa0 Merge branch '26236-monospace-gfm' into 'master'
26236 Change gfm textarea to use monospace font

Closes 

See merge request 
2017-03-17 22:22:58 +00:00
tauriedavis
4ecb038013 26236 Change gfm textarea to use monospace font
add changelog entry
2017-03-17 14:03:08 -06:00
Annabel Dunstone Gray
5d71d9fb9d Merge branch '29586-pipelines-tabs' into 'master'
Remove width from nav links

Closes 

See merge request 
2017-03-17 19:57:04 +00:00
Filipa Lacerda
e6f4a4c1ae Merge branch 'fixed-diff-avatar-tooltip-escaping' into 'master'
Fixes diff comment avatar tooltip escaping issues

Closes 

See merge request 
2017-03-17 18:16:08 +00:00
Rémy Coutable
d90c250586 Merge branch '27477-refactor-notification-recipients' into 'master'
Resolve "Extract logic of who should receive notification into separate classes"

Closes 

See merge request 
2017-03-17 17:56:06 +00:00
Dongqing Hu
90ade76b2e Resolve "Extract logic of who should receive notification into separate classes" 2017-03-17 17:56:04 +00:00
Rémy Coutable
bbddd77086 Merge branch 'database-config-method' into 'master'
Added Gitlab::Database.config

See merge request 
2017-03-17 17:52:46 +00:00
Robert Speicher
5409a3c5b7 Merge branch 'feature/use-gitaly-for-commit-show' into 'master'
Use Gitaly for CommitController#show

See merge request 
2017-03-17 17:41:44 +00:00
Rémy Coutable
c1b4f800f3 Merge branch 'fix/gb/gitlab-qa-start-page-cold-boot' into 'master'
Resolve GitLab QA cold boot problems on entry page

See merge request 
2017-03-17 17:31:21 +00:00
Alfredo Sumaran
0e4f2e014b Merge branch 'fl-remove-ujs-pipelines' into 'master'
Remove UJS actions from pipelines tables

Closes , , and 

See merge request 
2017-03-17 17:30:34 +00:00
Filipa Lacerda
b0f2cbceb3 Remove UJS actions from pipelines tables 2017-03-17 17:30:32 +00:00
Robert Speicher
bb1620aaf7 Merge branch 'fix-time-sensitive-helper-spec' into 'master'
Fix time-sensitive helper spec

See merge request 
2017-03-17 16:40:04 +00:00
Clement Ho
1a4aa8d727 Merge branch '29557-fix-unicode-1-1' into 'master'
Fix Unicode 1.1 emojis

Closes 

See merge request 
2017-03-17 16:33:31 +00:00
Filipa Lacerda
a2f2b9510b Remove width from nav links 2017-03-17 16:23:29 +00:00
Yorick Peterse
9a20ff1c99
Added Gitlab::Database.config
This returns the ActiveRecord configuration for the current environment.

While CE doesn't use this very often, EE will use it in a few places for
the database load balancing code. I'm adding this to CE so we don't end
up with merge conflicts in this file.
2017-03-17 17:08:10 +01:00
Robert Speicher
7a62390752 Merge branch '20121-add-a-new-have_html_escaped_body_text-matcher' into 'master'
Add a new have_html_escaped_body_text that match an HTML-escaped text

Closes 

See merge request 
2017-03-17 15:18:34 +00:00
Rémy Coutable
76f7cf924b
Fix time-sensitive helper spec
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-03-17 16:14:04 +01:00
Jacob Schatz
2b2ce1b231 Merge branch 'build-notification-null-check' into 'master'
Stop CI notification showing when status is nil

See merge request 
2017-03-17 15:10:35 +00:00
Jacob Schatz
7add0e8564 Merge branch 'update-realtime-docs' into 'master'
Updates realtime documentation for the Frontend

See merge request 
2017-03-17 15:08:07 +00:00
Filipa Lacerda
2e1b9999f9 Updates realtime documentation for the Frontend 2017-03-17 15:08:06 +00:00
Sean Packham (GitLab)
4c2ea7d02d Merge branch 'docs/award_emojis' into 'master'
Refactor award emojis document

Closes 

See merge request 
2017-03-17 15:07:20 +00:00
Filipa Lacerda
b29a8e3c2e Merge branch 'boards-blank-state-template-in-js' into 'master'
Issue boards blank state template in JS file

See merge request 
2017-03-17 14:45:01 +00:00
Rémy Coutable
357db226a0 Merge branch '29577-restore-sub-nav-with-activity-tab' into 'master'
Restore sub-nav (Activity) for empty project

Closes 

See merge request 
2017-03-17 14:42:40 +00:00
Sean McGivern
1ac6bb553f Merge branch 'add-labels-to-issue-hook' into 'master'
Added labels to the issue web hook

Closes 

See merge request 
2017-03-17 13:37:32 +00:00
Sean McGivern
d50034245a Merge branch '29604-v3-fix-branch-creation' into 'master'
Use "branch_name" instead "branch" on V3 branch creation API

Closes 

See merge request 
2017-03-17 12:36:56 +00:00
Sean McGivern
375b870b77 Merge branch '21451-allow-disable-mr-link' into 'master'
Add ability to disable Merge Request URL on push

Closes 

See merge request 
2017-03-17 12:35:40 +00:00
Alex Sanford
68e3fa0e58 Add ability to disable Merge Request URL on push 2017-03-17 12:35:39 +00:00
Luke "Jared" Bennett
f2be76f3e8
Added labels to the issue web hook 2017-03-17 12:14:26 +00:00
Sean McGivern
d68c23a00e Merge branch '26470-branch-names-with-reference-prefixes-results-in-buggy-branches' into 'master'
Strip reference prefixes on branch creation

Closes 

See merge request 
2017-03-17 12:02:50 +00:00
Job van der Voort
5ae6d1f856 Add a documentation blurb to the new issue template to encourage writing (better) documentation. 2017-03-17 11:43:33 +00:00
Job van der Voort
8d8dfd8e0d documentation blurb in issue template 2017-03-17 11:43:32 +00:00
Rémy Coutable
2f14535271 Merge branch 'fix-make-email-static' into 'master'
Make sure alias email would never match original user

See merge request 
2017-03-17 11:40:12 +00:00
Rémy Coutable
517598ba10 Add a new have_html_escaped_body_text that match an HTML-escaped text
This solves transient failures when a text contains HTML-escapable
characters such as `'`.

Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-03-17 12:20:54 +01:00
Phil Hughes
d6c4453a92 Stop CI notification showing when status is nil 2017-03-17 11:20:36 +00:00
Achilleas Pipinellis
a406918787 Refactor award emojis document
[ci skip]
2017-03-17 11:51:11 +01:00
Rémy Coutable
f016da6207 Merge branch 'fix-make-time-test-more-reliable' into 'master'
Make the test less time sensitive by extending 0.2 days

See merge request 
2017-03-17 10:50:39 +00:00
Grzegorz Bizon
cc88759999 Do not use Ruby Timeout module in GitLab QA 2017-03-17 11:00:27 +01:00
Lin Jen-Shin
46287f3638 Make sure alias email would never match:
Hopefully this could fix:

https://gitlab.com/gitlab-org/gitlab-ce/builds/12431186

To make sure that the email would never contain "joh"
otherwise it would match to this `another_user`.
2017-03-17 17:54:56 +08:00
Lin Jen-Shin
f451f777cc Make the test less time sensitive by extending 0.2
days. This shall fix:
https://gitlab.com/gitlab-org/gitlab-ce/builds/12411626

and other test failures for the same thing.
2017-03-17 15:14:39 +08:00
Eric Eastwood
03ebbccf98 Restore sub-nav for empty project
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/29577
2017-03-16 23:56:53 -05:00
Eric Eastwood
790d9d401b Fix Unicode 1.1 emojis
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/29557

When using the full font-stack some the Unicode 1.1 emojis are taken up
by fonts closer up the stack and don't represent the emoji well.

```
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif, "Apple
Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
```

 - On Windows, "Segoe UI" -> "Arial" takes over
 - On mac OS, "Helvetia" -> ".SF NS Display" takes over

mac OS 10.12.3 | Windows 10
--- | ---
![](http://i.imgur.com/JI99zoH.png) | ![](http://i.imgur.com/aek8G1X.png)

---

When using a shorter emoji font-stack, everything seems to be covered
well 🎉

```
font-family: "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
```

 - On Windows, "Segoe UI Emoji"  takes over
 - On mac OS, "Apply Color Emoji" takes over

mac OS 10.12.3 | Windows 10
--- | ---
![](http://i.imgur.com/bDwpGCw.png) | ![](http://i.imgur.com/7kUwEJQ.png)
2017-03-16 22:46:31 -05:00
Alfredo Sumaran
4bf4612cfb Merge branch 'fix-unknown-emojis-in-frequently-used-awards' into 'master'
Protect against unknown emojis in frequently used list

See merge request 
2017-03-17 00:32:30 +00:00
Oswaldo Ferreira
3f11174196 Use "branch_name" instead "branch" on V3 branch creation API 2017-03-16 21:15:16 -03:00
Robert Speicher
13b1e4fe33 Merge branch 'dm-use-index-by' into 'master'
Use Enumerable#index_by where possible

See merge request 
2017-03-17 00:13:31 +00:00