summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | Merge branch 'clean-oauth-username' into 'master'Dmitriy Zaporozhets2015-02-132-1/+11
|\ \ \ | |/ / |/| |
| * | Clean username acquired from OAuth/LDAP.Douwe Maan2015-02-122-1/+11
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-02-121-72/+31
|\ \ \ | | |/ | |/|
| * | Merge pull request #8445 from jvanbaarsen/project-spec-speed-upJeroen van Baarsen2015-02-121-72/+31
| |\ \ | | |/ | |/|
| | * Improved speed of the project_spec.rbJeroen van Baarsen2015-02-031-72/+31
* | | Merge branch 'issues_tracker_template' into 'master'Dmitriy Zaporozhets2015-02-121-1/+27
|\ \ \
| * | | Add a test for service template.Marin Jankovski2015-02-121-0/+25
| * | | Annotate services. Add a link to service template.Marin Jankovski2015-02-111-1/+2
| |/ /
* | | Edit group members via APIVinnie Okada2015-02-111-0/+63
|/ /
* | Merge branch 'add_label_notes' into 'master'Dmitriy Zaporozhets2015-02-112-2/+20
|\ \
| * | Add labels notesNikita Verkhovin2015-02-082-2/+20
* | | Merge branch 'issue-closing-pattern' into 'master'Marin Jankovski2015-02-111-1/+91
|\ \ \
| * | | Extend issue closing pattern.Douwe Maan2015-02-081-1/+91
| |/ /
* | | Merge branch 'broadcast-message-api' into 'master'Dmitriy Zaporozhets2015-02-101-12/+33
|\ \ \ | |/ / |/| |
| * | Add internal broadcast message API.Douwe Maan2015-02-071-12/+33
* | | Merge pull request #8580 from j0k3r/asanaDmitriy Zaporozhets2015-02-082-0/+61
|\ \ \
| * | | Fix testJeremy2015-02-021-1/+0
| * | | Fix HoundCIJeremy2015-02-021-3/+0
| * | | Add restrict_to_branch to service controllerJeremy2015-02-021-1/+3
| * | | Add Asana serviceJeremy2015-02-022-0/+63
* | | | Merge pull request #8749 from sashkab/b8748-emailheaderDmitriy Zaporozhets2015-02-081-0/+2
|\ \ \ \
| * | | | Addex X-GitLab-Project header to GitLab emails.Aleks Bunin2015-02-071-0/+2
| | |/ / | |/| |
* | | | Merge branch 'notification_email'Dmitriy Zaporozhets2015-02-071-2/+7
|\ \ \ \ | |/ / / |/| | |
| * | | Allow notification email to be set separately from primary email.Douwe Maan2015-02-071-2/+7
* | | | Merge branch 'api-default-order' into 'master'Dmitriy Zaporozhets2015-02-064-25/+34
|\ \ \ \
| * | | | Fix testsDmitriy Zaporozhets2015-02-053-22/+27
| * | | | Refactor and improve sorting objects in API for projects, issues and merge re...Dmitriy Zaporozhets2015-02-051-0/+4
| * | | | Refactor issuable sorting a bitDmitriy Zaporozhets2015-02-051-3/+3