summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Resolve "When changing project visibility setting, change other dropdowns ↵Mike Greiling2017-06-066-12/+86
| | | | automatically"
* Merge branch 'issue-23254' into 'master'Rémy Coutable2017-06-061-6/+4
|\ | | | | | | | | Cleanup style of confirmation page See merge request !11774
| * Fixed style on unsubscribe pageGustav Ernberg2017-06-031-6/+4
| | | | | | | | | | | | | | | | | | | | Removed unnecassary logic Added missing 'the' Fix case Fixed specs
* | Merge branch 'sh-fix-typo-user-activity-service' into 'master'Rémy Coutable2017-06-061-1/+1
|\ \ | | | | | | | | | | | | Fix typo in user activity debug log message See merge request !11898
| * | 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 CE See merge request !11850
| * | | 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
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix Git-over-HTTP rejections See merge request !11398
| * | | | Refactor to let GitAccess errors bubble upMichael Kozono2017-06-051-35/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No external behavior change. This allows `GitHttpController` to set the HTTP status based on the type of error. Alternatively, we could have added an attribute to GitAccessStatus, but this pattern seemed appropriate.
| * | | | Refactor to let `GitAccess` check protocol configMichael Kozono2017-06-051-10/+0
| | | | | | | | | | | | | | | | | | | | This already works due to previous refactoring.
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add Chinese translation of Cycle Analytics Page to I18N See merge request !11644
| * | | | | Optimize translation content黄涛2017-06-053-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Optimize the translation of zh-TW 2. Synchronous zh-CN, zh-HK translation
| * | | | | 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 panel Closes #28694 See merge request !11874
| * | | | | | 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 functionality See merge request !11125
| * | | | | | Backport EE refactorings for Protected Tag EE-only functionalityjej-backport-protected-tag-ee-role-refactoringsJames Edwards-Jones2017-05-3114-36/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-051-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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-031-1/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'dz-fix-submodule-subgroup' into 'master'Douwe Maan2017-06-051-0/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix submodule link to then project under subgroup Closes gitlab-ee#2411 See merge request !11906
| * | | | | | | Fix submodule link to then project under subgroupDmitriy Zaporozhets2017-06-051-0/+11
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-055-15/+24
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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-055-15/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'fix-realtime-edited-text-for-issues-9-3' into 'master'Phil Hughes2017-06-0514-25/+135
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-022-1/+6
| | | | | | | |
| * | | | | | | Merge remote-tracking branch 'origin/master' into ↵Luke "Jared" Bennett2017-06-02204-780/+2518
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | fix-realtime-edited-text-for-issues-9-3
| * | | | | | | | Removed unneeded newline in issuables_helper_spec and removed unneeded ↵Luke "Jared" Bennett2017-06-021-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updated_at_by variable in issuable_app_data
| * | | | | | | | 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 ↵Luke "Jared" Bennett2017-05-312-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-3114-24/+136
| | | | | | | | |
* | | | | | | | | Merge branch '31061-26135-ci-project-slug-enviroment-variables' into 'master'Kamil Trzciński2017-06-051-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add slugified project path to CI environment variables Closes #31061 See merge request !11838
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | | | | | |
View Lorry Controller Status