- 20 12月, 2016 33 次提交
-
-
由 Filipa Lacerda 提交于
Changes after review
-
由 Filipa Lacerda 提交于
-
由 Filipa Lacerda 提交于
-
由 Filipa Lacerda 提交于
-
由 Kamil Trzcinski 提交于
-
由 Kamil Trzcinski 提交于
-
由 Kamil Trzcinski 提交于
-
由 Filipa Lacerda 提交于
-
由 Filipa Lacerda 提交于
Fix tooltips in dropdown
-
由 Filipa Lacerda 提交于
* master: (32 commits) Update CHANGELOG.md for 8.13.10 Update CHANGELOG.md for 8.14.5 Add Wiki import to BB importer Make CI badge hitboxes better match container Move admin broadcast messages spinach feature to rspec Move Admin Appearance spinach feature to rspec Fix MR issue to do with merge user Check if selected object is valid before passing to calback Fix for missing service when importing from EE to CE Fix tests because now we don't convert values Spaces for literal hash updated spec Keep the value type for YAML variables Test if expanded_environment_name could expand var Fix duplicated build token problem and added relevant spec Just implement it in the block Move admin labels spinach test to rspec Bring back "notification-dropdown" class for styling and use "js-notification-dropdown" for JavaScript Fix 500 error for invalid path when visiting blame page Add sentence casing, fix groups page buttons, fix dark gray variable ...
-
由 Filipa Lacerda 提交于
-
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
-
由 Nick Thomas 提交于
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
-
-
由 Alejandro Rodríguez 提交于
[ci skip]
-
由 Alejandro Rodríguez 提交于
[ci skip]
-
由 Rémy Coutable 提交于
Move Admin Appearance spinach feature to RSpec Part of #23036 See merge request !8063
-
-
由 Fatih Acet 提交于
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
-
由 Annabel Dunstone Gray 提交于
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
-
由 Rémy Coutable 提交于
Move admin broadcast messages spinach feature to RSpec Part of #23036 See merge request !8067
-
由 Alfredo Sumaran 提交于
Backport changes from EE to gl_dropdown.js REF: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/977 See merge request !8165
-
由 Grzegorz Bizon 提交于
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
-
由 Valery Sizov 提交于
-
-
由 Mitchell Hentges 提交于
-
由 Rémy Coutable 提交于
Fix import/export merge requests error When MWBS is set and the MR exported/imported an error gets thrown. We should ignore this so it can succeed as the merge user may no longer exist in the target instance. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/24009 and https://gitlab.com/gitlab-com/support-forum/issues/1345 See merge request !8134
-
由 Rémy Coutable 提交于
Fix missing service error importing from EE to CE Ignores services that are missing in the new instance (EE or even a customised instance), to avoid breaking the import. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23782 See merge request !8144
-
由 Filipa Lacerda 提交于
-
由 Sean McGivern 提交于
Fix 500 error for invalid path when visiting blame page Closes #25761 See merge request !8145
-
Bump gitlab-shell to 4.1.1 This fixes a compatibility issue with Git 2.11 (#25301): - [x] gitlab-shell MR: gitlab-org/gitlab-shell!112 - [x] CE MR: !7967 - [x] EE MR: gitlab-org/gitlab-ee!964 See merge request !8143
-
由 jurre 提交于
-
由 jurre 提交于
-
- 19 12月, 2016 7 次提交
-
-
由 James Lopez 提交于
-
由 Alfredo Sumaran 提交于
-
由 James Lopez 提交于
Signed-off-by: NRémy Coutable <remy@rymai.me>
-
由 Lin Jen-Shin 提交于
-
由 Rémy Coutable 提交于
Move admin labels spinach test to RSpec Part of #23036 See merge request !8166
-
由 Filipa Lacerda 提交于
-
由 Grzegorz Bizon 提交于
Fix duplicated build token problem importing projects Reset token so duplicated builds do not thrown an error on import - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - Tests - [x] Added for this feature/bug - [x] 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) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23475 See merge request !8171
-