summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | Rename ChatService into ChatSlashCommandsServiceKamil Trzcinski2016-12-165-81/+60
| | | | | | | |
| * | | | | | | Create Slack Slash command serviceZ.J. van de Weg2016-12-1617-51/+156
| | | | | | | |
* | | | | | | | Merge branch '25810-misaligned-count' into 'master' Fatih Acet2016-12-202-3/+19
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Align milestone column header with count number ## What does this MR do? - Aligns the milestone column header with the count number - Prevents the count from wrapping below the column header ## Why was this MR needed? - Count number was being pushed below the column header text if the text was too long ## Screenshots (if relevant) - see issue sceenshots for before #25810 - fixed version ![milestones](/uploads/ca12c290abe814b457ad3b2fb86f7696/milestones.png) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #25810 See merge request !8177
| * | | | | | | | Align milestone column header with count number25810-misaligned-countSam Rose2016-12-192-3/+19
| | | | | | | | |
* | | | | | | | | Merge branch '25735-font-size' into 'master' Fatih Acet2016-12-201-1/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update font size of detail page header to 14px Before: ![Screen_Shot_2016-12-19_at_2.55.08_PM](/uploads/ff1544631ff376c3039674ac45eec696/Screen_Shot_2016-12-19_at_2.55.08_PM.png) After: ![Screen_Shot_2016-12-19_at_2.54.48_PM](/uploads/8a1038cc851e186eddada625b8c8de83/Screen_Shot_2016-12-19_at_2.54.48_PM.png) Closes #25735 See merge request !8183
| * | | | | | | | | Update font size of detail page header to 14px25735-font-sizeAnnabel Dunstone Gray2016-12-191-1/+0
| | | | | | | | | |
* | | | | | | | | | Merge branch 'status-badge-height' into 'master' Fatih Acet2016-12-202-2/+0
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove inline-block styling from status Before: ![Screen_Shot_2016-12-19_at_2.13.42_PM](/uploads/2bb7bc84f97fb3489854518e35349203/Screen_Shot_2016-12-19_at_2.13.42_PM.png) After: ![Screen_Shot_2016-12-19_at_2.12.34_PM](/uploads/d228c105f90d546fce5b1653d7a74fd7/Screen_Shot_2016-12-19_at_2.12.34_PM.png) See merge request !8181
| * | | | | | | | | Remove inline-block styling from statusstatus-badge-heightAnnabel Dunstone Gray2016-12-192-2/+0
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'fix-forbidden-for-build-api-for-deleted-project' into 'master' Grzegorz Bizon2016-12-203-17/+37
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Give forbidden if project for the build was deleted I guess we don't need a change log entry because this is just for an internal corner case fix. Closes #25309 See merge request !8091
| * | | | | | | | | Use a block to insert extra check for authenticate_build!fix-forbidden-for-build-api-for-deleted-projectLin Jen-Shin2016-12-201-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8091#note_20253762
| * | | | | | | | | Spaces around literal hashLin Jen-Shin2016-12-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/builds/7617209
| * | | | | | | | | Just set the status rather than calling eventLin Jen-Shin2016-12-191-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8091#note_20239558
| * | | | | | | | | Define actions in let so that it could be overriddenLin Jen-Shin2016-12-191-10/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8091/diffs#note_20236356
| * | | | | | | | | Prefer unless over if notLin Jen-Shin2016-12-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/builds/7606797
| * | | | | | | | | Delete the project when building the buildLin Jen-Shin2016-12-191-10/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8091#note_20222756
| * | | | | | | | | Use a separate method to skip validationLin Jen-Shin2016-12-192-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8091#note_20222666
| * | | | | | | | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-12-19744-2807/+18085
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix-forbidden-for-build-api-for-deleted-project * upstream/master: (333 commits) Fix typo Always use `fixture_file_upload` helper to upload files in tests. Add CHANGELOG Move admin application spinach test to rspec Move admin deploy keys spinach test to rspec Fix rubocop failures Store mattermost_url in settings Improve Mattermost Session specs Ensure the session is destroyed Improve session tests Setup mattermost session Fix query in Projects::ProjectMembersController to fetch members Improve test for sort dropdown on members page Fix sort dropdown alignment Undo changes on members search button stylesheet Use factories to create project/group membership on specs Remove unused id from shared members sort dropdown Fix sort functionality on project/group members to return invited users Refactor MembersHelper#filter_group_project_member_path Remove unnecessary curly braces from sort dropdown partial ...
| * | | | | | | | | Give forbidden if project for the build was deletedLin Jen-Shin2016-12-153-15/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #25309
* | | | | | | | | | Merge branch 'dz-fix-route-rename' into 'master' Douglas Barbosa Alexandre2016-12-193-4/+10
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Route#rename_children behavior ## What does this MR do? Fix Route#rename_children behavior. Given group `gitlab` and `gitlab-org` exists. When rename `gitlab` it will rename `gitlab-org` group route too. This MR fixes it ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/2772 See merge request !8182
| * | | | | | | | | | Fix Route#rename_children behaviordz-fix-route-renameDmitriy Zaporozhets2016-12-193-4/+10
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Given group `gitlab` and `gitlab-org` exists. When rename `gitlab` it will rename `gitlab-org` group route too. This commit fixes it Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | Merge branch '25740-fix-new-branch-button-padding' into 'master' Annabel Dunstone Gray2016-12-192-0/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even out padding on "plus" button in breadcrumb menu Changed the padding on the ```+``` button to be ```6px``` on all sides. ![Screen_Shot_2016-12-16_at_8_06_07_PM](/uploads/cc85f8ff36c7d2dd75546a67445af19a/Screen_Shot_2016-12-16_at_8_06_07_PM.png) Closes #25740 See merge request !8154
| * | | | | | | | | | Even out padding on plus button in breadcrumb menuRyan Harris2016-12-192-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed plus button padding to 6px 10px
* | | | | | | | | | | Merge branch 'bb-wiki-import' into 'master' Douglas Barbosa Alexandre2016-12-199-6/+88
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Wiki import to BB importer ## What does this MR do? Adds wiki importing - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/25819 See merge request !8180
| * | | | | | | | | | | Add Wiki import to BB importerValery Sizov2016-12-199-6/+88
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'ldap_maint_task' into 'master' Nick Thomas2016-12-196-22/+181
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add LDAP maintenance task I've received quite a few support requests where a user has renamed their LDAP server in the configuration file. This causes lots of issues where users are suddenly unable to sign in. It's easy enough to fix through the Rails console, but each time I had to instruct users how to get to the Rails console and what to type. This Rake task takes care of this and updates from old to new provider automatically. Example: `sudo gitlab-rake gitlab:ldap:rename_provider[ldapmain,ldapcustom]` cc/ @patricio @balameb Do you think this is useful? See merge request !2181
| * | | | | | | | | | | | Add LDAP task to rename a providerDrew Blessing2016-12-166-22/+181
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes admins will change the LDAP configuration, not realizing that problems will occur if the user's LDAP identities are not also updated to use the new provider name. This task will give admins a single command to run to update identities and will prevent having to run multiple Rails console queries.
* | | | | | | | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDouglas Barbosa Alexandre2016-12-190-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDouglas Barbosa Alexandre2016-12-199-33/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDouglas Barbosa Alexandre2016-12-199-33/+22
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Update CHANGELOG.md for 8.13.10Alejandro Rodríguez2016-12-141-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| | | * | | | | | | | | | | | | Update CHANGELOG.md for 8.14.5Alejandro Rodríguez2016-12-149-33/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | | | | Update CHANGELOG.md for 8.13.10Alejandro Rodríguez2016-12-191-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | | | | Update CHANGELOG.md for 8.14.5Alejandro Rodríguez2016-12-199-33/+15
| |_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | | | Merge branch 'move-admin-appearance-feature-to-rspec' into 'master' Rémy Coutable2016-12-194-113/+76
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move Admin Appearance spinach feature to RSpec Part of #23036 See merge request !8063
| * | | | | | | | | | | | | | | Move Admin Appearance spinach feature to rspecjurre2016-12-194-113/+76
| | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'leave-project-btn' into 'master' Fatih Acet2016-12-1914-59/+53
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move buttons to project header Closes #25692 Before: <img src="/uploads/fb65f1ca8021f1669071a3980e5f8258/Screen_Shot_2016-12-14_at_3.52.19_PM.png" width="800px"> After (with Koding setup): <img src="/uploads/236e0103186a1b482c4302aa3a4b94b1/Screen_Shot_2016-12-16_at_10.09.53_AM.png" width="800px"> After (without Koding setup): <img src="/uploads/04bc8360831c98a4c86d3b11ee24826d/Screen_Shot_2016-12-16_at_10.18.35_AM.png" width="800px"> See merge request !8095
| * | | | | | | | | | | | | | Bring back "notification-dropdown" class for styling and use ↵leave-project-btnAdam Niedzielski2016-12-182-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "js-notification-dropdown" for JavaScript
| * | | | | | | | | | | | | | Add sentence casing, fix groups page buttons, fix dark gray variableAnnabel Dunstone Gray2016-12-176-14/+5
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add empty koding state; check permissions for project buttonsAnnabel Dunstone Gray2016-12-174-16/+14
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Move all project buttons to headerAnnabel Dunstone Gray2016-12-179-33/+29
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Move access request buttons to project headerAnnabel Dunstone Gray2016-12-175-18/+27
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'pipeline-build-hitbox' into 'master' Annabel Dunstone Gray2016-12-197-76/+68
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make CI badge hitboxes better match container ## What does this MR do? Makes the Pipeline graph badge hitboxes accurately match their containers. Currently, there's an issue where the badge highlights, as though, it's clickable, but clicking it does nothing: ![before](/uploads/668f841c640bc586044c89bed9f1e1e9/before.gif) This is due to the `<a>` and `<button>` elements being padded into the parent elements. So, the parent would react to a cursor, but the cursor wouldn't be on the `<a>`/`<button>` yet. ![before-hitbox](/uploads/6ebaaa4be1096fbfc37f8d73da492c7b/before-hitbox.png) ## Are there points in the code the reviewer needs to double check? Maybe the tests? I kept the style changes as minimal as possible. ## Why was this MR needed? I was annoyed every time I clicked on a badge that I was _clearly on_ (it highlighted), but nothing happened. If I found it irritating, perhaps someone else did too. ## Screenshots (if relevant) How it behaves in the PR: ![finished](/uploads/c26fabe37ccf17f171f40b48522702b2/finished.gif) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - Tests - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #25547 See merge request !8156
| * | | | | | | | | | | | | | Make CI badge hitboxes better match containerMitchell Hentges2016-12-197-76/+68
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'move-admin-broadcast-message-feature-to-rspec' into 'master' Rémy Coutable2016-12-193-99/+51
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move admin broadcast messages spinach feature to RSpec Part of #23036 See merge request !8067
| * | | | | | | | | | | | | | | Move admin broadcast messages spinach feature to rspecjurre2016-12-193-99/+51
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'gl-dropdown-fix' into 'master' Alfredo Sumaran2016-12-191-3/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport changes from EE to gl_dropdown.js REF: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/977 See merge request !8165
| * | | | | | | | | | | | | | | Check if selected object is valid before passing to calbackgl-dropdown-fixAlfredo Sumaran2016-12-191-3/+5
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'fix-yaml-variables' into 'master' Grzegorz Bizon2016-12-198-18/+81
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert CI YAML variables keys into strings So that this would be more consistent with the other variables, which all of them are string based. Closes #25554 See merge request !8088
| * | | | | | | | | | | | | | Fix tests because now we don't convert valuesfix-yaml-variablesLin Jen-Shin2016-12-191-2/+2
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Spaces for literal hashLin Jen-Shin2016-12-191-1/+1
| | | | | | | | | | | | | | |