| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Clarify navigation labels for Project Settings and Group Settings.nav-settings | Douwe Maan | 2015-05-25 | 2 | -2/+2 |
| | | |||||
| * | Merge branch 'disabled-issues-mr-features' into 'master' | Douwe Maan | 2015-05-25 | 3 | -38/+28 |
| |\ | | | | | | | | | | | | | | | Disable "New Issue" and "New Merge Request" buttons when features are disabled in project settings Closes #1676 See merge request !691 | ||||
| | * | Disable "New Issue" and "New Merge Request" buttons when features are ↵ | Stan Hu | 2015-05-25 | 3 | -38/+28 |
| | | | | | | | | | | | | | disabled in project settings Closes #1676 | ||||
| * | | Merge branch 'add-webhook-note-events' into 'master' | Douwe Maan | 2015-05-25 | 7 | -3/+16 |
| |\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | Add support for Webhook note events | Stan Hu | 2015-05-21 | 7 | -3/+16 |
| | | | | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/6745 | ||||
| * | | Use the user list from the target project in a merge request | Stan Hu | 2015-05-22 | 3 | -5/+6 |
| |/ | | | | Closes #1535 | ||||
| * | Fix Atom feeds. | Douwe Maan | 2015-05-21 | 7 | -7/+7 |
| | | |||||
| * | Merge branch 'rs-issue-1568' into 'master' | Douwe Maan | 2015-05-21 | 1 | -0/+8 |
| |\ | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | Workaround that doesn't add unwanted newline. | Douwe Maan | 2015-05-21 | 1 | -4/+5 |
| | | | |||||
| | * | Work around a Chrome 43 bug preventing note editingrs-issue-1568 | Robert Speicher | 2015-05-20 | 1 | -0/+7 |
| | | | |||||
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Job van der Voort | 2015-05-21 | 5 | -9/+19 |
| |\ \ | |||||
| | * \ | Merge branch 'rs-issue-1645' into 'master' | Dmitriy Zaporozhets | 2015-05-20 | 1 | -2/+2 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | | * | | Subclass TaskList::Filter to fix a bugrs-issue-1645 | Robert Speicher | 2015-05-20 | 1 | -2/+2 |
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | | workaround for buggy lexers | Hannes Rosenögger | 2015-05-20 | 1 | -2/+4 |
| | |/ | | | | | | | if something goes wrong, fall back to the plaintext lexer | ||||
| | * | Merge branch 'explain-wip-mr' into 'master' | Dmitriy Zaporozhets | 2015-05-20 | 3 | -5/+13 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add explanation about WIP status to MR form.   See merge request !666 | ||||
| | | * | Remove italics and margin from merge request form help. | Douwe Maan | 2015-05-20 | 1 | -1/+1 |
| | | | | |||||
| | | * | Fix copy.explain-wip-mr | Douwe Maan | 2015-05-17 | 1 | -1/+1 |
| | | | | |||||
| | | * | Add explanation about WIP status to MR form. | Douwe Maan | 2015-05-15 | 3 | -5/+13 |
| | | | | |||||
| * | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Job van der Voort | 2015-05-21 | 4 | -8/+12 |
| |\ \ \ | |||||
| | * | | | Disabled expansion of top/bottom blobs for new file diffs | Alex Connor | 2015-05-21 | 4 | -8/+12 |
| | |/ / | |||||
| * | | | Small css improvements | Dmitriy Zaporozhets | 2015-05-19 | 3 | -2/+7 |
| |/ / | |||||
| * | | Simplify and unify helpers for rendering markup | Jakub Jirutka | 2015-05-18 | 5 | -30/+7 |
| | | | |||||
| * | | Rename MarkdownHelper to MarkupHelper | Jakub Jirutka | 2015-05-18 | 3 | -7/+7 |
| | | | |||||
| * | | Handle AsciiDoc better, reuse HTML pipeline filters (fixes #9263) | Jakub Jirutka | 2015-05-18 | 3 | -3/+26 |
| | | | |||||
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-05-18 | 8 | -21/+52 |
| |\ \ | |||||
| | * \ | Merge branch 'rs-issue-1626' into 'master' | Dmitriy Zaporozhets | 2015-05-18 | 3 | -3/+3 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix labels for project/snippet visibility selection Closes #1626 See merge request !671 | ||||
| | | * | | Increase left margin for visibility descriptionsrs-issue-1626 | Robert Speicher | 2015-05-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | Now they line up with their title. | ||||
| | | * | | Fix labels for project/snippet visibility selection | Robert Speicher | 2015-05-16 | 2 | -2/+2 |
| | | | | | |||||
| | * | | | Merge branch 'rs-default-tooltip-placement' into 'master' | Dmitriy Zaporozhets | 2015-05-18 | 1 | -2/+2 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | | * | | | Fix default tooltip placementrs-default-tooltip-placement | Robert Speicher | 2015-05-17 | 1 | -2/+2 |
| | | |/ / | |||||
| | * | | | Add search issues/MR by number | Nikita Verkhovin | 2015-05-18 | 2 | -2/+18 |
| | |/ / | |||||
| | * | | Merge branch 'unauthorized-participants' into 'master' | Dmitriy Zaporozhets | 2015-05-16 | 2 | -14/+29 |
| | |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | 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 | ||||
| | | * | Fix. | Douwe Maan | 2015-05-15 | 1 | -1/+1 |
| | | | | |||||
| | | * | Don't include users without project access in participants. | Douwe Maan | 2015-05-15 | 1 | -6/+14 |
| | | | | |||||
| | | * | Move stuff around a bit in NotifictionService. | Douwe Maan | 2015-05-15 | 1 | -8/+15 |
| | | | | |||||
| * | | | Fill in email on the new password form | Vinnie Okada | 2015-05-16 | 4 | -4/+4 |
| | | | | |||||
| * | | | Redirect if password reset token is expired | Vinnie Okada | 2015-05-16 | 1 | -0/+20 |
| | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | | Explain reset token expiration in emails | Vinnie Okada | 2015-05-16 | 3 | -0/+23 |
| |/ / | | | | | | | | | Tell new users when their password reset token expires and provide a link to get a new one. | ||||
| * | | Fix push event. | Douwe Maan | 2015-05-15 | 1 | -1/+1 |
| |/ | |||||
| * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-05-15 | 10 | -24/+34 |
| |\ | |||||
| | * | Merge branch 'dashboard-references' into 'master' | Dmitriy Zaporozhets | 2015-05-15 | 7 | -13/+15 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | | * | Fix reference links in dashboard activity and ATOM feeds.dashboard-references | Douwe Maan | 2015-05-14 | 7 | -13/+15 |
| | | | | |||||
| | * | | Merge branch 'spinner-spin' into 'master' | Dmitriy Zaporozhets | 2015-05-15 | 1 | -6/+6 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Spin icon next to "Checking for CI status..." Stationary spinners make me sad. See merge request !655 | ||||
| | | * | | Spin icon next to "Checking for CI status..."spinner-spin | Douwe Maan | 2015-05-14 | 1 | -6/+6 |
| | | |/ | |||||
| | * | | Merge branch 'use-count-badges' into 'master' | Dmitriy Zaporozhets | 2015-05-15 | 2 | -5/+13 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | Use count badges with number_with_delimiter helper for issue, commit count See merge request !658 | ||||
| | | * | | Small refactoring of state_filters_text_for helperuse-count-badges | Dmitriy Zaporozhets | 2015-05-14 | 1 | -3/+2 |
| | | | | | |||||
| | | * | | append empty space only if count exists | Dmitriy Zaporozhets | 2015-05-14 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | Use count badges with number_with_delimiter helper for issue, commit count | Dmitriy Zaporozhets | 2015-05-14 | 2 | -5/+14 |
| | | | | | |||||
| * | | | | Merge pull request #9296 from jorgevbo/master | Jeroen van Baarsen | 2015-05-15 | 1 | -1/+1 |
| |\ \ \ \ | |/ / / |/| | | | Fix bug with default timezone en RSS gitlab events | ||||
| | * | | | Fix bug with default timezone en RSS gitlab events | Jorge Vasquez | 2015-05-14 | 1 | -1/+1 |
| | | | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |