summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Use `search_text_nodes` helper in our custom filtersrs-search_text_nodesRobert Speicher2015-04-222-2/+2
* Merge branch 'update_slack_doc' into 'master'Job van der Voort2015-04-221-3/+8
|\
| * Updated the Slack documentationPatricio Cano2015-04-211-3/+8
* | Merge branch 'rs-issue-2257' into 'master'Dmitriy Zaporozhets2015-04-222-4/+18
|\ \
| * | Recover from all `URI::Error`sRobert Speicher2015-04-212-4/+18
* | | Merge branch 'missing-upgrade-doc' into 'master'Marin Jankovski2015-04-221-0/+118
|\ \ \
| * | | add 7.9-7.10 upgrade docJob van der Voort2015-04-221-0/+118
|/ / /
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-222-4/+4
|\ \ \
| * \ \ Merge branch 'update_grack' into 'master'Dmitriy Zaporozhets2015-04-222-4/+4
| |\ \ \
| | * | | Update gitlab-grack to 2.0.2.Marin Jankovski2015-04-222-4/+4
| |/ / /
* | | | Merge pull request #8831 from bladealslayer/fix/api-user-testsNihad Abbasov2015-04-221-4/+9
|\ \ \ \ | |/ / / |/| | |
| * | | Fix user API tests succeeding for the wrong reasonBoyan Tabakov2015-04-221-4/+9
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2015-04-221-2/+2
|\ \ \ \
| * \ \ \ Merge branch 'rs-toggle-tab' into 'master'Dmitriy Zaporozhets2015-04-221-2/+2
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Fix tab behavior on MergeRequests#newrs-toggle-tabRobert Speicher2015-04-211-2/+2
| |/ / /
* | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqMarin Jankovski2015-04-223-3/+5
|\ \ \ \
| * \ \ \ Merge pull request #9164 from dsander/fix-markdown-previewJeroen van Baarsen2015-04-221-1/+1
| |\ \ \ \
| | * | | | Make issue preview look like the resultDominik Sander2015-04-211-1/+1
| * | | | | Merge pull request #9059 from chulkilee/fix-hipchatJeroen van Baarsen2015-04-222-2/+4
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | do not send empty message to hipchatChulki Lee2015-04-222-2/+4
| |/ / / /
* | | | | Merge branch 'rs-remove-gitlab-pipeline' into 'master'Dmitriy Zaporozhets2015-04-226-209/+307
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | More cleanup of gitlab_markdown_helper_specRobert Speicher2015-04-211-98/+92
| * | | | Use Nokogiri in `link_to_gfm` specsRobert Speicher2015-04-211-20/+22
| * | | | Update Gitlab::Markdown to use the :new: EmojiFilter :sparkles:Robert Speicher2015-04-212-86/+18
| * | | | Add Gitlab::Markdown::EmojiFilterRobert Speicher2015-04-212-0/+176
| * | | | Change html-pipeline-gitlab gem to html-pipelineRobert Speicher2015-04-212-8/+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