summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix tab behavior on MergeRequests#newrs-toggle-tabRobert Speicher2015-04-211-2/+2
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-211-1/+0
|\
| * Merge branch 'fix-duplicate-changelog-entry' into 'master'Hannes Rosenögger2015-04-211-1/+0
| |\
| | * Remove entry that was shipped in v7.9.1Stan Hu2015-04-161-1/+0
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-04-211-0/+1
|\ \ \
| * \ \ Merge pull request #8510 from koebi001/feature/backup_restoreDmitriy Zaporozhets2015-04-211-0/+1
| |\ \ \ | | |/ / | |/| |
| | * | add environment variable force to the documentationMarkus Köberl2014-12-291-0/+1
* | | | Merge branch 'rs-reference-filters' into 'master'Dmitriy Zaporozhets2015-04-2130-870/+2124
|\ \ \ \ | |/ / / |/| | |
| * | | Skip failing test until usernames can't end in periods againRobert Speicher2015-04-201-0/+1
| * | | Tweak single-word label regex to fix pending spec.Douwe Maan2015-04-202-2/+1
| * | | project_from_ref returns nil when reference doesn't exist.Douwe Maan2015-04-202-11/+14
| * | | Update markdown docs with latest referencesRobert Speicher2015-04-201-18/+25
| * | | project_from_ref returns nil when reference can't be accessedRobert Speicher2015-04-207-11/+16
| * | | Add more tests for cross-project referencesRobert Speicher2015-04-206-84/+139
| * | | Better commit lookup for CommitRangeReferenceFilterRobert Speicher2015-04-201-3/+15
| * | | Remove extraneous IGNORE_PARENTS from filterRobert Speicher2015-04-201-4/+0
| * | | Fix `user_can_reference_project?` checkRobert Speicher2015-04-201-1/+1
| * | | Escape title attributes in referencesRobert Speicher2015-04-2013-7/+52
| * | | Add spec for ReferenceExtractor#labelsRobert Speicher2015-04-201-0/+9
| * | | Better guard against nil projects in ReferenceFilterRobert Speicher2015-04-202-2/+7
| * | | Minor doc fixRobert Speicher2015-04-201-1/+1
| * | | Fix Issue and ExternalIssue reference specsRobert Speicher2015-04-202-7/+19
| * | | DRY up reference filters using ReferenceFilter base classRobert Speicher2015-04-2010-320/+55
| * | | Add a ReferenceFilter base classRobert Speicher2015-04-201-0/+68
| * | | Fix `user_can_reference_group?` checkRobert Speicher2015-04-201-1/+0
| * | | Add permission check to ReferenceExtractor's user mentionsRobert Speicher2015-04-201-1/+1
| * | | Fix cross-project reference specs for new permission checkRobert Speicher2015-04-205-0/+25
| * | | Rename `user_can_read_group?` to `user_can_reference_group?`Robert Speicher2015-04-201-2/+2
| * | | Check for project read permissions in cross-referencesRobert Speicher2015-04-202-12/+49
| * | | Remove more now-invalid specsRobert Speicher2015-04-201-66/+0
| * | | Fix broken specRobert Speicher2015-04-201-11/+1
| * | | Re-arrange spec/helpers/gitlab_markdown_helper_spec a bitRobert Speicher2015-04-201-111/+111
| * | | Begin cleaning out spec/helpers/gitlab_markdown_helper_specRobert Speicher2015-04-202-335/+31
| * | | Add current_user to filter contextRobert Speicher2015-04-201-0/+1
| * | | Remove Gitlab::Markdown from Gitlab::ReferenceExtractorRobert Speicher2015-04-201-2/+66
| * | | Add permission checking to UserReferenceFilterRobert Speicher2015-04-202-7/+26
| * | | Add name-based referencing to LabelReferenceFilterRobert Speicher2015-04-202-26/+130
| * | | Remove duplicate ampersand from Label title format validatorRobert Speicher2015-04-201-1/+1
| * | | Fix ReferenceExtractor specRobert Speicher2015-04-201-1/+1
| * | | Run SanitizationFilter before our reference filtersRobert Speicher2015-04-201-2/+7
| * | | Add more GFM reference examples to docsRobert Speicher2015-04-201-2/+6
| * | | Make CommitRange and Snippets cross-referableRobert Speicher2015-04-204-67/+96
| * | | Fix GitlabMarkdownHelper specRobert Speicher2015-04-202-3/+11
| * | | Reference filters :sparkles:Robert Speicher2015-04-2024-341/+1728
* | | | Merge branch 'upgrade-guide-gitlab-shell' into 'master'Dmitriy Zaporozhets2015-04-211-1/+1
|\ \ \ \
| * | | | 7.10 requires gitlab-shell 2.6.2.upgrade-guide-gitlab-shellDouwe Maan2015-04-211-1/+1
| |/ / /
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-219-36/+79
|\ \ \ \
| * \ \ \ Merge branch 'google-code-fixes' into 'master'Dmitriy Zaporozhets2015-04-214-32/+72
| |\ \ \ \
| | * | | | Update Google Code importer test.google-code-fixesDouwe Maan2015-04-211-3/+4
| | * | | | Improve description of Google Code import user map.Douwe Maan2015-04-211-3/+25