summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Updated rspec to rspec 3.x syntaxJeroen van Baarsen2015-02-12183-3453/+3610
* Started on the rspec upgradeJeroen van Baarsen2015-02-124-16/+21
* Merge pull request #8445 from jvanbaarsen/project-spec-speed-upJeroen van Baarsen2015-02-122-73/+32
|\
| * Improved speed of the project_spec.rbJeroen van Baarsen2015-02-032-73/+32
* | Merge pull request #8739 from jvanbaarsen/pr/7818Jeroen van Baarsen2015-02-1232-1/+33
|\ \
| * | note about latest details being on master branchBen Bodenmiller2015-02-0532-1/+33
* | | Merge pull request #8750 from wtw/masterSytse Sijbrandij2015-02-111-19/+22
|\ \ \
| * | | Revise main README for cleanup and some minor clarificationsWolfram Twelker2015-02-081-19/+22
* | | | Merge pull request #8778 from al3x-edge/fix-emoji-linkSytse Sijbrandij2015-02-111-2/+2
|\ \ \ \
| * | | | Change emoji cheat sheet link to Amazon S3Alexander Ambrose2015-02-111-2/+2
* | | | | Merge branch 'issue_1064-fix_broken_doc_links' into 'master'Sytse Sijbrandij2015-02-111-2/+4
|\ \ \ \ \
| * | | | | Fix two broken links in the installation section.Ewan Edwards2015-02-111-2/+4
| |/ / / /
* | | | | Merge branch 'mobile-maximum-scale-1' into 'master'Dmitriy Zaporozhets2015-02-114-1/+7
|\ \ \ \ \
| * | | | | Add horizontal scrolling to code blocks.Douwe Maan2015-02-112-0/+5
| * | | | | Don't allow page to be scaled on mobile.Douwe Maan2015-02-092-1/+2
* | | | | | Merge branch 'fix-command-enter' into 'master'Dmitriy Zaporozhets2015-02-111-1/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Actually submit comment on command-enter.Douwe Maan2015-02-111-1/+2
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-02-1010-8/+99
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'add_label_notes' into 'master'Dmitriy Zaporozhets2015-02-1110-8/+99
| |\ \ \ \ \ \
| | * | | | | | Add labels notes to ChangelogNikita Verkhovin2015-02-111-1/+1
| | * | | | | | Add labels notesNikita Verkhovin2015-02-089-7/+98
| | | |/ / / / | | |/| | | |
* | | | | | | Merge branch 'bump_gitlab_shell' into 'master'Dmitriy Zaporozhets2015-02-111-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Bump gitlab-shell versionDmitriy Zaporozhets2015-02-101-1/+1
* | | | | | | Merge branch 'issue-closing-pattern' into 'master'Marin Jankovski2015-02-113-2/+93
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Extend issue closing pattern.Douwe Maan2015-02-083-2/+93
| |/ / / / /
* | | | | | Merge branch 'cleanup-gitlab-example' into 'master'Dmitriy Zaporozhets2015-02-102-18/+2
|\ \ \ \ \ \
| * | | | | | Remove settings from gitlab.yml.example which we already have in UIDmitriy Zaporozhets2015-02-102-18/+2
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'broadcast-message-api' into 'master'Dmitriy Zaporozhets2015-02-103-12/+45
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add internal broadcast message API.Douwe Maan2015-02-073-12/+45
* | | | | | Merge branch 'services-index' into 'master'Dmitriy Zaporozhets2015-02-092-1/+7
|\ \ \ \ \ \
| * | | | | | Add index on order columns for services tableDmitriy Zaporozhets2015-02-092-1/+7
* | | | | | | Merge branch 'bug/default_issue_tracker' into 'master'Dmitriy Zaporozhets2015-02-091-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Default issue tracker fix for creating default issue service.Marin Jankovski2015-02-091-1/+1
|/ / / / / /
* | | | | | Merge branch 'changelog-description' into 'master'Dmitriy Zaporozhets2015-02-092-3/+6
|\ \ \ \ \ \
| * | | | | | Link about random order doesn't make any sense, added it to the changelog.Sytse Sijbrandij2015-02-091-1/+1
| * | | | | | Better explain the changelog policy.Sytse Sijbrandij2015-02-091-2/+5
|/ / / / / /
* | | | | | Merge branch 'improve-release-guides' into 'master'Sytse Sijbrandij2015-02-094-62/+62
|\ \ \ \ \ \
| * | | | | | Update patch release documentDmitriy Zaporozhets2015-02-091-5/+5
| * | | | | | Update GitLab.com when packages are done. No need to wait 2 days for itDmitriy Zaporozhets2015-02-091-4/+1
| * | | | | | Extract update guide to separate doc to prevent messDmitriy Zaporozhets2015-02-092-53/+56
|/ / / / / /
* | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-02-091-0/+2
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #8620 from namnatulco/masterJeroen van Baarsen2015-02-091-0/+2
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Added a note saying inline HTML is disabled by defaultRens van der Heijden2015-01-211-0/+2
* | | | | | | Merge branch 'improve-oauth-ux' into 'master'Dmitriy Zaporozhets2015-02-091-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | When add new social account - redirect to accounts page and show notice messageDmitriy Zaporozhets2015-02-081-1/+1
* | | | | | | Merge pull request #8580 from j0k3r/asanaDmitriy Zaporozhets2015-02-0810-4/+217
|\ \ \ \ \ \ \
| * | | | | | | Fix testJeremy2015-02-021-1/+0
| * | | | | | | Fix HoundCIJeremy2015-02-022-9/+19
| * | | | | | | Add restrict_to_branch to service controllerJeremy2015-02-023-2/+6
| * | | | | | | Add Asana serviceJeremy2015-02-029-3/+203