summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Resolve "When changing project visibility setting, change other dropdowns aut...Mike Greiling2017-06-066-12/+86
* Merge branch 'issue-23254' into 'master'Rémy Coutable2017-06-061-6/+4
|\
| * Fixed style on unsubscribe pageGustav Ernberg2017-06-031-6/+4
* | Merge branch 'sh-fix-typo-user-activity-service' into 'master'Rémy Coutable2017-06-061-1/+1
|\ \
| * | Fix typo in user activity debug log messagesh-fix-typo-user-activity-serviceStan Hu2017-06-031-1/+1
* | | Merge branch 'pull-mirror-overhaul-ce-backport' into 'master'Douwe Maan2017-06-057-42/+71
|\ \ \
| * | | backports changed import logic from pull mirroring feature into CETiago Botelho2017-06-057-42/+71
* | | | Merge branch 'mk-fix-git-over-http-rejections' into 'master'Douwe Maan2017-06-053-78/+25
|\ \ \ \
| * | | | Refactor to let GitAccess errors bubble upMichael Kozono2017-06-051-35/+14
| * | | | Refactor to let `GitAccess` check protocol configMichael Kozono2017-06-051-10/+0
| * | | | Move CI access logic into GitAccessMichael Kozono2017-06-053-25/+15
| * | | | RefactorMichael Kozono2017-06-051-4/+0
| * | | | Check disabled commands in GitAccess insteadMichael Kozono2017-06-051-4/+0
| * | | | Render GitAccess message if authorizedMichael Kozono2017-06-051-5/+1
* | | | | Merge branch 'added_chinese_for_i18n' into 'master'Douwe Maan2017-06-053-0/+3
|\ \ \ \ \
| * | | | | Optimize translation content黄涛2017-06-053-3/+3
| * | | | | Add translation zh_TW to I18N黄涛2017-06-051-0/+1
| * | | | | Add translation zh_HK to I18N黄涛2017-06-051-0/+1
| * | | | | Change the language name zh to zh_CN黄涛2017-06-052-195/+1
| * | | | | fix plural form of translation黄涛2017-06-051-16/+8
| * | | | | optimize part of the translation黄涛2017-06-051-28/+28
| * | | | | added Simplified Chinese to I18N黄涛2017-06-051-0/+203
* | | | | | Merge branch '28694-hard-delete-user-from-admin-panel' into 'master'Douwe Maan2017-06-058-12/+55
|\ \ \ \ \ \
| * | | | | | Allow users to be hard-deleted from the admin user show pageNick Thomas2017-06-051-1/+20
| * | | | | | Allow users to be hard-removed from the admin users list pageNick Thomas2017-06-051-4/+10
| * | | | | | Support hard deletion in Admin::UsersController#destroyNick Thomas2017-06-051-1/+1
| * | | | | | Refactor the DeleteUserWorkerNick Thomas2017-06-055-6/+24
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'jej-backport-protected-tag-ee-role-refactorings' into 'master'Tim Zallmann2017-06-0514-36/+48
|\ \ \ \ \ \
| * | | | | | Backport EE refactorings for Protected Tag EE-only functionalityjej-backport-protected-tag-ee-role-refactoringsJames Edwards-Jones2017-05-3114-36/+48
* | | | | | | Merge branch '32869-project-s-last-updated-time-not-accurately-reflected-in-p...Douwe Maan2017-06-051-1/+1
|\ \ \ \ \ \ \
| * | | | | | | 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-031-1/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'dz-fix-submodule-subgroup' into 'master'Douwe Maan2017-06-051-0/+11
|\ \ \ \ \ \ \
| * | | | | | | Fix submodule link to then project under subgroupDmitriy Zaporozhets2017-06-051-0/+11
| |/ / / / / /
* | | | | | | Merge branch '33154-permissions-for-project-labels-and-group-labels' into 'ma...Douwe Maan2017-06-055-15/+24
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Allow group reporters to manage group labels33154-permissions-for-project-labels-and-group-labelsSean McGivern2017-06-055-15/+24
* | | | | | | Merge branch 'fix-realtime-edited-text-for-issues-9-3' into 'master'Phil Hughes2017-06-0514-25/+135
|\ \ \ \ \ \ \
| * | | | | | | Fix up merge issuesfix-realtime-edited-text-for-issues-9-3Luke "Jared" Bennett2017-06-022-1/+6
| * | | | | | | Merge remote-tracking branch 'origin/master' into fix-realtime-edited-text-fo...Luke "Jared" Bennett2017-06-02204-780/+2518
| |\ \ \ \ \ \ \
| * | | | | | | | Removed unneeded newline in issuables_helper_spec and removed unneeded update...Luke "Jared" Bennett2017-06-021-2/+1
| * | | | | | | | Fixed issuables_helper_spec and added a test for issuable_app_dataLuke "Jared" Bennett2017-05-311-23/+23
| * | | | | | | | Remove EditableHelper and move method to IssuablesHelperLuke "Jared" Bennett2017-05-312-14/+12
| * | | | | | | | Correct editable_helper spec and format issuable_app_data updated_at to iso8061Luke "Jared" Bennett2017-05-311-1/+1
| * | | | | | | | Fix helper methods returning wrong data types for vueLuke "Jared" Bennett2017-05-312-3/+7
| * | | | | | | | Move issuable_app_data to helperLuke "Jared" Bennett2017-05-312-4/+9
| * | | | | | | | Review changes, improve editable helper spec and add hasUpdated computer to i...Luke "Jared" Bennett2017-05-312-5/+10
| * | | | | | | | Port fix-realtime-edited-text-for-issues 9-2-stable fix to master.Luke "Jared" Bennett2017-05-3114-24/+136
* | | | | | | | | Merge branch '31061-26135-ci-project-slug-enviroment-variables' into 'master'Kamil Trzciński2017-06-051-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add slugify project path to CI enviroment variablesvanadium232017-06-031-0/+1
* | | | | | | | | | Merge branch 'zj-job-view-goes-real-time' into 'master'Kamil Trzciński2017-06-0511-29/+148
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | retryable? is now available for CommitStatuszj-job-view-goes-real-timeZ.J. van de Weg2017-06-041-1/+6
View Lorry Controller Status