summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | 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
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'dz-fix-submodule-subgroup' into 'master'Douwe Maan2017-06-053-0/+23
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add changelog for submodule subgroup fixdz-fix-submodule-subgroupDmitriy Zaporozhets2017-06-051-0/+4
| * | | | | | | | | | | | Fix submodule link to then project under subgroupDmitriy Zaporozhets2017-06-052-0/+19
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch '33154-permissions-for-project-labels-and-group-labels' into 'ma...Douwe Maan2017-06-057-18/+57
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Allow group reporters to manage group labels33154-permissions-for-project-labels-and-group-labelsSean McGivern2017-06-057-18/+57
* | | | | | | | | | | | | Merge branch '31983-increase-merge-request-diff-file-size-limit-for-default-t...Douwe Maan2017-06-058-27/+80
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Increase diff limits to 100 KB for collapse and 200 KB overall31983-increase-merge-request-diff-file-size-limit-for-default-toggle-openingSean McGivern2017-06-028-27/+80
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'fix-realtime-edited-text-for-issues-9-3' into 'master'Phil Hughes2017-06-0520-30/+237
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix up merge issuesfix-realtime-edited-text-for-issues-9-3Luke "Jared" Bennett2017-06-023-2/+7
| * | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into fix-realtime-edited-text-fo...Luke "Jared" Bennett2017-06-02510-2512/+9152
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Removed unneeded newline in issuables_helper_spec and removed unneeded update...Luke "Jared" Bennett2017-06-022-3/+1
| * | | | | | | | | | | | | Fixed issuables_helper_spec and added a test for issuable_app_dataLuke "Jared" Bennett2017-05-312-23/+49
| * | | | | | | | | | | | | Remove EditableHelper and move method to IssuablesHelperLuke "Jared" Bennett2017-05-314-35/+30
| * | | | | | | | | | | | | Correct editable_helper spec and format issuable_app_data updated_at to iso8061Luke "Jared" Bennett2017-05-312-3/+3
| * | | | | | | | | | | | | 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-313-7/+11
| * | | | | | | | | | | | | Port fix-realtime-edited-text-for-issues 9-2-stable fix to master.Luke "Jared" Bennett2017-05-3119-28/+241
* | | | | | | | | | | | | | Merge branch '31061-26135-ci-project-slug-enviroment-variables' into 'master'Kamil Trzciński2017-06-054-1/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Add slugify project path to CI enviroment variablesvanadium232017-06-034-1/+8
* | | | | | | | | | | | | | | Merge branch 'zj-job-view-goes-real-time' into 'master'Kamil Trzciński2017-06-0522-92/+430
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | retryable? is now available for CommitStatuszj-job-view-goes-real-timeZ.J. van de Weg2017-06-041-1/+6
| * | | | | | | | | | | | | | Fix test failuresKamil Trzcinski2017-06-034-9/+14
| * | | | | | | | | | | | | | Fix test failuresKamil Trzcinski2017-06-021-4/+2
| * | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into zj-job-view-goes-real-timeKamil Trzcinski2017-06-02328-1735/+5166
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | | Add user to BuildDetailsEntityZ.J. van de Weg2017-06-025-9/+18
View Lorry Controller Status