summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into backport-issues-controller-changesbackport-issues-controller-changesBryce Johnson2017-09-0788-369/+1777
|\
| * Merge branch 'winh-filter-dropdowns-keyboard-selection' into 'master'Clement Ho2017-09-071-0/+11
| |\
| | * Restore droplab item style for keyboard navigationwinh-filter-dropdowns-keyboard-selectionwinh2017-09-061-0/+11
| * | Merge branch 'improve-share-locking-feature-for-subgroups' into 'master'Douwe Maan2017-09-077-33/+126
| |\ \
| | * | Optimize policy ruleMichael Kozono2017-09-071-2/+3
| | * | Refer to “Share with group lock” consistentlyimprove-share-locking-feature-for-subgroupsMichael Kozono2017-09-064-9/+9
| | * | Make UpdateService error message translatableWinnie Hellmann2017-09-061-1/+1
| | * | Replace <h5> with <label>Winnie Hellmann2017-09-062-3/+1
| | * | Add missing .html_safesWinnie Hellmann2017-09-061-3/+3
| | * | Remove top margin from .control-labelWinnie Hellmann2017-09-061-0/+2
| | * | Link or not link depending on permissionsMichael Kozono2017-09-061-8/+16
| | * | Fix ability when Share lock is offMichael Kozono2017-09-061-1/+2
| | * | Link to ancestor settings pageMichael Kozono2017-09-061-1/+7
| | * | Refactor based on code reviewMichael Kozono2017-09-065-6/+6
| | * | Fix “Share lock” help textMichael Kozono2017-09-062-15/+28
| | * | Simplify disabling checkboxMichael Kozono2017-09-062-9/+5
| | * | Fix “Share lock” policy for deeply nested groupsMichael Kozono2017-09-061-2/+2
| | * | Make texts translatableWinnie Hellmann2017-09-062-8/+11
| | * | Use <h5> for .control-labelWinnie Hellmann2017-09-061-1/+1
| | * | Replace duplicate <label> by <div>winh2017-09-061-1/+2
| | * | Remove unnessesary slash from HAMLwinh2017-09-061-1/+1
| | * | Dry up method for code climateMichael Kozono2017-09-063-27/+21
| | * | Enforce share_with_group_lock rulesMichael Kozono2017-09-062-1/+22
| | * | Enable share_with_group_lock on subgroupMichael Kozono2017-09-061-0/+14
| | * | Vary share lock setting UIMichael Kozono2017-09-062-2/+34
| | * | Move share lock setting and tweak UIMichael Kozono2017-09-061-7/+10
| * | | Resolve "Make project and features visibility settings less confusing"Mike Greiling2017-09-0713-112/+751
| * | | Merge branch '37158-autodevops-banner' into 'master'Kamil Trzciński2017-09-0713-23/+130
| |\ \ \
| | * | | Fix broken case for projects:merge_requests:indexKamil Trzcinski2017-09-071-3/+3
| | * | | Merge branch 'zj/gitlab-ce-zj-auto-devops-table' into 37158-autodevops-bannerKamil Trzcinski2017-09-0785-723/+1336
| | |\ \ \
| | * | | | Updates tests and i18n37158-autodevops-bannerFilipa Lacerda2017-09-071-1/+1
| | * | | | Merge branch 'zj-auto-devops-table' of gitlab.com:zj/gitlab-ce into 37158-aut...Kamil Trzcinski2017-09-0731-122/+68
| | |\ \ \ \
| | * | | | | Add has_auto_devops_implicitly_disabledKamil Trzcinski2017-09-072-2/+5
| | * | | | | Fixes rubocop offensesFilipa Lacerda2017-09-071-3/+3
| | * | | | | Get the project path through the DOM instead of `gon`Filipa Lacerda2017-09-075-5/+8
| | * | | | | Merge branch 'zj/gitlab-ce-zj-auto-devops-table' into 37158-autodevops-bannerKamil Trzcinski2017-09-06317-2344/+3300
| | |\ \ \ \ \
| | * | | | | | Updates illustrationFilipa Lacerda2017-09-062-2/+55
| | * | | | | | Fixes the Cookie pathFilipa Lacerda2017-09-052-8/+6
| | * | | | | | Fix AutoDevopsHelper settingsKamil Trzcinski2017-09-051-1/+1
| | * | | | | | Fix spelling of AutoDevopsHelperKamil Trzcinski2017-09-051-1/+1
| | * | | | | | Properly decide when to show Auto DevOps bannerKamil Trzcinski2017-09-055-4/+12
| | * | | | | | Sets callout dissmiss cookie per project using a pathFilipa Lacerda2017-09-053-6/+15
| | * | | | | | Merge branch 'zj-auto-devops-table' into 37158-autodevops-bannerFilipa Lacerda2017-09-05130-536/+3592
| | |\ \ \ \ \ \
| | * | | | | | | Corrected Auto Dev Ops to Auto DevOpsDimitrie Hoekstra2017-09-011-3/+3
| | * | | | | | | changed text banner to include correct mentioning of Auto DevOps and rest of ...Dimitrie Hoekstra2017-09-011-2/+2
| | * | | | | | | Adds verfication for the cookieFilipa Lacerda2017-09-016-11/+9
| | * | | | | | | Creates auto devops calloutFilipa Lacerda2017-09-018-20/+55
| * | | | | | | | Merge branch '37288-fix-wrong-header-when-testing-webhook' into 'master'Douwe Maan2017-09-072-5/+4
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix a wrong `X-Gitlab-Event` header when testing webhooks37288-fix-wrong-header-when-testing-webhookRémy Coutable2017-09-072-5/+4
| * | | | | | | | | Merge branch 'zj-auto-devops-table' into 'master'Kamil Trzciński2017-09-0722-40/+240
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |