summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Point people to the issue tracker on GitLab.com to prevent duplication.point-to-gitlab-comSytse Sijbrandij2015-05-261-4/+2
|
* 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
* | 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
| | * | | | | Fix Markdown preview not working in Edit Milestone pageStan Hu2015-05-252-21/+3
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | Closes #1687 Closes https://github.com/gitlabhq/gitlabhq/issues/9325
* | | | | | Merge pull request #9320 from jvanbaarsen/wiki-extentionJeroen van Baarsen2015-05-262-1/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Use .md as extention for wiki pages
| * | | | | Use .md as extention for wiki pagesJeroen van Baarsen2015-05-262-1/+2
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | **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>
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-05-2634-131/+436
|\ \ \ \ \
| * \ \ \ \ Merge branch 'fix-milestone-browse-issues-permission-check' into 'master'Douwe Maan2015-05-264-6/+21
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor permission checks with issues and merge requests project settings Slight refinement for read/write permission checks for 04d44522 as discussed in !691. Currently it appears that there is [no role that only has read-only access to issues](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/permissions/permissions.md), but it could be possible. /cc: @DouweM See merge request !704
| | * | | | | Refactor permission checks to use `can?` instead of `issues_enabled` and ↵Stan Hu2015-05-254-6/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | `merge_requests_enabled`
| * | | | | | Merge branch 'get-monkey-off-my-rack-attack' into 'master'Douwe Maan2015-05-267-71/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Rack Attack monkey patches and bump to version 4.3.0 I finally got these monkey patches into Rack Attack v4.3.0, so GitLab no longer needs them. Hooray! See: https://github.com/kickstarter/rack-attack/pull/128 See merge request !693
| | * | | | | | Remove Rack Attack monkey patches and bump to version 4.3.0Stan Hu2015-05-227-71/+5
| | | | | | | |
| * | | | | | | Merge branch 'master' into 'master'Job van der Voort2015-05-262-0/+23
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added documentation styleguide Hi. I added a documentation styleguide and linked it to https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides See merge request !709
| | * | | | | | fixed infoKaren2015-05-261-4/+2
| | | | | | | |
| | * | | | | | fixed linkKaren2015-05-261-1/+1
| | | | | | | |
| | * | | | | | added link to documentation style guideKaren2015-05-261-0/+1
| | | | | | | |
| | * | | | | | removed unnecessary informationKaren2015-05-261-5/+0
| | | | | | | |
| | * | | | | | fixed info boxKaren2015-05-261-2/+2
| | | | | | | |
| | * | | | | | created a documentation style guideKaren2015-05-261-0/+29
| |/ / / / / /
| * | | | | | Update reason for the merge window.Sytse Sijbrandij2015-05-251-1/+3
| | |/ / / / | |/| | | |
| * | | | | Merge branch 'rs-document-autolink' into 'master'Sytse Sijbrandij2015-05-251-6/+16
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Document expanded autolinking in doc/markdown/markdown.md See merge request !706
| | * | | | Document expanded autolinking in doc/markdown/markdown.mdRobert Speicher2015-05-251-6/+16
| |/ / / /
| * | | | Make clear that it are database migrationsSytse Sijbrandij2015-05-251-2/+2
| | | | |
| * | | | Merge branch 'disabled-issues-mr-features' into 'master'Douwe Maan2015-05-257-38/+49
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-257-38/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | disabled in project settings Closes #1676
| * | | | | Let's start 7.12Robert Schilling2015-05-251-1/+1
| | | | | |
| * | | | | Merge branch 'fix-redundant-changelog-entry' into 'master'Robert Schilling2015-05-251-1/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove redundant CHANGELOG entry This was moved into v7.10.4, but I forgot to delete it from the v7.11 list. See merge request !692
| | * | | | | This entry was already present in v7.10.4Stan Hu2015-05-221-1/+0
| | | | | | |
| * | | | | | Merge branch 'add-webhook-note-events' into 'master'Douwe Maan2015-05-2517-6/+317
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2117-6/+317
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/6745
* | | | | | Merge branch 'backup_gitlab.com' into 'master'Job van der Voort2015-05-261-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added note about backups for gitlab.com Added note about backups for Gitlab.com based on question on Twitter https://twitter.com/MarcelloLins/status/598544357294272513 See merge request !1828
| * | | | | | Explained info betterKaren Carias2015-05-261-1/+2
| | | | | | |
| * | | | | | Added note about backups for gitlab.comKaren Carias2015-05-211-0/+3
| | | | | | |
* | | | | | | Merge branch 'fix_timezonedoc' into 'master'Douwe Maan2015-05-251-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Time zone text fix Added small fix to /etc/gitlab/gitlab.rb See merge request !1830
| * | | | | | | small fixKaren Carias2015-05-251-1/+1
|/ / / / / / /
* | | | | | | Merge branch 'keyboard_shortcuts' into 'master'Sytse Sijbrandij2015-05-223-0/+6
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keyboard shortcuts Added doc about how to view keyboard shortcuts cc/ @sytse See merge request !1829
| * | | | | | fixed linkKaren Carias2015-05-221-1/+1
| | | | | | |
| * | | | | | Added link to keyboard shortcutsKaren Carias2015-05-221-0/+1
| | | | | | |
| * | | | | | test1 imageKaren Carias2015-05-221-1/+1
| | | | | | |
| * | | | | | keyboard shortcuts in GitLabKaren Carias2015-05-221-0/+5
| | | | | | |