summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* changed InlineDiffMarker to make it html_safe its output37576-renamed-files-have-escaped-html-for-the-inline-diff-in-the-headermicael.bergeron2017-09-123-4/+5
* rework the html_safe not to use haml's auto escapingmicael.bergeron2017-09-113-3/+21
* make diff file header html safe when file is renamedmicael.bergeron2017-09-111-2/+2
* Merge branch 'rs-trigger-build-docs-offenses' into 'master'Rémy Coutable2017-09-071-6/+6
|\
| * Resolve RuboCop violations in scripts/trigger-build-docsRobert Speicher2017-09-071-6/+6
* | 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-0720-134/+861
|\ \ \
| * | | Optimize policy ruleMichael Kozono2017-09-071-2/+3
| * | | Refer to “Share with group lock” consistentlyimprove-share-locking-feature-for-subgroupsMichael Kozono2017-09-0610-70/+70
| * | | Update “Share with group lock” docsMichael Kozono2017-09-063-17/+24
| * | | 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-062-11/+29
| * | | Fix ability when Share lock is offMichael Kozono2017-09-062-45/+62
| * | | Link to ancestor settings pageMichael Kozono2017-09-062-4/+10
| * | | Refactor based on code reviewMichael Kozono2017-09-066-9/+9
| * | | Fix “Share lock” help textMichael Kozono2017-09-064-44/+116
| * | | Simplify disabling checkboxMichael Kozono2017-09-062-9/+5
| * | | Fix “Share lock” policy for deeply nested groupsMichael Kozono2017-09-062-10/+36
| * | | 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
| * | | Add changelog entry for "Share with group lock"Michael Kozono2017-09-061-0/+6
| * | | Dry up method for code climateMichael Kozono2017-09-063-27/+21
| * | | Specify nested_groups specsMichael Kozono2017-09-065-5/+5
| * | | Enforce share_with_group_lock rulesMichael Kozono2017-09-064-1/+104
| * | | Enable share_with_group_lock on subgroupMichael Kozono2017-09-063-0/+188
| * | | Vary share lock setting UIMichael Kozono2017-09-063-2/+174
| * | | Add post-nested group Share lock integration testsMichael Kozono2017-09-061-34/+86
| * | | Add pre-nested group share lock testsMichael Kozono2017-09-061-40/+102
| * | | Refactor and rename specsMichael Kozono2017-09-062-12/+12
| * | | Move share lock setting and tweak UIMichael Kozono2017-09-061-7/+10
* | | | Merge branch '32665-refactor-project-visibility-settings' into 'master'Phil Hughes2017-09-0721-166/+815
|\ \ \ \
| * | | | Resolve "Make project and features visibility settings less confusing"Mike Greiling2017-09-0721-166/+815
|/ / / /
* | | | Merge branch '37158-autodevops-banner' into 'master'Kamil Trzciński2017-09-0717-23/+251
|\ \ \ \
| * | | | 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-07169-1041/+2088
| |\ \ \ \
| * | | | | Updates tests and i18n37158-autodevops-bannerFilipa Lacerda2017-09-072-13/+4
| * | | | | Merge branch 'zj-auto-devops-table' of gitlab.com:zj/gitlab-ce into 37158-aut...Kamil Trzcinski2017-09-0791-262/+1915
| |\ \ \ \ \
| * | | | | | Add has_auto_devops_implicitly_disabledKamil Trzcinski2017-09-073-2/+49
| * | | | | | Fixes rubocop offensesFilipa Lacerda2017-09-071-3/+3
| * | | | | | Get the project path through the DOM instead of `gon`Filipa Lacerda2017-09-076-9/+8
| * | | | | | Add specs for AutoDevopsHelperKamil Trzcinski2017-09-061-0/+59
| * | | | | | Revert db/schema changesKamil Trzcinski2017-09-061-470/+26
| * | | | | | Merge branch 'zj/gitlab-ce-zj-auto-devops-table' into 37158-autodevops-bannerKamil Trzcinski2017-09-06684-7230/+21679
| |\ \ \ \ \ \
| * | | | | | | Updates illustrationFilipa Lacerda2017-09-062-2/+55