summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #8785 from jvanbaarsen/rspec-upgradeDmitriy Zaporozhets2015-02-12187-3563/+3816
|\
| * Fixed deprecation in spinach stubsJeroen van Baarsen2015-02-121-1/+1
| * Even more hound fixesJeroen van Baarsen2015-02-1216-191/+266
| * Fixed tests for spinachJeroen van Baarsen2015-02-121-1/+1
| * Fixed hound warningsJeroen van Baarsen2015-02-126-15/+31
| * 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 #8779 from KelvinMutuma/show-assignees-in-merge-requests-i...Dmitriy Zaporozhets2015-02-121-2/+4
|\ \
| * | Show Work In progress if a merge request is not assignedKelvin Mutuma2015-02-121-0/+2
| * | Show assignees in the merge-requests indexKelvin Mutuma2015-02-121-2/+2
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-02-122-4/+17
|\ \ \
| * \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceSytse Sijbrandij2015-02-122-4/+17
| |\ \ \
| | * \ \ Merge branch 'master' into 'master'Dmitriy Zaporozhets2015-02-122-4/+17
| | |\ \ \
| | | * | | Change label color text field type to "color"Benjamin Kammerl2015-02-111-1/+1
| | | * | | Reorders label colors for better "rainbow"phortx2015-01-131-8/+8
| | | * | | Add more label color suggestionsphortx2015-01-131-1/+14
* | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-02-1234-74/+65
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | |
| * | | | 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 branch 'gitattributes-merge-union' into 'master'Sytse Sijbrandij2015-02-123-35/+2
|\ \ \ \ \ \ \
| * | | | | | | Use gitattribute merge=union to reduce CHANGELOG merge conflicts.Douwe Maan2015-02-123-35/+2
* | | | | | | | Merge branch 'issues_tracker_template' into 'master'Dmitriy Zaporozhets2015-02-1235-56/+280
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Use the service_name.Marin Jankovski2015-02-121-2/+2
| * | | | | | | Add a test for service template.Marin Jankovski2015-02-121-0/+25
| * | | | | | | All services can have templates.Marin Jankovski2015-02-124-14/+26
| * | | | | | | Remove unecessary icon.Marin Jankovski2015-02-111-1/+0
| * | | | | | | Annotate services. Add a link to service template.Marin Jankovski2015-02-1123-51/+55
| * | | | | | | Add admin services templates.Marin Jankovski2015-02-119-15/+162
| * | | | | | | Remove not null constraint on project_id in services.Marin Jankovski2015-02-113-4/+9
| * | | | | | | Add template boolean to services.Marin Jankovski2015-02-113-2/+8
| * | | | | | | Add ExternalIssue base model to make issue referencing more robust for extern...Marin Jankovski2015-02-113-4/+30
* | | | | | | | Merge branch 'api-edit-groups' into 'master'Dmitriy Zaporozhets2015-02-128-32/+133
|\ \ \ \ \ \ \ \
| * | | | | | | | Edit group members via APIVinnie Okada2015-02-116-11/+109
| | |/ / / / / / | |/| | | | | |
| * | | | | | | 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 'ssh-link' into 'master'Dmitriy Zaporozhets2015-02-111-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix link to SSH help page.Douwe Maan2015-02-111-1/+1
| |/ / / / / /
* | | | | | | 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
| |\ \ \ \ \ \ \ \