summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Improve issue formatting in Slack serviceJeroen van Baarsen2016-05-181-3/+16
* Merge branch 'remove-images-from-ci' into 'master' Rémy Coutable2016-05-186-0/+0
|\
| * Clean up the images from GitLab CITakuya Noguchi2016-05-176-0/+0
* | Merge branch 'remove-bottom-margin-for-flash-message-on-project-home-page' in...Dmitriy Zaporozhets2016-05-181-1/+1
|\ \
| * | Remove bottom margin for flash message on home pageCarlos Feliciano2016-05-161-1/+1
* | | Merge branch 'fix/import-data-issue' into 'master' Rémy Coutable2016-05-183-12/+15
|\ \ \ | |/ / |/| |
| * | removed transaction stufffix/import-data-issueJames Lopez2016-05-132-10/+2
| * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-data...James Lopez2016-05-1216-66/+81
| |\ \
| * | | more changes based on MR feedbackJames Lopez2016-05-122-3/+2
| * | | rename methodJames Lopez2016-05-121-2/+2
| * | | fix silly typoJames Lopez2016-05-121-0/+2
| * | | Merge branches 'fix/import-data-issue' and 'master' of gitlab.com:gitlab-org/...James Lopez2016-05-11104-1724/+161
| |\ \ \
| * | | | fix complexity of methodJames Lopez2016-05-111-11/+19
| * | | | trying to fix timing issue with import statusJames Lopez2016-05-113-8/+8
| * | | | create import data in serviceJames Lopez2016-05-101-0/+2
* | | | | 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-165-3/+16
|\ \ \ \ \
| * | | | | fix default send confirmation valueFelipe Artur2016-05-161-1/+2
| * | | | | Change landing page when skipping confirmation email and add documentationFelipe Artur2016-05-162-4/+4
| * | | | | Fix changelog fileFelipe Artur2016-05-161-1/+0
| * | | | | Change skip_user_confirmation_email to send_user_confirmation_emailFelipe Artur2016-05-163-4/+5
| * | | | | Toggle email signup confirmation in admin settingsFelipe Artur2016-05-163-0/+12
| |/ / / /
* | | | | 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 'wiki-fix-reloaded' into 'master' Rémy Coutable2016-05-161-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Use the relative url prefix for links in WikiArtem Sidorenko2016-05-131-1/+1
* | | | | | Merge branch '17227-upcoming-milestone-is-confusing-when-projects-have-differ...Douwe Maan2016-05-162-4/+14
|\ \ \ \ \ \
| * | | | | | Return a relation with Postgres17227-upcoming-milestone-is-confusing-when-projects-have-different-milestonesSean McGivern2016-05-161-1/+1
| * | | | | | Make upcoming milestone work across projectsSean McGivern2016-05-162-4/+14
| | |/ / / / | |/| | | |
* | | | | | Merge branch '13691-allow-admin-to-reset-user-password-and-force-password-res...Robert Speicher2016-05-161-0/+1
|\ \ \ \ \ \
| * | | | | | Force password change after admin reset13691-allow-admin-to-reset-user-password-and-force-password-reset-on-next-loginSean McGivern2016-05-161-0/+1
| |/ / / / /
* | | | | | Merge branch 'docker-registry' into 'master' Douwe Maan2016-05-166-3/+187
|\ \ \ \ \ \
| * | | | | | Fix offline_token http_status codeKamil Trzcinski2016-05-151-1/+1
| * | | | | | Fix http status codes for container registry authentication serviceKamil Trzcinski2016-05-151-2/+2
| * | | | | | Improve authentication service specsKamil Trzcinski2016-05-151-3/+3
| * | | | | | Improve JwtControllerKamil Trzcinski2016-05-141-1/+1
| * | | | | | Rename JWT to JSONWebTokenKamil Trzcinski2016-05-143-23/+18
| * | | | | | Fix authentication serviceKamil Trzcinski2016-05-142-1/+8
| * | | | | | Add TODOKamil Trzcinski2016-05-141-0/+3
| * | | | | | Improve code design after reviewKamil Trzcinski2016-05-141-5/+2
| * | | | | | Use Auth::ContainerRegistryAuthenticationServiceKamil Trzcinski2016-05-143-72/+70
| * | | | | | Merge remote-tracking branch 'origin/master' into docker-registryKamil Trzcinski2016-05-13150-1868/+514
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | Improve JwtController codeKamil Trzcinski2016-05-131-18/+19
View Lorry Controller Status