| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Work around a Chrome 43 bug preventing note editingrs-issue-1568 | Robert Speicher | 2015-05-20 | 1 | -0/+7 |
| | | |||||
| * | 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 |
| | | | |||||
| * | | 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 |
| | | | | | |||||
| * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-05-14 | 2 | -9/+33 |
| |\ \ \ \ | |/ / / |/| | | | |||||
| | * | | | Refactor SessionsController to use a controller concernrs-refactor-2fa | Robert Speicher | 2015-05-14 | 2 | -9/+33 |
| | |/ / | |||||
| * | | | Add style for <kbd> element in markdown | afc163 | 2015-05-14 | 1 | -0/+16 |
| |/ / | | | | | | | Fixes #5825 | ||||
| * | | Use slightly fewer icons in project sidebar. | Douwe Maan | 2015-05-14 | 1 | -6/+0 |
| | | | |||||
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-05-14 | 5 | -32/+32 |
| |\ \ | |||||
| | * \ | Merge branch 'fix-group-mention' into 'master' | Dmitriy Zaporozhets | 2015-05-14 | 2 | -3/+3 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix mentioning of private groups. `issue.participants` would mistakenly not send the `current_user` to `mentioned_users`, which means it would search for referenced groups and users as if the user was signed out. Since signed out users don't have access to private groups (groups without public projects) and since you can't reference a group you don't have access to (since this would leak its existence), the group reference wasn't found and the group members weren't notified. Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2326. See merge request !654 | ||||
| | | * | | Fix mentioning of private groups. | Douwe Maan | 2015-05-14 | 2 | -3/+3 |
| | | |/ | |||||
| | * | | Always show note action icons. | Douwe Maan | 2015-05-14 | 3 | -29/+29 |
| | |/ | |||||
| * | | Merge branch 'omniauth-csrf' into 'master' | Dmitriy Zaporozhets | 2015-05-14 | 2 | -3/+3 |
| |\ \ | |/ |/| | | | | | | | | | | | Protect OmniAuth request phase against CSRF. Addresses #2268. See merge request !1793 | ||||
| | * | Protect OmniAuth request phase against CSRF. | Douwe Maan | 2015-04-24 | 2 | -3/+3 |
| | | | |||||
| * | | Fix text overflow in project sidebar | Dmitriy Zaporozhets | 2015-05-13 | 1 | -0/+4 |
| | | | |||||
| * | | Merge branch 'text-batch-1' into 'master' | Dmitriy Zaporozhets | 2015-05-13 | 1 | -2/+9 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Batch 1 of text improvements Batch 1 of changes from my effort at !635 to walk through every piece of text in GitLab and see if it can be improved. This batch includes: - Improve text on error pages. - Improve Git access error messages. - Improve description of branch protection levels. - Improve OAuth signup error message. - Improve OAuth application flash messages. cc @rspeicher See merge request !642 | ||||
| | * | | Improve OAuth signup error message. | Douwe Maan | 2015-05-13 | 1 | -2/+9 |
| | | | | |||||
| * | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2015-05-13 | 2 | -140/+15 |
| |\ \ \ | |||||
| | * \ \ | Merge pull request #9276 from jirutka/relative_link_filter | Dmitriy Zaporozhets | 2015-05-13 | 1 | -140/+0 |
| | |\ \ \ | | | | | | | | | | | Extract handling of relative file links to its own HTML filter | ||||
| | | * | | | Extract handling of relative file links to RelativeLinkFilter | Jakub Jirutka | 2015-05-11 | 1 | -140/+0 |
| | | | | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |