summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | …in Groups::UpdateService instead of only in the browser.
| * | | | | | | | | | | | | Enable share_with_group_lock on subgroupMichael Kozono2017-09-063-0/+188
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | …when needed
| * | | | | | | | | | | | | Vary share lock setting UIMichael Kozono2017-09-063-2/+174
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | …based on whether the current user owns the parent group and whether the parent group or current group is share locked.
| * | | | | | | | | | | | | 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" Closes #32665 See merge request !14062
| * | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Banner to enable Auto DevOps at project level" Closes #37158 See merge request !13991
| * | | | | | | | | | | | | | 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 ↵Kamil Trzcinski2017-09-0791-262/+1915
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 37158-autodevops-banner
| * | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Open the settings section based on the location hash
| * | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds namespace to i18n support
| * | | | | | | | | | | | | | | | | Fixes the Cookie pathFilipa Lacerda2017-09-053-9/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prepares for i18n
| * | | | | | | | | | | | | | | | | Fix AutoDevopsHelper settingsKamil Trzcinski2017-09-052-27/+473
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Fix spelling of AutoDevopsHelperKamil Trzcinski2017-09-051-1/+1
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Properly decide when to show Auto DevOps bannerKamil Trzcinski2017-09-055-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Only if user can manage project, - When Auto DevOps is not enabled, - When project configuration is set to implicit
| * | | | | | | | | | | | | | | | | Sets callout dissmiss cookie per project using a pathFilipa Lacerda2017-09-055-6/+41
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge branch 'zj-auto-devops-table' into 37158-autodevops-bannerFilipa Lacerda2017-09-05415-2022/+10743
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * zj-auto-devops-table: (365 commits) Fix boolean logic with nil value Incorporate review Updates settings sections to: - create labels for each radio button - remove elements from form section - visually match the mockups Adds documentation path to pipelines table in merge request page Fix tests Update CHANGELOG.md for 9.5.3 Fix a spec failure dependent on load order Ensure `issuables_count_for_state` returns the requested state count Shorten the search input for "text with other filters" spec Turns out that short name was important, who knew! Combine multiple `it` blocks in filter_issues_spec Remove more redundant specs in filter_issues_spec Re-order top-level `let`s, so that labels are grouped Remove unused select_search_at_index helper Reduce duplication in RSS feed specs for filter_issues_spec Remove the top-level closed issue from filter_issues_spec Remove unused labels from filter_issues_spec Reduce issues and milestones created in global filter_issues_spec setup Clean up the still-way-too-complex filter_issues_spec setup Remove an unnecessary issue creation ...
| * | | | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sentence used similarly elsewhere
| * | | | | | | | | | | | | | | | | | Adds verfication for the cookieFilipa Lacerda2017-09-016-11/+9
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Creates auto devops calloutFilipa Lacerda2017-09-019-20/+60
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'docs-confidential-issue' into 'master'Achilleas Pipinellis2017-09-078-5/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update docs for confidential issues Closes #36352 See merge request !14117
| * | | | | | | | | | | | | | | | | | | Update docs for confidential issuesClement Ho2017-09-078-5/+24
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge branch 'sh-add-grape-logging' into 'master'Sean McGivern2017-09-075-0/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add JSON logger in `log/api_json.log` for Grape API endpoints Closes #36189 See merge request !14102
| * | | | | | | | | | | | | | | | | | | Use a custom GrapeLogging formatter to get the timestampsh-add-grape-loggingStan Hu2017-09-073-9/+21
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Fix Rubocop failures in API loggerStan Hu2017-09-072-4/+5
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Add JSON logger in `log/api_json.log` for Grape API endpointsStan Hu2017-09-065-0/+26
| | |_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #36189
* | | | | | | | | | | | | | | | | | | Merge branch 'gitaly-feature-toggles-development-opt-out' into 'master'Rémy Coutable2017-09-073-8/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitaly feature toggles are on by default in development environments Closes gitaly#485 See merge request !13802
| * | | | | | | | | | | | | | | | | | | Gitaly feature toggles are on by default in development environmentsAndrew Newdigate2017-09-073-8/+49
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge branch '37288-fix-wrong-header-when-testing-webhook' into 'master'Douwe Maan2017-09-076-18/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a wrong `X-Gitlab-Event` header when testing webhooks Closes #37288 See merge request !14108
| * | | | | | | | | | | | | | | | | | Fix a wrong `X-Gitlab-Event` header when testing webhooks37288-fix-wrong-header-when-testing-webhookRémy Coutable2017-09-076-18/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>