summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Move #create_confidentiality_note to Issues::UpdateServicemooreniemi/gitlab-ce-issue_15236Rémy Coutable2016-05-185-32/+19
* Changing the confidentiality of an issue now creates a new system noteAlex Moore-Niemi2016-05-186-7/+57
* Merge branch 'issue_17302' into 'master' Rémy Coutable2016-05-183-21/+94
|\
| * Move note helper method to notes entity fileissue_17302Felipe Artur2016-05-172-6/+8
| * Fix single note api requestFelipe Artur2016-05-163-8/+23
| * Fix notes API calls symbol convertionsFelipe Artur2016-05-102-3/+34
| * Fix api leaking notes when user is not authorized to read noteableFelipe Artur2016-05-093-13/+38
* | Merge branch 'fix/gitlab-import-data' into 'master' Robert Speicher2016-05-172-1/+2
|\ \
| * | added CHANGELOGfix/gitlab-import-dataJames Lopez2016-05-171-0/+1
| * | fix typo from bad refactoringJames Lopez2016-05-171-1/+1
|/ /
* | Merge branch 'instrument-api-helpers' into 'master' Rémy Coutable2016-05-162-0/+3
|\ \
| * | Instrument all Grape API helpersYorick Peterse2016-05-172-0/+3
|/ /
* | Merge branch 'dz-fix-sidebar-overlap' into 'master' Dmitriy Zaporozhets2016-05-161-0/+2
|\ \
| * | Fix left sidebar overlap when scroll on long menudz-fix-sidebar-overlapDmitriy Zaporozhets2016-05-161-0/+2
* | | Merge branch 'issue_14684' into 'master' Douwe Maan2016-05-1612-13/+106
|\ \ \
| * | | fix default send confirmation valueFelipe Artur2016-05-163-4/+4
| * | | Change landing page when skipping confirmation email and add documentationFelipe Artur2016-05-167-17/+48
| * | | Fix changelog fileFelipe Artur2016-05-162-3/+0
| * | | Change skip_user_confirmation_email to send_user_confirmation_emailFelipe Artur2016-05-169-19/+30
| * | | Toggle email signup confirmation in admin settingsFelipe Artur2016-05-166-0/+54
| |/ /
* | | Merge branch 'rs-event-titles' into 'master' Douwe Maan2016-05-165-64/+37
|\ \ \
| * | | Reduce duplication and branching logic in EventsHelperRobert Speicher2016-05-163-54/+25
| * | | Rename `Event#note_project_snippet?` to `project_snippet_note?`Robert Speicher2016-05-162-3/+3
| * | | Rename `Event#note_commit?` to `commit_note?`Robert Speicher2016-05-162-7/+7
| * | | Remove redundant `html_escape` calls from `title` attributesRobert Speicher2016-05-161-3/+3
| * | | Fix titles for commit references in Event feedRobert Speicher2016-05-161-1/+2
| * | | Simplify Event's target type-checkingRobert Speicher2016-05-161-3/+3
| * | | Add an Event's target's title to its reference linkRobert Speicher2016-05-164-3/+4
* | | | Merge branch 'disallow-uploads' into 'master' Douwe Maan2016-05-161-0/+1
|\ \ \ \
| * | | | Disallow search engines from indexing uploads from a GitLab project.Connor Shea2016-05-161-0/+1
* | | | | Merge branch 'wiki-fix-reloaded' into 'master' Rémy Coutable2016-05-164-3/+7
|\ \ \ \ \
| * | | | | Use the relative url prefix for links in WikiArtem Sidorenko2016-05-134-3/+7
* | | | | | Merge branch 'unexpected-filtering-on-merge-requests' into 'master' Rémy Coutable2016-05-162-1/+16
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Add tests for unintentional filtering bug in MR (cf. !3872)Takuya Noguchi2016-05-152-1/+16
* | | | | | Merge branch '17227-upcoming-milestone-is-confusing-when-projects-have-differ...Douwe Maan2016-05-165-71/+161
|\ \ \ \ \ \
| * | | | | | Return a relation with Postgres17227-upcoming-milestone-is-confusing-when-projects-have-different-milestonesSean McGivern2016-05-162-2/+4
| * | | | | | Make upcoming milestone work across projectsSean McGivern2016-05-165-4/+80
| * | | | | | Tidy up IssuesFinder specsSean McGivern2016-05-161-68/+80
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch '13691-allow-admin-to-reset-user-password-and-force-password-res...Robert Speicher2016-05-164-0/+81
|\ \ \ \ \ \
| * | | | | | Force password change after admin reset13691-allow-admin-to-reset-user-password-and-force-password-reset-on-next-loginSean McGivern2016-05-164-0/+81
| |/ / / / /
* | | | | | Merge branch 'docker-registry' into 'master' Douwe Maan2016-05-1624-10/+677
|\ \ \ \ \ \
| * | | | | | Bring back port to registry configurationdocker-registryKamil Trzcinski2016-05-161-1/+2
| * | | | | | Fix offline_token http_status codeKamil Trzcinski2016-05-151-1/+1
| * | | | | | Fix http status codes for container registry authentication serviceKamil Trzcinski2016-05-152-13/+8
| * | | | | | Improve authentication service specsKamil Trzcinski2016-05-153-19/+59
| * | | | | | Update JwtController specsKamil Trzcinski2016-05-151-36/+21
| * | | | | | Added specs for JwtControllerKamil Trzcinski2016-05-141-0/+87
| * | | | | | Improve JwtControllerKamil Trzcinski2016-05-141-1/+1
| * | | | | | Rename JWT to JSONWebTokenKamil Trzcinski2016-05-148-28/+23
| * | | | | | Simplify JWT::RSAToken::kidKamil Trzcinski2016-05-141-4/+8
View Lorry Controller Status