Douwe Maan
2d0a9c4cc2
Merge branch 'add-webhook-note-events' into 'master'
...
Add support for Webhook note events
This MR adds support for note events (comments) for WebHooks.
Perhaps the only potential source of confusion is that the settings indicates "Note Events" instead of "Comments". What do you think?
Screenshot after:
Closes https://github.com/gitlabhq/gitlabhq/issues/6745
See merge request !673
2015-05-25 07:57:52 +00:00
Stan Hu
7a7ce70169
Use the user list from the target project in a merge request
...
Closes #1535
2015-05-22 09:52:09 -04:00
Stan Hu
deeff56967
Add support for Webhook note events
...
Closes https://github.com/gitlabhq/gitlabhq/issues/6745
2015-05-21 23:48:16 -04:00
Douwe Maan
9a60441ce4
Fix Atom feeds.
2015-05-21 11:39:33 +02:00
Douwe Maan
7298d05cc0
Merge branch 'rs-issue-1568' into 'master'
...
Work around a Chrome 43 bug preventing note editing
Fixes #1568 - and I mean "fixes"
I have no idea what causes this or why this fixes it and can't dig into it further right now, but the bug seems like a blocker so this needs to be fixed for 7.11.
See merge request !684
2015-05-21 09:31:59 +00:00
Douwe Maan
cbcc5f8544
Workaround that doesn't add unwanted newline.
2015-05-21 11:22:21 +02:00
Job van der Voort
3a3f4b41e6
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-05-21 10:38:22 +02:00
Job van der Voort
90b1019ab4
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2015-05-21 10:37:58 +02:00
Alex Connor and Jeroen van Baarsen
3c892f3554
Disabled expansion of top/bottom blobs for new file diffs
2015-05-21 09:25:07 +02:00
Dmitriy Zaporozhets
71b1a2c728
Merge branch 'rs-issue-1645' into 'master'
...
Use task_list fork to fix list items in notes
Closes #1645
See https://github.com/github/task_list/pull/60
See merge request !680
2015-05-20 17:00:38 +00:00
Robert Speicher
8e40d594a2
Work around a Chrome 43 bug preventing note editing
2015-05-20 12:53:35 -04:00
Robert Speicher
8ee382087d
Subclass TaskList::Filter to fix a bug
...
Instead of using a fork, we subclass the filter and only apply the
`task-list` class to list items that actually are task lists.
Closes #1645
See https://github.com/github/task_list/pull/60
2015-05-20 12:08:33 -04:00
Hannes Rosenögger
dfce7b62f7
workaround for buggy lexers
...
if something goes wrong, fall back to the plaintext lexer
2015-05-20 16:16:27 +02:00
Dmitriy Zaporozhets
76a758234a
Merge branch 'explain-wip-mr' into 'master'
...
Add explanation about WIP status to MR form.
See merge request !666
2015-05-20 12:08:51 +00:00
Douwe Maan
a393d6b163
Remove italics and margin from merge request form help.
2015-05-20 14:00:45 +02:00
Dmitriy Zaporozhets
15a6211e81
Small css improvements
2015-05-19 21:15:41 +03:00
Jakub Jirutka
b0659c1b07
Simplify and unify helpers for rendering markup
2015-05-18 22:52:13 +02:00
Jakub Jirutka
daa0925016
Rename MarkdownHelper to MarkupHelper
2015-05-18 22:51:56 +02:00
Jakub Jirutka
8dbc4746fe
Handle AsciiDoc better, reuse HTML pipeline filters ( fixes #9263 )
2015-05-18 20:48:03 +02:00
Dmitriy Zaporozhets
f5f0ed55bd
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-05-18 17:58:22 +03:00
Dmitriy Zaporozhets
f931904297
Merge branch 'rs-issue-1626' into 'master'
...
Fix labels for project/snippet visibility selection
Closes #1626
See merge request !671
2015-05-18 08:41:12 +00:00
Dmitriy Zaporozhets
a0fcbda9e2
Merge branch 'rs-default-tooltip-placement' into 'master'
...
Fix default tooltip placement
Made a logic error in 1e1785cc!674
2015-05-18 08:17:34 +00:00
Nikita Verkhovin
241f5971ba
Add search issues/MR by number
2015-05-18 13:09:13 +06:00
Robert Speicher
bd85e8ea5a
Fix default tooltip placement
2015-05-17 18:13:27 -04:00
Douwe Maan
b606bfdcaf
Fix copy.
2015-05-17 18:11:41 +02:00
Robert Speicher
2be995d71c
Increase left margin for visibility descriptions
...
Now they line up with their title.
2015-05-16 16:09:32 -04:00
Robert Speicher
c7ae428b4c
Fix labels for project/snippet visibility selection
2015-05-16 16:09:04 -04:00
Vinnie Okada
af428b1259
Fill in email on the new password form
2015-05-16 14:03:18 -06:00
Vinnie Okada
c68c23210b
Redirect if password reset token is expired
...
Don't display the password editing form if the user's token is expired;
redirect to the form that allows users to request a new password reset
token.
2015-05-16 14:03:18 -06:00
Vinnie Okada
0bfab084a8
Explain reset token expiration in emails
...
Tell new users when their password reset token expires and provide a
link to get a new one.
2015-05-16 14:03:07 -06:00
Dmitriy Zaporozhets
d0b1993bf8
Merge branch 'unauthorized-participants' into 'master'
...
Don't send notifications to mentioned users that don't have access to the project in question.
Fixes internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2325 .
See merge request !664
2015-05-16 11:30:57 +00:00
Douwe Maan
6960e83b1e
Fix.
2015-05-15 13:54:41 +02:00
Douwe Maan
c74375ae60
Add explanation about WIP status to MR form.
2015-05-15 13:50:04 +02:00
Douwe Maan
0b7c4fe048
Don't include users without project access in participants.
2015-05-15 12:46:52 +02:00
Douwe Maan
fb86ec519c
Move stuff around a bit in NotifictionService.
2015-05-15 12:45:18 +02:00
Douwe Maan
ac3d472ff4
Fix push event.
2015-05-15 12:11:16 +02:00
Dmitriy Zaporozhets
07fd736d2e
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-05-15 12:59:44 +03:00
Dmitriy Zaporozhets
9c6f4a2351
Merge branch 'dashboard-references' into 'master'
...
Fix reference links in dashboard activity and ATOM feeds.
References like `@user` were not linked on the dashboard activity feed and in Atom feeds, because the reference parser depends on `@project` which isn't set in those situations.
This MR passes the project in question to the reference parsers in an option.
cc @rspeicher
See merge request !653
2015-05-15 09:59:26 +00:00
Dmitriy Zaporozhets
de1aca131e
Merge branch 'spinner-spin' into 'master'
...
Spin icon next to "Checking for CI status..."
Stationary spinners make me sad.
See merge request !655
2015-05-15 09:57:24 +00:00
Dmitriy Zaporozhets
3b4c0ea06f
Merge branch 'use-count-badges' into 'master'
...
Use count badges with number_with_delimiter helper for issue, commit count
See merge request !658
2015-05-15 09:56:56 +00:00
Jeroen van Baarsen
735fbb43ed
Merge pull request #9296 from jorgevbo/master
...
Fix bug with default timezone en RSS gitlab events
2015-05-15 11:36:40 +02:00
Dmitriy Zaporozhets
e54ff51aca
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-05-14 23:26:44 +03:00
Jorge Vasquez
dfb58234a1
Fix bug with default timezone en RSS gitlab events
2015-05-14 15:30:55 -04:00
Robert Speicher
c802d8eee1
Refactor SessionsController to use a controller concern
2015-05-14 14:24:05 -04:00
afc163
2738978111
Add style for <kbd> element in markdown
...
Fixes #5825
2015-05-14 23:57:01 +08:00
Dmitriy Zaporozhets
ded82ed4c9
Small refactoring of state_filters_text_for helper
2015-05-14 18:34:06 +03:00
Dmitriy Zaporozhets
40f381e652
append empty space only if count exists
2015-05-14 18:32:07 +03:00
Dmitriy Zaporozhets
3d4d89f060
Use count badges with number_with_delimiter helper for issue, commit count
2015-05-14 18:30:23 +03:00
Douwe Maan
191bb46d74
Use slightly fewer icons in project sidebar.
2015-05-14 17:02:00 +02:00
Dmitriy Zaporozhets
19251a1fc7
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-05-14 17:22:55 +03:00
Douwe Maan
Stan Hu
Job van der Voort
Alex ConnorandJeroen van Baarsen
Dmitriy Zaporozhets
Robert Speicher
Hannes Rosenögger
Jakub Jirutka
Nikita Verkhovin
Vinnie Okada
Jorge Vasquez
afc163
