summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | Support only double quotes for multi-word label referencesRobert Speicher2015-05-264-53/+33
| | | | | | | |
| * | | | | | | 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-2620-74/+130
| | | | | | | |
| * | | | | | | Use `to_reference` in reference filter specsRobert Speicher2015-05-269-95/+86
| | | | | | | |
| * | | | | | | Add invalidate_reference to ReferenceFilterSpecHelperRobert Speicher2015-05-261-0/+19
| | | | | | | |
| * | | | | | | Update CommitRange#to_reference to use full SHAsRobert Speicher2015-05-263-18/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We only want them shortened by the filter, which calls to_s
| * | | | | | | Correct the ReferenceFilter html/pipeline/filter requireRobert Speicher2015-05-261-1/+1
| | | | | | | |
| * | | | | | | 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
| | | | | | | |
| * | | | | | | Use to_reference in Markdown feature specRobert Speicher2015-05-262-43/+38
| | | | | | | |
| * | | | | | | Use to_reference in Mentionable shared examplesRobert Speicher2015-05-261-18/+14
| | | | | | | |
| * | | | | | | Minor model spec cleanupsRobert Speicher2015-05-265-27/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Snippet model was missing project association
| * | | | | | | Add `to_reference` for models that support referencesRobert Speicher2015-05-2620-52/+377
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'rs-manual-2fa-entry' into 'master'Dmitriy Zaporozhets2015-05-275-6/+40
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for manually entering 2FA details > ![Screen_Shot_2015-05-22_at_6.39.26_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/27b6cc0b2f88e0ccec234dd8d20db957/Screen_Shot_2015-05-22_at_6.39.26_PM.png) Related to #1679 though I'm not sure if it entirely fixes it, since I don't have access to a Windows Phone. See merge request !694
| * | | | | | | | Bump secret key length to 32rs-manual-2fa-entryRobert Speicher2015-05-233-3/+3
| | | | | | | | |
| * | | | | | | | Add support for manually entering 2FA detailsRobert Speicher2015-05-235-6/+40
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqMarin Jankovski2015-05-271-1/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Added v7.4.4 and .5 to the CHANGELOGPatricio Cano2015-05-271-1/+7
| | | | | | | | |
* | | | | | | | | Merge branch 'rs-title-change-note' into 'master'Douwe Maan2015-05-278-8/+96
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a note when an Issue or Merge Request's title changes > ![Screen_Shot_2015-05-26_at_9.40.19_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/f05c6a7b9f489ce66560cfe724184ec9/Screen_Shot_2015-05-26_at_9.40.19_PM.png) Closes #1434 See merge request !717
| * | | | | | | | | Change one-character variable namers-title-change-noteRobert Speicher2015-05-272-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | Add a note when an Issue or Merge Request's title changesRobert Speicher2015-05-268-8/+96
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'fix-hipchat-default-api-version' into 'master'Douwe Maan2015-05-273-5/+29
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow HipChat API version to be blank and default to v2 ### What does this MR do? This MR fixes a regression introduced in v7.11 that requires a HipChat API version to be specified when it is supposed to be optional. ### Why was this MR needed? The "optional" HipChat API version in 57c724558 passed in a blank `api_version` when nothing was specified, and the code was not tested. This would cause a 500 Error. ### What are the relevant issue numbers? Closes #772 See merge request !718
| * | | | | | | | | Allow HipChat API version to be blank and default to v2Stan Hu2015-05-263-5/+29
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Closes #772
* | | | | | | | | Merge branch 'master' into 'master'Jeroen van Baarsen2015-05-271-0/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ADD: Note on how to setup dns hostname resolution to installation manual Hi, I'm suggesting to add the following note to the installation instructions. It took me some time to figure out why the test failed and why I wasn't able to push. The error messages did not point into the right direction so this might help other people with the same problems. I hope my english is good enough, if not, please feel free to rephrase anything. Thank you in advance, Holger Segnitz See merge request !236
| * | | | | | | | | ADD: Note on how to setup dns hostname resolution and why it is necessary to ↵Holger Segnitz2014-11-091-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | make the software run properly.
* | | | | | | | | | Merge branch 'fix-typo-in-email' into 'master'Robert Speicher2015-05-262-4/+4
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix "Asignee" typo in new issue/merge request emails See merge request !676
| * | | | | | | | | email: fix typoBen Boeckel2015-05-182-4/+4
| | | | | | | | | |
* | | | | | | | | | Merge branch 'milestoneRescue' into 'master'Robert Schilling2015-05-264-3/+4
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-264-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-265-5/+31
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge pull request #9319 from jvanbaarsen/validate-wiki-page-creationJeroen van Baarsen2015-05-265-5/+31
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | Validate wiki page creation
| | * | | | | | | | | Validate wiki page creationJeroen van Baarsen2015-05-265-5/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | **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-262-2/+3
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'fix-escape-key-in-zen-mode' into 'master'Robert Schilling2015-05-262-2/+3
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-252-2/+3
| | | |_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2627-81/+164
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | / / / / / / / | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'rs-link_to_label' into 'master'Dmitriy Zaporozhets2015-05-267-12/+110
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-217-11/+109
| | | | | | | | | |
| * | | | | | | | | Merge branch 'rs-gems' into 'master'Dmitriy Zaporozhets2015-05-2616-45/+41
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update ffaker gem Adds a version requirement which it didn't have before, at 2.0.0. This version has breaking API changes in that the namespace is now `FFaker` instead of `Faker`. Prior, if a new developer checked out the repo, ran `bundle install` and then tried `rake dev:setup`, seeding would fail due to having the latest version of ffaker without the API changes in this MR. Also updates `spring` version and the binstubs, just for kicks. See merge request !686
| | * | | | | | | | | Fix bin/rails binstubrs-gemsRobert Speicher2015-05-201-2/+3
| | | | | | | | | | |
| | * | | | | | | | | Update ffaker gemRobert Speicher2015-05-2014-34/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a version requirement which it didn't have before, at 2.0.0. This version has breaking API changes in that the namespace is now `FFaker` instead of `Faker`.
| | * | | | | | | | | Update spring, re-run binstubsRobert Speicher2015-05-204-14/+9
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'rs-issue-1690' into 'master'Dmitriy Zaporozhets2015-05-262-3/+10
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Better handle label references that aren't actually references Fixes #1690 See merge request !705
| | * | | | | | | | | | Better handle label references that aren't actually referencesrs-issue-1690Robert Speicher2015-05-252-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1690
| * | | | | | | | | | | Merge branch 'fix-fullscreen-preview-in-milestones' into 'master'Dmitriy Zaporozhets2015-05-262-21/+3
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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