summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | OAuth2 provider documentationValery Sizov2015-02-136-1/+33
| |/ /
* | | Merge branch 'test_settings' into 'master'Dmitriy Zaporozhets2015-02-132-1/+24
|\ \ \
| * | | Fix rubocop error.Marin Jankovski2015-02-121-1/+1
| * | | Try to test settings added in the service.Marin Jankovski2015-02-122-1/+24
* | | | Merge branch 'add_tracker_integration_doc' into 'master'Dmitriy Zaporozhets2015-02-136-6/+49
|\ \ \ \
| * | | | Text changes recommended by Job.Marin Jankovski2015-02-131-5/+5
| * | | | Explained in the integration documentation how to enable external issue trackerMarin Jankovski2015-02-126-6/+49
| |/ / /
* | | | Merge branch 'signin-page-headings' into 'master'Dmitriy Zaporozhets2015-02-136-30/+32
|\ \ \ \
| * | | | Move OAuth signin options just below signin box.Douwe Maan2015-02-135-24/+19
| * | | | Add headings to signin/signup blocks on signin page.Douwe Maan2015-02-133-6/+13
| | |/ / | |/| |
* | | | Merge branch 'dashboard-new-project' into 'master'Dmitriy Zaporozhets2015-02-132-3/+9
|\ \ \ \
| * | | | Add "New Project" button to dashboard projects page.Douwe Maan2015-02-132-3/+9
| |/ / /
* | | | Merge branch 'head-panel-link' into 'master'Dmitriy Zaporozhets2015-02-1312-10/+13
|\ \ \ \ | |_|_|/ |/| | |
| * | | Link head panel titles to relevant root page.Douwe Maan2015-02-1312-10/+13
| |/ /
* | | Add assignees in mr page to the CHANGELOG.Marin Jankovski2015-02-131-2/+3
|/ /
* | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-02-12187-3563/+3816
|\ \
| * \ 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 branch 'clean-oauth-username' into 'master'Dmitriy Zaporozhets2015-02-135-6/+33
|\ \ \ \ | |/ / / |/| | |
| * | | Clean username acquired from OAuth/LDAP.Douwe Maan2015-02-125-6/+33
* | | | 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