summaryrefslogtreecommitdiff
Commit message (Collapse)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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Optimize the translation of zh-TW 2. Synchronous zh-CN, zh-HK translation
| * | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow users to be hard-deleted from the admin panel Closes #28694 See merge request !11874
| * | | | | | | | | | | 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 functionality See merge request !11125
| * | | | | | | | | | | Backport EE refactorings for Protected Tag EE-only functionalityjej-backport-protected-tag-ee-role-refactoringsJames Edwards-Jones2017-05-3115-36/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improvements and refactorings were made while adding role based permissions for protected tags to EE. This doesn’t backport the feature, but should improve code quality and minimize divergence.
* | | | | | | | | | | | Merge branch ↵Douwe Maan2017-06-052-1/+10
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '32869-project-s-last-updated-time-not-accurately-reflected-in-projects-dashboard' into 'master' Use last_activity_at attr when showing the update date in project listing Closes #32869 See merge request !11896
| * | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix submodule link to then project under subgroup Closes gitlab-ee#2411 See merge request !11906
| * | | | | | | | | | | | Add changelog for submodule subgroup fixdz-fix-submodule-subgroupDmitriy Zaporozhets2017-06-051-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | | | Fix submodule link to then project under subgroupDmitriy Zaporozhets2017-06-052-0/+19
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this change only last namespace in full path was extracted. It's fine unless you have a link to submodule under subgroups. In that case self_url? method returns false and link is processed as external. I could not find a proper regex to cover all cases and correctly extract full path to repository and instead used current instance host name to get correct path to namespace and project. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | | | Merge branch '33154-permissions-for-project-labels-and-group-labels' into ↵Douwe Maan2017-06-057-18/+57
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Permissions for project labels and group labels" Closes #33154 See merge request !11876
| * | | | | | | | | | | | Allow group reporters to manage group labels33154-permissions-for-project-labels-and-group-labelsSean McGivern2017-06-057-18/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, only group masters could do this. However, project reporters can manage project labels, so there doesn't seem to be any need to restrict group labels further. Also, save a query or two by getting a single GroupMember object to find out if the user is a master or not.
* | | | | | | | | | | | | Merge branch ↵Douwe Maan2017-06-058-27/+80
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '31983-increase-merge-request-diff-file-size-limit-for-default-toggle-opening' into 'master' Increase diff limits to 100 KB for collapse and 200 KB overall Closes #31983 See merge request !11875
| * | | | | | | | | | | | 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
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is controlled with the feature flag gitlab_git_diff_size_limit_increase. Both of these limits were basically picked arbitrarily in the first place; disabling the feature flag reverts to the old limits.
* | | | | | | | | | | | Merge branch 'fix-realtime-edited-text-for-issues-9-3' into 'master'Phil Hughes2017-06-0520-30/+237
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port fix-realtime-edited-text-for-issues 9-2-stable fix to master. See merge request !11478
| * | | | | | | | | | | | Fix up merge issuesfix-realtime-edited-text-for-issues-9-3Luke "Jared" Bennett2017-06-023-2/+7
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into ↵Luke "Jared" Bennett2017-06-02510-2512/+9152
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix-realtime-edited-text-for-issues-9-3
| * | | | | | | | | | | | | Removed unneeded newline in issuables_helper_spec and removed unneeded ↵Luke "Jared" Bennett2017-06-022-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updated_at_by variable in issuable_app_data
| * | | | | | | | | | | | | 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 ↵Luke "Jared" Bennett2017-05-313-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issue_show app Fix builds by only merge when updated_at_by is presnse Fix issue_show app.vue hasUpdated reference to state Fix missing bracket
| * | | | | | | | | | | | | 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 slugified project path to CI environment variables Closes #31061 See merge request !11838
| * | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initial implementation for real time job view Closes #31397 See merge request !11651
| * | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add minor changed needed to pass review
View Lorry Controller Status