summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'add-irker-service' of https://github.com/Aorimn/gitlabhq into A...Dmitriy Zaporozhets2015-03-021-0/+103
|\
| * Add Irker serviceAorimn2015-03-011-0/+103
* | Merge pull request #8501 from AKoetsier/slack_channel_and_usernameDmitriy Zaporozhets2015-03-021-0/+22
|\ \
| * | Allow a user to specify a channel and username for the slack-webhookAndrès Koetsier2015-02-281-0/+22
* | | Fix broken `project_url` routing when protected branches are accessed with an...Stan Hu2015-03-011-0/+10
| |/ |/|
* | Merge pull request #8890 from sue445/feature/project_api_avatar_urlJeroen van Baarsen2015-03-012-2/+35
|\ \
| * | Expose avatar_url in projects APIsue4452015-03-012-2/+35
* | | Merge pull request #8858 from Razer6/update-version-sorterJeroen van Baarsen2015-02-281-2/+4
|\ \ \ | |_|/ |/| |
| * | Add UTF-8 character to version_sorter testRobert Schilling2015-02-251-4/+4
| * | Update version sorter to 2.0.0, fixes #8572Robert Schilling2015-02-241-2/+4
* | | Fix and test User#contributed_projects_ids.Douwe Maan2015-02-271-0/+28
* | | Allow mass-unassigning of issuesRobert Speicher2015-02-251-0/+19
* | | Rename bulk_update_context_spec to bulk_update_service_specRobert Speicher2015-02-251-0/+0
| |/ |/|
* | Merge branch 'extend_markdown_upload' into 'master'Dmitriy Zaporozhets2015-02-254-100/+132
|\ \
| * | Fix spec.Douwe Maan2015-02-241-1/+1
| * | Merge branch 'master' into extend_markdown_uploadDouwe Maan2015-02-2431-257/+386
| |\ \ | | |/
| * | Merge branch 'master' into extend_markdown_uploadDouwe Maan2015-02-213-0/+93
| |\ \
| * | | Fix specs.Douwe Maan2015-02-201-2/+2
| * | | Merge branch 'extend_markdown_upload' into generic-uploadsDouwe Maan2015-02-204-103/+128
| |\ \ \
| | * | | Refactor.Douwe Maan2015-02-173-57/+57
| | * | | Fix testsHannes Rosenögger2015-02-171-2/+2
| | * | | implement Project::UploadsControllerHannes Rosenögger2015-02-171-4/+4
| | * | | Fix testsHannes Rosenögger2015-02-171-4/+4
| | * | | Generalize the image upload in markdownHannes Rosenögger2015-02-173-77/+102
* | | | | Fix specs.Douwe Maan2015-02-243-0/+3
* | | | | Add Bitbucket importer.Douwe Maan2015-02-244-7/+104
| |_|_|/ |/| | |
* | | | Using gitlab url to build links for gitlab issue tracker and add a spec. Fix ...Marin Jankovski2015-02-232-3/+63
* | | | Improve error messages when file editing failsVinnie Okada2015-02-221-4/+24
* | | | Merge branch 'master' into rails-4.1.9Vinnie Okada2015-02-213-0/+93
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-02-202-0/+90
| |\ \ \
| | * | | Add gitorious.org importerMarcin Kulik2015-02-202-0/+90
| | |/ /
| * | | Extend project web hooks with more dataDmitriy Zaporozhets2015-02-201-0/+3
| |/ /
* | | Merge branch 'master' into rails-4.1.9Vinnie Okada2015-02-195-19/+38
|\ \ \ | |/ /
| * | Improve broadcast message APIDmitriy Zaporozhets2015-02-181-1/+2
| * | Merge branch 'fix-relative-anchored-links' into 'master'Dmitriy Zaporozhets2015-02-181-1/+13
| |\ \
| | * | Fix Markdown relative links to files with anchors.Douwe Maan2015-02-181-1/+13
| | |/
| * | Merge pull request #8774 from tsigo/rs-testenvDmitriy Zaporozhets2015-02-171-14/+20
| |\ \ | | |/ | |/|
| | * TestEnv improvementsRobert Speicher2015-02-161-14/+20
| * | Merge branch 'md-preview-class' into 'master'Dmitriy Zaporozhets2015-02-171-1/+1
| |\ \ | | |/ | |/|
| | * Make sure Markdown previews always use the same styling as the eventual desti...Douwe Maan2015-02-171-1/+1
| * | Merge branch 'tweet-new-project'Dmitriy Zaporozhets2015-02-151-2/+2
| |\ \
| | * | Fix specs.Douwe Maan2015-02-131-2/+2
| | |/
* | | Upgrade to Rails 4.1.9Vinnie Okada2015-02-1428-248/+290
|/ /
* | Prevent autogenerated OAuth username to clash with existing namespace.Douwe Maan2015-02-131-2/+2
|/
* Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-02-12182-3547/+3796
|\
| * Merge pull request #8785 from jvanbaarsen/rspec-upgradeDmitriy Zaporozhets2015-02-12182-3547/+3796
| |\
| | * Even more hound fixesJeroen van Baarsen2015-02-1216-191/+266
| | * Fixed hound warningsJeroen van Baarsen2015-02-126-15/+31
| | * Updated rspec to rspec 3.x syntaxJeroen van Baarsen2015-02-12182-3452/+3609
| | * Started on the rspec upgradeJeroen van Baarsen2015-02-122-3/+4