summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Refactor PostReceive worker to limit merge conflictsport-post-receive-changesDouglas Barbosa Alexandre2017-06-052-37/+30
* Merge branch '33321-spec-failure-in-spec-javascripts-pipelines-header_compone...Robert Speicher2017-06-051-1/+4
|\
| * Fix header component spec33321-spec-failure-in-spec-javascripts-pipelines-header_component_spec-js-46-expected-failed-pipeline-123-triggered-4-weeks-ago-by-foo-to-equal-failed-pipeline-123-triggered-3-weeks-ago-by-fooClement Ho2017-06-051-1/+4
|/
* Merge branch 'mk-fix-git-over-http-rejections' into 'master'Douwe Maan2017-06-0518-537/+887
|\
| * Remove unnecessary variablemk-fix-git-over-http-rejectionsMichael Kozono2017-06-051-3/+1
| * Add changelog entryMichael Kozono2017-06-051-0/+4
| * Extract and memoize `user_access`Michael Kozono2017-06-051-6/+9
| * Remove GitAccessStatus (no longer needed)Michael Kozono2017-06-054-26/+9
| * Refactor construction of responseMichael Kozono2017-06-052-14/+22
| * Refactor to remove a special caseMichael Kozono2017-06-053-7/+29
| * Fix would-be regressionMichael Kozono2017-06-051-3/+1
| * Clarify error messagesMichael Kozono2017-06-053-13/+31
| * Refactor to let GitAccess errors bubble upMichael Kozono2017-06-059-203/+182
| * Refactor to let `GitAccess` check protocol configMichael Kozono2017-06-051-10/+0
| * Specify new Git-LFS-over-HTTP behaviorMichael Kozono2017-06-051-18/+20
| * Move CI access logic into GitAccessMichael Kozono2017-06-057-57/+198
| * RefactorMichael Kozono2017-06-052-10/+6
| * Check disabled commands in GitAccess insteadMichael Kozono2017-06-053-6/+68
| * Render GitAccess message if authorizedMichael Kozono2017-06-051-5/+1
| * Fix Git over HTTP specMichael Kozono2017-06-055-269/+419
* | Merge branch 'added_chinese_for_i18n' into 'master'Douwe Maan2017-06-0511-1/+686
|\ \
| * \ added changelog for Chinese translations黄涛2017-06-051-0/+4
| |\ \
| | * | Optimize translation content黄涛2017-05-316-87/+87
| | * | Update i18n.rb Indent styleHuang Tao2017-05-271-3/+3
| | * | Add translation zh_TW to I18N黄涛2017-05-274-1/+228
| | * | Add translation zh_HK to I18N黄涛2017-05-274-1/+228
| | * | Change the language name zh to zh_CN黄涛2017-05-275-198/+4
| | * | fix plural form of translation黄涛2017-05-262-45/+54
| | * | optimize part of the translation黄涛2017-05-262-56/+57
| | * | Update i18n.rb stylehtve2017-05-231-1/+1
| | * | added Simplified Chinese to I18N黄涛2017-05-234-1/+412
| * | | Optimize translation content黄涛2017-06-056-87/+87
| * | | Update i18n.rb Indent styleHuang Tao2017-06-051-3/+3
| * | | Add translation zh_TW to I18N黄涛2017-06-054-1/+228
| * | | Add translation zh_HK to I18N黄涛2017-06-054-1/+228
| * | | Change the language name zh to zh_CN黄涛2017-06-055-198/+4
| * | | fix plural form of translation黄涛2017-06-052-45/+54
| * | | optimize part of the translation黄涛2017-06-052-56/+57
| * | | Update i18n.rb stylehtve2017-06-051-1/+1
| * | | added Simplified Chinese to I18N黄涛2017-06-054-1/+412
* | | | Merge branch '28694-hard-delete-user-from-admin-panel' into 'master'Douwe Maan2017-06-0515-21/+82
|\ \ \ \
| * | | | Add changelog entryNick Thomas2017-06-051-0/+4
| * | | | Allow users to be hard-deleted from the admin user show pageNick Thomas2017-06-052-1/+23
| * | | | Allow users to be hard-removed from the admin users list pageNick Thomas2017-06-052-5/+12
| * | | | Support hard deletion in Admin::UsersController#destroyNick Thomas2017-06-053-4/+16
| * | | | Refactor the DeleteUserWorkerNick Thomas2017-06-058-11/+27
| | |_|/ | |/| |
* | | | Merge branch 'jej-backport-protected-tag-ee-role-refactorings' into 'master'Tim Zallmann2017-06-0515-36/+50
|\ \ \ \
| * | | | Backport EE refactorings for Protected Tag EE-only functionalityjej-backport-protected-tag-ee-role-refactoringsJames Edwards-Jones2017-05-3115-36/+50
* | | | | Merge branch '32869-project-s-last-updated-time-not-accurately-reflected-in-p...Douwe Maan2017-06-052-1/+10
|\ \ \ \ \
| * | | | | Use last_activity_at attr when showing the update date in project listing32869-project-s-last-updated-time-not-accurately-reflected-in-projects-dashboardRuben Davila2017-06-032-1/+10
View Lorry Controller Status