summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'zj-mattermost-slash-config' of gitlab.com:gitlab-org/gitlab-ce ...zj-mattermost-slash-configZ.J. van de Weg2016-12-210-0/+0
|\
| * Add new testsZ.J. van de Weg2016-12-212-0/+48
* | Add new testsZ.J. van de Weg2016-12-213-1/+54
|/
* Improve API specsKamil Trzcinski2016-12-216-66/+228
* Fix a few error messagesKamil Trzcinski2016-12-205-18/+14
* Use separate file for error.rbKamil Trzcinski2016-12-201-2/+0
* Merge branch 'zj-mattermost-slash-config' of gitlab.com:gitlab-org/gitlab-ce ...Kamil Trzcinski2016-12-208-43/+92
|\
| * Add controller testZ.J. van de Weg2016-12-201-0/+53
| * Fix rspec tests due to different APIZ.J. van de Weg2016-12-205-36/+33
| * Merge branch 'zj-mattermost-slash-config' of gitlab.com:gitlab-org/gitlab-ce ...Z.J. van de Weg2016-12-202-8/+35
| |\
| * | Fix rubocop errors [ci skip]Z.J. van de Weg2016-12-204-8/+7
* | | Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-configKamil Trzcinski2016-12-20130-1139/+8284
|\ \ \ | |_|/ |/| |
| * | Merge branch 'avatar-circles' into 'master' Fatih Acet2016-12-202-2/+1
| |\ \
| | * | Fix sizing of avatar circles; add borderavatar-circlesAnnabel Dunstone Gray2016-12-202-2/+1
| * | | Merge branch '4269-public-files-api' into 'master' Sean McGivern2016-12-208-38/+84
| |\ \ \
| | * | | Improve specs for Files API4269-public-files-apiRémy Coutable2016-12-203-34/+61
| | * | | Allow unauthenticated access to Repositories Files API GET endpointsRémy Coutable2016-12-206-16/+35
| * | | | Merge branch 'gitlab-workhorse-1.2.1' into 'master' Rémy Coutable2016-12-201-1/+1
| |\ \ \ \
| | * | | | Use gitlab-workhorse 1.2.1Jacob Vosmaer2016-12-201-1/+1
| * | | | | Merge branch '25093-hide-new-issue-btn-non-loggedin-user' into 'master' Fatih Acet2016-12-202-1/+5
| |\ \ \ \ \
| | * | | | | adds changelog files25093-hide-new-issue-btn-non-loggedin-userNur Rony2016-12-191-0/+4
| | * | | | | hides new issue btn for now loggedin userNur Rony2016-12-191-1/+1
| * | | | | | Merge branch 'bold-wip-removed-note' into 'master' Sean McGivern2016-12-201-1/+1
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Make 'unmarked as WIP' message more consistentjurre2016-12-201-1/+1
| | | |/ / / | | |/| | |
| * | | | | Merge branch 'jej-memoize-milestoneish-visible-to-user' into 'master' Sean McGivern2016-12-204-6/+40
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Milestoneish SQL performance partially improved and memoizedjej-memoize-milestoneish-visible-to-userJames Edwards-Jones2016-12-204-6/+40
| * | | | | Merge branch '4269-public-repositories-api' into 'master' Sean McGivern2016-12-205-142/+412
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Improve specs for Repositories API4269-public-repositories-apiRémy Coutable2016-12-203-114/+266
| | * | | | Allow Repositories API GET endpoints to be requested anonymouslyRémy Coutable2016-12-194-93/+211
| * | | | | Merge branch 'project-authorizations-diff' into 'master' Nick Thomas2016-12-207-61/+364
| |\ \ \ \ \
| | * | | | | Smarter refreshing of authorized projectsproject-authorizations-diffYorick Peterse2016-12-197-61/+364
| * | | | | | Merge branch '25678-remove-user-build' into 'master' Rémy Coutable2016-12-203-5/+5
| |\ \ \ \ \ \
| | * | | | | | remove build_user from model UserArsenev Vladislav2016-12-183-5/+5
| * | | | | | | Merge branch 'fix_team_member_expiration_date_spec' into 'master' Grzegorz Bizon2016-12-201-2/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Fix member with expiration date feature specfix_team_member_expiration_date_specFelipe Artur2016-12-191-2/+2
| * | | | | | | | Merge branch 'move-admin-projects-spinach-tests-to-rspec' into 'master' Rémy Coutable2016-12-203-159/+91
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Move admin projects spinach tests to rspecSemyon Pupkov2016-12-193-159/+91
| | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'doc-for-pipeline-duration' into 'master' Rémy Coutable2016-12-201-0/+31
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Add docs for pipeline durationdoc-for-pipeline-durationLin Jen-Shin2016-12-151-0/+31
| * | | | | | | | | Merge branch '22348-gitea-importer-docs' into 'master' Rémy Coutable2016-12-204-5/+85
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix link to img22348-gitea-importer-docsAchilleas Pipinellis2016-12-191-1/+1
| | * | | | | | | | | Remove duplicate image and optimize the remaining oneAchilleas Pipinellis2016-12-192-0/+0
| | * | | | | | | | | Add doc for the Gitea importerRémy Coutable2016-12-195-5/+85
| * | | | | | | | | | Merge branch '22348-gitea-importer' into 'master' Rémy Coutable2016-12-2039-657/+1357
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Add Project#gitea_import?22348-gitea-importerRémy Coutable2016-12-195-5/+21
| | * | | | | | | | | | Namespace access token session key in `Import::GithubController`Rémy Coutable2016-12-196-30/+38
| | * | | | | | | | | | Reduce duplication for GitHubish import status viewRémy Coutable2016-12-195-131/+89
| | * | | | | | | | | | Improve Gitlab::ImportSourcesRémy Coutable2016-12-194-43/+125
| | * | | | | | | | | | Modify GithubImport to support GiteaRémy Coutable2016-12-1922-337/+513
| | * | | | | | | | | | Rename Gogs to Gitea, DRY the controller and improve viewsRémy Coutable2016-12-1926-433/+632