summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* More SystemNoteService cleanuprs-to_referenceRobert Speicher2015-05-263-46/+22
|
* Surround Project.reference_pattern in parenthesis inside other patternsRobert Speicher2015-05-264-4/+7
|
* Make `cross_project_reference?` less magicalRobert Speicher2015-05-261-4/+3
|
* Support only double quotes for multi-word label referencesRobert Speicher2015-05-261-6/+4
|
* Fix for Snippets with a projectRobert Speicher2015-05-261-1/+1
|
* Minor documentation updatesRobert Speicher2015-05-262-2/+2
|
* Add `reference_pattern` to Referable modelsRobert Speicher2015-05-2611-9/+114
|
* Update CommitRange#to_reference to use full SHAsRobert Speicher2015-05-261-3/+6
| | | | We only want them shortened by the filter, which calls to_s
* Implement gfm_reference directly in MentionableRobert Speicher2015-05-264-19/+8
| | | | Except for Note, which still overrides it.
* Simplify `cross_project_reference` with `to_reference`Robert Speicher2015-05-261-7/+17
|
* Minor model spec cleanupsRobert Speicher2015-05-261-1/+2
| | | | Snippet model was missing project association
* Add `to_reference` for models that support referencesRobert Speicher2015-05-2610-16/+138
| | | | | Now there is a single source of information for which attribute a model uses to be referenced, and its special character.
* Add Referable concernRobert Speicher2015-05-261-0/+52
|
* Add Commit#==Robert Speicher2015-05-261-0/+4
| | | | | | | | Prior, comparison would use the Ruby object's ID, which got out of sync after a Spring fork and would result in erroneous test failures. Now we just check that the compared object is a Commit and then compare their underlying raw commit objects.
* Merge branch 'milestoneRescue' into 'master'Robert Schilling2015-05-262-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | Change percent_complete rescue value from 100 to 0 The percent_complete method returns a value of 100 when a ZeroDivisionError occurs. That seems like a very strange default for an error case, and results in a bug when a milestone has no corresponding issues (new, empty milestones show 100% completion). This commit changes the rescue value to 0, and subsequently fixes #1656, which reported this problem. See merge request !714
| * Change percent_complete rescue value from 100 to 0Jonah Bishop2015-05-262-2/+2
| | | | | | | | | | | | | | | | | | The percent_complete method returns a value of 100 when a ZeroDivisionError occurs. That seems like a very strange default for an error case, and results in a bug when a milestone has no corresponding issues (new, empty milestones show 100% completion). This commit changes the rescue value to 0, and subsequently fixes #1656, which reported this problem.
* | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-05-262-5/+15
|\ \
| * \ Merge pull request #9319 from jvanbaarsen/validate-wiki-page-creationJeroen van Baarsen2015-05-262-5/+15
| |\ \ | | | | | | | | Validate wiki page creation
| | * | Validate wiki page creationJeroen van Baarsen2015-05-262-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | **What does this do?** It adds validation to the creation of a wiki page, that way the user gets real feedback instead of just a 404 page if the name of the wiki page was invalid **Why is this needed?** There are a lot of characters that are not allowed in the creation of a wiki page, there is even a small text that is saying: Please don't use spaces. Although we have that text there, we don't actually validate on this. This commit adds validation on the title and gives the user actual feedback. **What issues does this fix?** Fixes http://github.com/gitlabhq/gitlabhq/issues/5357 Fixes https://github.com/gitlabhq/gitlabhq/issues/8565 Fixes https://github.com/gitlabhq/gitlabhq/issues/3913 Fixes https://github.com/gitlabhq/gitlabhq/issues/8166 Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2015-05-261-2/+2
|\ \ \ \ | |/ / /
| * | | Merge branch 'fix-escape-key-in-zen-mode' into 'master'Robert Schilling2015-05-261-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Zen Mode not closing with ESC key ### What does this MR do? This MR fixes the ESC key not leaving Zen Mode (fullscreen). ### Why was this MR needed? This has been broken since GitLab v7.8. The `change` event for `zen-toggle-comment` was never fired. See: http://stackoverflow.com/questions/19505011/checkbox-checked-with-prop-does-not-fire-events-attached-to-change?answertab=votes#tab-top ### What are the relevant issue numbers? * Closes #1025 * Closes https://github.com/gitlabhq/gitlabhq/issues/9018 See merge request !710
| | * | | Fix Zen Mode not closing with ESC keyStan Hu2015-05-251-2/+2
| | | | | | | | | | | | | | | | | | | | Closes #1025
* | | | | Use default control for search field in headerDmitriy Zaporozhets2015-05-262-13/+1
|/ / / / | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-05-267-31/+46
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | Merge branch 'rs-link_to_label' into 'master'Dmitriy Zaporozhets2015-05-266-10/+44
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add link_to_label helper The primary purpose of this change was to make the actual labels on `Labels#index` clickable. See merge request !690
| | * | Make the actual labels on Labels#index linksrs-link_to_labelRobert Speicher2015-05-211-1/+1
| | | | | | | | | | | | | | | | | | | | Now the user can click the labels themselves or the "X open issues" text.
| | * | Add link_to_label helperRobert Speicher2015-05-216-9/+43
| | | |
| * | | Merge branch 'fix-fullscreen-preview-in-milestones' into 'master'Dmitriy Zaporozhets2015-05-261-21/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Markdown preview not working in Edit Milestone page ### What does this MR do? This MR removes the automatic Zen Mode URL update when a hash is present and makes Markdown preview work again in the Edit Milestone page. I think the intent was to make it possible to link to a full-screen edit with a URL (e.g. http://foo/bar/issues/1/edit#fullscreen), but I don't this has ever worked. Perhaps a future MR can support this. ### Why was this MR needed? A JavaScript error would be seen in the Milestone Edit page: ```javascript Uncaught error, unrecognized expression: $('.zennable input[type=checkbox]##md-preview-holder') ``` In the Milestone Edit page, apparently the use of the hash `#md-preview-holder` causes the Zen Mode JavaScript to attempt to parse the hash for the `fullscreen_` prefix and look up the checkbox based on a unknown ID. ### Are there points in the code the reviewer needs to double check? If we want to keep this hash update, an alternative fix is to add an `if` check in the beginning of `checkboxFromLocationHash`: ```coffeescript if (window.location.hash.indexOf('#' + ZenMode.fullscreen_prefix) == -1) return null ``` ### What are the relevant issue numbers? * Closes #1687 * Closes https://github.com/gitlabhq/gitlabhq/issues/9325 See merge request !711
| | * | | Fix Markdown preview not working in Edit Milestone pageStan Hu2015-05-251-21/+2
| | | |/ | | |/| | | | | | | | | | | | | Closes #1687 Closes https://github.com/gitlabhq/gitlabhq/issues/9325
* | | | Use .md as extention for wiki pagesJeroen van Baarsen2015-05-261-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | **What does this do?** It makes sure that when you create a wiki page via the web interface, the extention is .md instead of .markdown **Why is this needed?** When you're using Gollum locally, it will create pages with the .md extention. Also .md is the best known extention for markdown. This fix will make sure that if you're using gollum or the webinterface, the extention will be the same. **What issues does this fix?** Fixes https://github.com/gitlabhq/gitlabhq/issues/5204 Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* | | Refactor permission checks to use `can?` instead of `issues_enabled` and ↵Stan Hu2015-05-253-6/+20
|/ / | | | | | | `merge_requests_enabled`
* | Merge branch 'disabled-issues-mr-features' into 'master'Douwe Maan2015-05-253-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 Hu2015-05-253-38/+28
| | | | | | | | | | | | | | | | | | disabled in project settings Closes #1676
* | | Merge branch 'add-webhook-note-events' into 'master'Douwe Maan2015-05-257-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: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/299b141d82f7b14943a74258d5c57ca6/image.png) Closes https://github.com/gitlabhq/gitlabhq/issues/6745 See merge request !673
| * | Add support for Webhook note eventsStan Hu2015-05-217-3/+16
| |/ | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/6745
* | Use the user list from the target project in a merge requestStan Hu2015-05-223-5/+6
|/ | | | Closes #1535
* Fix Atom feeds.Douwe Maan2015-05-217-7/+7
|
* Merge branch 'rs-issue-1568' into 'master'Douwe Maan2015-05-211-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 Maan2015-05-211-4/+5
| |
| * Work around a Chrome 43 bug preventing note editingrs-issue-1568Robert Speicher2015-05-201-0/+7
| |
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceJob van der Voort2015-05-215-9/+19
|\ \
| * \ Merge branch 'rs-issue-1645' into 'master'Dmitriy Zaporozhets2015-05-201-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-1645Robert Speicher2015-05-201-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 lexersHannes Rosenögger2015-05-201-2/+4
| |/ | | | | | | if something goes wrong, fall back to the plaintext lexer
| * Merge branch 'explain-wip-mr' into 'master'Dmitriy Zaporozhets2015-05-203-5/+13
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Remove italics and margin from merge request form help.Douwe Maan2015-05-201-1/+1
| | |
| | * Fix copy.explain-wip-mrDouwe Maan2015-05-171-1/+1
| | |
| | * Add explanation about WIP status to MR form.Douwe Maan2015-05-153-5/+13
| | |
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhqJob van der Voort2015-05-214-8/+12
|\ \ \
| * | | Disabled expansion of top/bottom blobs for new file diffsAlex Connor2015-05-214-8/+12
| |/ /