home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-14 15:16:04 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,287 Commits 48 Branches 340 Tags
0a5b005da170fe81afea012b56f4810125b13ead
Commit Graph
8955 Commits
Author SHA1 Message Date
Stan Hu ae552ec315 Fix Markdown preview not working in Edit Milestone page 
Closes #1687
Closes https://github.com/gitlabhq/gitlabhq/issues/9325
 2015-05-25 21:03:55 -07:00
Stan Hu 710627fbd8 Fix Zen Mode not closing with ESC key 
Closes #1025
 2015-05-25 20:27:20 -07:00
Stan Hu 9bcd36396b Refactor permission checks to use can? instead of issues_enabled and merge_requests_enabled 2015-05-25 16:51:04 -07:00
Douwe Maan 0c8d8b91e0 Clarify navigation labels for Project Settings and Group Settings. 2015-05-25 17:18:24 +02:00
Douwe Maan d25026a512 Add Accepted and Rejected tabs to MR lists. 2015-05-25 17:01:27 +02:00
Douwe Maan ebe9c89082 Consistently refer to MRs as either Accepted or Rejected. 2015-05-25 17:01:14 +02:00
Douwe Maan 59f0d91a20 Prefix EmailsOnPush email subject with [Git]. 2015-05-25 16:35:37 +02:00
Douwe Maan 2fa5c7513e Group project contributions by both name and email. 2015-05-25 15:43:22 +02:00
Douwe Maan 04d4452286 Merge branch 'disabled-issues-mr-features' into 'master' 
Disable "New Issue" and "New Merge Request" buttons when features are disabled in project settings

Closes #1676

See merge request !691
 2015-05-25 12:04:55 +00:00
Stan Hu a7d8a7bd3d Disable "New Issue" and "New Merge Request" buttons when features are disabled in project settings 
Closes #1676
 2015-05-25 06:16:33 -04:00
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:

![image](https://gitlab.com/stanhu/gitlab-ce/uploads/299b141d82f7b14943a74258d5c57ca6/image.png)

Closes https://github.com/gitlabhq/gitlabhq/issues/6745

See merge request !673
 2015-05-25 07:57:52 +00:00
Stan Hu 310e08dc2c Fix clone URL losing selection after a single click in Safari and Chrome 
Closes #9326
 2015-05-24 20:19:26 -04:00
Robert Speicher 7b879bb8bd Bump secret key length to 32 2015-05-23 18:47:53 -04:00
Robert Speicher e73ea12695 Add support for manually entering 2FA details 2015-05-23 15:04:40 -04: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
Robert Speicher 4e2ee018c3 Make the actual labels on Labels#index links 
Now the user can click the labels themselves or the "X open issues"
text.
 2015-05-21 23:43:08 -04:00
Robert Speicher 9bdd7f34a5 Add link_to_label helper 2015-05-21 23:40:25 -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 ConnorandJeroen 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.

![Screen_Shot_2015-05-15_at_13.48.49](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b3f70585255a043f07c61570549a90ba/Screen_Shot_2015-05-15_at_13.48.49.png)

![Screen_Shot_2015-05-15_at_13.49.01](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c9992708c8ef5ef4fa2bcc2c3173b8e3/Screen_Shot_2015-05-15_at_13.49.01.png)

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
Ben Boeckel b8571f141e email: fix typo 2015-05-18 09:33:16 -04: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 that prevented elements with the `has_tooltip` class from having the default tooltip placement if they didn't define one.

See merge request !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
Eaden 003e1d39af projects doesn't seem to be a valid action in this controller 2015-05-16 23:04:45 +10: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