summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '5491-backport-code' into 'master'Rémy Coutable2018-07-233-2/+5
|\
| * backport code from EE5491-backport-codeLukas Eipert2018-07-203-2/+5
* | Merge branch 'frozen-string-vestigial' into 'master'Rémy Coutable2018-07-234-0/+8
|\ \
| * | Enable frozen string in newly added filesgfyoung2018-07-214-0/+8
* | | Reducing the memory footprint for the renderingTim Zallmann2018-07-239-93/+139
* | | Merge branch '49272-sanitize-git-url-in-import-errors' into 'master'Rémy Coutable2018-07-231-1/+1
|\ \ \
| * | | Fix #49272 - Sanitize git URL in import errorsJamie Schembri2018-07-161-1/+1
* | | | Fix #47379 - Project visibility tooltipJamie Schembri2018-07-231-3/+2
* | | | Resolve "Deploy Tokens failed to clone LFS repository"Mayra Cabrera2018-07-232-3/+22
* | | | Merge branch 'hangouts_chat_integration' into 'master'Sean McGivern2018-07-233-0/+69
|\ \ \ \
| * | | | Fix couple of moments in HangoutsChatService and its specKukovskii Vladimir2018-07-141-5/+7
| * | | | Fix fetch_attachment_title method of Hangouts Chat serviceKukovskii Vladimir2018-07-141-2/+1
| * | | | Add Hangouts Chat service implementationKukovskii Vladimir2018-07-141-0/+25
| * | | | Add dummy Google Hangouts Chat integrationKukovskii Vladimir2018-07-143-0/+43
* | | | | Fix gitlab import project loadFrancisco Javier López2018-07-231-1/+4
* | | | | Merge branch '48932-disable-saml-if-omniauth-is-disabled' into 'master'Douwe Maan2018-07-233-3/+5
|\ \ \ \ \
| * | | | | Disable SAML if OmniAuth is disabled48932-disable-saml-if-omniauth-is-disabledLin Jen-Shin2018-07-203-3/+5
* | | | | | Merge branch '49341-show-runner-overflow' into 'master'Phil Hughes2018-07-231-1/+0
|\ \ \ \ \ \
| * | | | | | Add container to show runner pageAnnabel Dunstone Gray2018-07-201-1/+0
* | | | | | | Merge branch '46126-project-counters-space' into 'master'Phil Hughes2018-07-231-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Remove extra whitespace in star project buttonAnnabel Dunstone Gray2018-07-201-1/+1
* | | | | | | Merge branch '6104-extract-ee-specific-files-lines-for-some-platform-related-...Robert Speicher2018-07-207-36/+51
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Reduce CE/EE difference in app/views/projects/tags/index.html.haml6104-extract-ee-specific-files-lines-for-some-platform-related-project-viewsRémy Coutable2018-07-171-0/+2
| * | | | | | Reduce CE/EE difference in app/views/projects/services/prometheus/_show.html....Rémy Coutable2018-07-172-30/+33
| * | | | | | Reduce CE/EE difference in app/views/projects/protected_tags/_protected_tag.h...Rémy Coutable2018-07-174-6/+16
* | | | | | | Merge branch '47530-replace-label-light-with-label-bold' into 'master'Clement Ho2018-07-2065-188/+188
|\ \ \ \ \ \ \
| * | | | | | | Replace label-light with label-bold. Because it's bold, not lightAnnabel Dunstone Gray2018-07-1965-188/+188
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Resolve ""Jump to first/next unresolved discussion" jumps to resolved discuss...André Luís2018-07-205-40/+142
| |_|/ / / / |/| | | | |
* | | | | | Merge branch '45443-unable-to-save-user-profile-update-with-safari' into 'mas...Filipa Lacerda2018-07-202-1/+4
|\ \ \ \ \ \
| * | | | | | Add formdata-polyfill45443-unable-to-save-user-profile-update-with-safariLuke Bennett2018-07-201-0/+1
| * | | | | | Merge remote-tracking branch 'origin/master' into 45443-unable-to-save-user-p...Luke Bennett2018-07-19249-164/+1242
| |\ \ \ \ \ \
| * | | | | | | Delete unneeded user avatar formDataLuke Bennett2018-07-171-1/+3
* | | | | | | | Merge branch '23705-add-single-file-download-in-repo' into 'master'Douwe Maan2018-07-205-21/+21
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Refactor code for single file download in repositoryKia Mei Somabes2018-07-181-1/+1
| * | | | | | | Refactor code for single file download in repositoryKia Mei Somabes2018-07-181-0/+2
| * | | | | | | Refactor code for single file download in repositoryKia Mei Somabes2018-07-134-16/+15
| * | | | | | | Set content-disposition header for single file download in repositoryKia Mei Somabes2018-07-124-15/+13
| * | | | | | | Add single file download in repositoryKia Mei Somabes2018-07-092-11/+12
* | | | | | | | Merge branch 'gitaly-remote-mandatory' into 'master'Sean McGivern2018-07-201-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Migrate add_remote, remove_remote, fetch_internal_remote to gitalyAlejandro Rodríguez2018-07-191-1/+1
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'project-dropdown-list-overflow' into 'master'Phil Hughes2018-07-201-5/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Don't overflow project/group dropdown resultsgfyoung2018-07-191-5/+2
| |/ / / / / / /
* | | | | | | | Merge branch '48036-fix-web-ide-blob-crash' into 'master'Phil Hughes2018-07-201-5/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix Web IDE router breaking on files matching "targetmode"Paul Slaughter2018-07-191-5/+17
* | | | | | | | | Merge branch '49375-css-move' into 'master'Phil Hughes2018-07-201-0/+159
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Moves security reports CSS into CE folder49375-css-moveFilipa Lacerda2018-07-191-0/+159
* | | | | | | | | Merge branch 'frozen-string-enable-apps-services-inner-even-more' into 'master'Rémy Coutable2018-07-1934-0/+68
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Enable more frozen string in app/services/**/*.rbgfyoung2018-07-1834-0/+68
* | | | | | | | | Merge branch 'remove-duplicated-include' into 'master'Rémy Coutable2018-07-191-1/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove duplicated include IgnorableColumnLin Jen-Shin2018-07-191-1/+0
| | |_|_|_|/ / / / | |/| | | | | | |