Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'issue_17302' into 'master' | Rémy Coutable | 2016-05-18 | 1 | -3/+64 |
|\ | |||||
| * | Fix single note api request | Felipe Artur | 2016-05-16 | 1 | -3/+14 |
| * | Fix notes API calls symbol convertions | Felipe Artur | 2016-05-10 | 1 | -0/+31 |
| * | Fix api leaking notes when user is not authorized to read noteable | Felipe Artur | 2016-05-09 | 1 | -0/+19 |
* | | Merge branch 'issue_14684' into 'master' | Douwe Maan | 2016-05-16 | 3 | -10/+69 |
|\ \ | |||||
| * | | Change landing page when skipping confirmation email and add documentation | Felipe Artur | 2016-05-16 | 2 | -12/+35 |
| * | | Change skip_user_confirmation_email to send_user_confirmation_email | Felipe Artur | 2016-05-16 | 3 | -6/+9 |
| * | | Toggle email signup confirmation in admin settings | Felipe Artur | 2016-05-16 | 1 | -0/+33 |
* | | | Merge branch 'wiki-fix-reloaded' into 'master' | Rémy Coutable | 2016-05-16 | 1 | -1/+2 |
|\ \ \ | |||||
| * | | | Use the relative url prefix for links in Wiki | Artem Sidorenko | 2016-05-13 | 1 | -1/+2 |
* | | | | Merge branch 'unexpected-filtering-on-merge-requests' into 'master' | Rémy Coutable | 2016-05-16 | 1 | -0/+15 |
|\ \ \ \ | |||||
| * | | | | Add tests for unintentional filtering bug in MR (cf. !3872) | Takuya Noguchi | 2016-05-15 | 1 | -0/+15 |
* | | | | | Merge branch '17227-upcoming-milestone-is-confusing-when-projects-have-differ... | Douwe Maan | 2016-05-16 | 2 | -67/+146 |
|\ \ \ \ \ | |||||
| * | | | | | Return a relation with Postgres17227-upcoming-milestone-is-confusing-when-projects-have-different-milestones | Sean McGivern | 2016-05-16 | 1 | -1/+3 |
| * | | | | | Make upcoming milestone work across projects | Sean McGivern | 2016-05-16 | 2 | -0/+65 |
| * | | | | | Tidy up IssuesFinder specs | Sean McGivern | 2016-05-16 | 1 | -68/+80 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch '13691-allow-admin-to-reset-user-password-and-force-password-res... | Robert Speicher | 2016-05-16 | 2 | -0/+79 |
|\ \ \ \ \ | |||||
| * | | | | | Force password change after admin reset13691-allow-admin-to-reset-user-password-and-force-password-reset-on-next-login | Sean McGivern | 2016-05-16 | 2 | -0/+79 |
| |/ / / / | |||||
* | | | | | Merge branch 'docker-registry' into 'master' | Douwe Maan | 2016-05-16 | 4 | -0/+349 |
|\ \ \ \ \ | |||||
| * | | | | | Fix http status codes for container registry authentication service | Kamil Trzcinski | 2016-05-15 | 1 | -11/+6 |
| * | | | | | Improve authentication service specs | Kamil Trzcinski | 2016-05-15 | 2 | -16/+56 |
| * | | | | | Update JwtController specs | Kamil Trzcinski | 2016-05-15 | 1 | -36/+21 |
| * | | | | | Added specs for JwtController | Kamil Trzcinski | 2016-05-14 | 1 | -0/+87 |
| * | | | | | Rename JWT to JSONWebToken | Kamil Trzcinski | 2016-05-14 | 3 | -3/+3 |
| * | | | | | Fix authentication service | Kamil Trzcinski | 2016-05-14 | 1 | -0/+1 |
| * | | | | | Rename specs | Kamil Trzcinski | 2016-05-14 | 1 | -1/+1 |
| * | | | | | Use Auth::ContainerRegistryAuthenticationService | Kamil Trzcinski | 2016-05-14 | 1 | -1/+1 |
| * | | | | | Fix specs | Kamil Trzcinski | 2016-05-14 | 1 | -1/+1 |
| * | | | | | Merge remote-tracking branch 'origin/master' into docker-registry | Kamil Trzcinski | 2016-05-13 | 98 | -1096/+1354 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| * | | | | | Fix CI tests | Kamil Trzcinski | 2016-05-12 | 3 | -30/+30 |
| * | | | | | Added rspec for testing container registry authentication service | Kamil Trzcinski | 2016-05-09 | 3 | -0/+241 |
* | | | | | | Merge branch 'gh-pull-requests' | Douwe Maan | 2016-05-16 | 3 | -32/+100 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Fix validation method for Gitlab::GithubImport::PullRequestFormatter | Douglas Barbosa Alexandre | 2016-05-13 | 2 | -2/+16 |
| * | | | | | Extract GitHub branch formatter | Douglas Barbosa Alexandre | 2016-05-13 | 2 | -88/+57 |
| * | | | | | Import PRs where branch names were reused across PRs | Douglas Barbosa Alexandre | 2016-05-13 | 1 | -6/+26 |
| * | | | | | Preserve commits/diff/comments for PRs that were merged on GitHub | Douglas Barbosa Alexandre | 2016-05-13 | 2 | -2/+19 |
| * | | | | | Fix spec for Gitlab::GithubImport::PullRequestFormatter | Douglas Barbosa Alexandre | 2016-05-13 | 1 | -22/+70 |
| | |/ / / | |/| | | | |||||
* | | | | | Add cache count metrics to rails cacheadd-cache-count-metrics | Pablo Carranza | 2016-05-15 | 1 | -5/+11 |
| |_|/ / |/| | | | |||||
* | | | | Update specs | Douwe Maan | 2016-05-13 | 3 | -78/+4 |
* | | | | Clean up LegacyDiffNote somewhat | Douwe Maan | 2016-05-13 | 1 | -0/+74 |
* | | | | Extract LegacyDiffNote out of Note | Douwe Maan | 2016-05-13 | 1 | -6/+2 |
|/ / / | |||||
* | | | Codestyle: make sure we have space around operators | Gabriel Mazetto | 2016-05-13 | 12 | -45/+45 |
* | | | Merge branch 'fix_health_check_type' into 'master' | Douwe Maan | 2016-05-12 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Fix minor typos in admin health check page | Drew Blessing | 2016-05-12 | 1 | -1/+1 |
* | | | | Merge branch 'rs-cleanup-events_helper_spec' into 'master' | Douwe Maan | 2016-05-12 | 1 | -47/+48 |
|\ \ \ \ | |||||
| * | | | | Clean up EventsHelper spec | Robert Speicher | 2016-05-12 | 1 | -47/+48 |
* | | | | | Merge branch 'deprecated-class-methods-cop' into 'master' | Robert Speicher | 2016-05-12 | 3 | -7/+7 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Enable the Rubocop DeprecatedClassMethods cop | Connor Shea | 2016-05-08 | 3 | -7/+7 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'default-scope-on-builds-page' into 'master' | Robert Speicher | 2016-05-12 | 2 | -0/+2 |
|\ \ \ \ | |||||
| * | | | | Fix a description for default scope on builds | Takuya Noguchi | 2016-05-13 | 2 | -0/+2 |