summaryrefslogtreecommitdiff
path: root/changelogs
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master-recursiveTree' into 'master' Douwe Maan2016-11-151-0/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue #4270: Recursive option for files through API ## What does this MR do? - Adds recursive param to tree API request. With this param we can get all repository paths in a single request. - Related [old github pull request](https://github.com/gitlabhq/gitlabhq/pull/9311) ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Requested in #4270 ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [X] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [X] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [X] API support added - Tests - [X] Added for this feature/bug - [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 you do - 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? Requested in #4270 See merge request !6088
| * Issue #4270: Recursive option for files through APIRebeca Méndez2016-11-121-0/+4
| |
* | Merge branch '21076-deleted-merged-branches' into 'master' Douwe Maan2016-11-151-0/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add button to delete all merged branches ## What does this MR do? It adds a button to the branches page that the user can use to delete all the branches that are already merged. This can be used to clean up all the branches that were forgotten to delete while merging MRs. **Note** ~~This MR is WIP until MR !6408 is merged.~~ ## Are there points in the code the reviewer needs to double check? The UX of the actual "Delete merged branches" button. ## Why was this MR needed? Fixes #21076 ## Screenshots ![Branches page without "Delete all merged" button](/uploads/3a2936a83c3547a0fce92a74af880a2d/Screen_Shot_2016-10-17_at_20.06.30.png) Before: ![Screen_Shot_2016-10-17_at_20.07.11](/uploads/55efcebf4e0a45dbfc70ba4a11ca152c/Screen_Shot_2016-10-17_at_20.07.11.png) After: ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support 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 you do - 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 #21076 See merge request !6449
| * | Add button to delete all merged branchesToon Claes2016-11-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | It adds a button to the branches page that the user can use to delete all the branches that are already merged. This can be used to clean up all the branches that were forgotten to delete while merging MRs. Fixes #21076.
* | | Merge branch 'stanhu/gitlab-ce-fix-error-500-with-mr-images' into 'master' Douwe Maan2016-11-151-0/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Error 500 when creating a merge request that contains an image that was deleted and added _Originally opened at !4816 by @stanhu._ - - - ## What does this MR do? This MR fixes an Error 500 when creating a merge request that contains an image that was deleted and added. Before, when displaying the before and after image, the code would always retrieve the image from the parent commit. However, in a diff, this could cause two different problems: The "before" image may not actually be the image you want to compare against (regression of #14327) It may appear as though a file was modified when it was really just added during the diff ## Are there points in the code the reviewer needs to double check? There may be a more elegant to fix this bug. ## What are the relevant issue numbers? Closes #3893, gitlab-org/gitlab-ee#678 See merge request !7457
| * | | Fix Error 500 when creating a merge request that contains an image that was ↵stanhu/gitlab-ce-fix-error-500-with-mr-imagesStan Hu2016-11-141-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | deleted and added Steps to reproduce: 1. Start with a repo with an image 2. Add a commit to delete the image 3. Add another commit to replace the image with another image In a diff comparison, we really just compare about what the image was before the diff, not the direct parent of the last commit. This MR fixes that. Closes #3893, gitlab-org/gitlab-ee#678 Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'fix_saml_ldap_link' into 'master' Douwe Maan2016-11-151-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Omniauth auto link LDAP user falls back to find by DN when user cannot be found by uid Unfortunately, SAML IDs can be an LDAP UID, DN, or something else entirely. UID and DN are most common, though. This adds a fallback scenario so we first try to find a matching LDAP user by UID, then by DN. This will fix a problem for the customer in https://gitlab.zendesk.com/agent/tickets/43298 See merge request !7002
| * | | | Omniauth auto link LDAP user falls back to find by DN when user cannot be ↵Drew Blessing2016-11-101-0/+5
| | | | | | | | | | | | | | | | | | | | found by uid
* | | | | Revert bad merge after releaseAlejandro Rodríguez2016-11-145-20/+0
| | | | |
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqAlejandro Rodríguez2016-11-145-0/+20
|\ \ \ \ \
* | | | | | Update CHANGELOG.md for 8.14.0-rc2Alejandro Rodríguez2016-11-1421-84/+0
| | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge branch 'issue-13823' into 'master' Alfredo Sumaran2016-11-141-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue #13823: random message when all Todos are Done ## What does this MR do? Shows a random message every time the To Do list is empty: https://gitlab.com/gitlab-org/gitlab-ce/issues/13823 ## Are there points in the code the reviewer needs to double check? It's my first contribution to GitLab so I might need some help: - I'm loading a yaml file in the controller. I'm not sure where would be the best place to put it. - I'm also having the error below running the tests but it doesn't seem related to my changes. I think I might have some issue with my config. Could you double check if the tests pass for you? /home/pep/.rvm/gems/ruby-2.3.1/gems/actionpack-4.2.7.1/lib/action_dispatch/middleware/debug_exceptions.rb:21:in `call': No route matches [GET] "/autocomplete/users/sjobs@apple.com.json" (ActionController::RoutingError) ## Why was this MR needed? https://gitlab.com/gitlab-org/gitlab-ce/issues/13823 ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [x] 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? https://gitlab.com/gitlab-org/gitlab-ce/issues/13823 See merge request !6818
| * | | | | | Review comments Nov 11thJosep Llaneras2016-11-111-0/+4
| | | | | | |
* | | | | | | Merge branch 'fix-search-input-padding' into 'master' Annabel Dunstone Gray2016-11-141-0/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Give search-input correct padding-right value ## What does this MR do? This fixes how `padding-right: 20px` was being applied to the style rule of `.search-input`, preventing text in that form from clipping through `.search-icon` ## Are there points in the code the reviewer needs to double check? If there are any cases where `.search .search-input` is used in a search form where there is no right-side icon (I could not find such occurrence myself). ## Why was this MR needed? Some text in long search queries were being hidden by the close icon being used in the search form. This makes it a bit more presentable. ;) ## Screenshots (if relevant) __Before__ ![before](/uploads/2757a6264a1d2053af7212f72df7c3f9/before.png) __After__ ![after](/uploads/322fbfa08594f0f33d10a3226c82326d/after.png) See merge request !7407
| * | | | | | | Give search-input correct padding-right valuePhilip Karpiak2016-11-101-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because 'padding: 0' was being applied to this rule after 'padding-right: 20px' was declared, the former overruled the latter, causing search-input text to clip through the close button on the right of the search form
* | | | | | | | Merge branch 'always-show-download-button' into 'master' Annabel Dunstone Gray2016-11-141-0/+4
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Project download buttons always show ## What does this MR do? Removes `hidden-xs hidden-sm` classes from `download-button` so it doesn’t hide itself individually from the rest of the `project-repo-buttons` block ## Why was this MR needed? Fixes #23960. Not sure why this element had these classes in the first place, but at the very least we shouldn’t be hiding the Download button at the `hidden-sm` threshold since that’s still fairly large viewport and users with viewports of that size likely still want to download source code. ## Screenshots (if relevant) Screenshots taken at ~830px width __Before__ ![before](/uploads/21955cf7a12f6eb9cfef96bbb27b7110/before.png) __After__ ![after](/uploads/c082884f225184d56a920adbc0a0a732/after.png) ## What are the relevant issue numbers? #23960 See merge request !7405
| * | | | | | | Project download buttons always showPhilip Karpiak2016-11-101-0/+4
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | This was hidden when the viewport was was below the 'hidden-sm' theshold. Now it displays the same as the rest of the 'project-repo-buttons' block.
* | | | | | | Merge branch 'fix-help-page-links' into 'master' Rémy Coutable2016-11-141-0/+4
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix error links in help index page when access it with url `http://gitlab.example.com/help/` which have an extra slash Fixes #24349 See merge request !7396
| * | | | | | fix error links in help pageFu Xu2016-11-121-0/+4
| |/ / / / /
* | | | | | Merge branch 'user_filter_auth' into 'master' Rémy Coutable2016-11-141-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Centralized all LDAP config logic in to `Gitlab::LDAP::Config`. We had varying configuration for devise/omniauth and other things. For example, `user_filter` was never taken in to account for devise/omniauth so a user object would always be created, even if the user did not match the user_filter. Fixes gitlab-org/gitlab-ce#21195, https://gitlab.com/gitlab-org/gitlab-ce/issues/15396 and gitlab-org/gitlab-ce#13296 See merge request !6606
| * | | | | | Centralize LDAP config/filter logicDrew Blessing2016-11-111-0/+4
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Centralize all LDAP config logic in `GitLab::LDAP::Config`. Previously, some logic was in the Devise initializer and it was not honoring the `user_filter`. If a user outside the configured `user_filter` signed in, an account would be created but they would then be denied access. Now that logic is centralized, the filter is honored and users outside the filter are never created.
* | | | | | Merge branch 'issue_20245' into 'master' Robert Speicher2016-11-141-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix project Visibility level selector not using default values closes #20245 See merge request !7264
| * | | | | | Fix project Visibility level selector not using default valuesissue_20245Felipe Artur2016-11-101-0/+4
| | | | | | |
* | | | | | | Merge branch 'repository-name-emojis' into 'master' Rémy Coutable2016-11-141-0/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added ability to put emojis into repository name ## Are there points in the code the reviewer needs to double check? Ensure that regexp used is correct, I used the following list: http://www.unicode.org/Public/emoji/1.0/emoji-data.txt See merge request !7420
| * | | | | | | Added ability to put emojis into repository nameVincent Composieux2016-11-121-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added ability to put emojis into repository name
* | | | | | | | Merge branch '22307-pipeline-link-in-builds-view' into 'master' Kamil Trzciński2016-11-131-0/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Link from build page to its pipeline" ## What does this MR do? Adds references and links to a build's pipeline within both individual build pages and the build index. ## Are there points in the code the reviewer needs to double check? Nothing springs to mind ## Why was this MR needed? See #22307 ## Screenshots (if relevant) ![Screen_Shot_2016-10-24_at_3.45.39_PM_copy](/uploads/e6e8745a0a39d8b71c007e7df5fbd051/Screen_Shot_2016-10-24_at_3.45.39_PM_copy.png) ![Screen_Shot_2016-10-24_at_3.46.03_PM_copy](/uploads/3e2eb656347751f10bf62891b56ebcc7/Screen_Shot_2016-10-24_at_3.46.03_PM_copy.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - Tests - [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) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #22307 See merge request !7082
| * | | | | | | | add CHANGELOG entry for !7082Mike Greiling2016-11-101-0/+4
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Does not raise error when Note not found when processing NewNoteWorkerOswaldo Ferreira2016-11-111-0/+4
| |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | - Also remove unnecessary param
* | | | | | | Merge branch '24397-load-labels-on-mr-tabs' into 'master' Sean McGivern2016-11-111-0/+4
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure labels are loaded for all "show" methods of MR Controller Closes #24397 See merge request !7416
| * | | | | | Ensure labels are loaded on "show" methods of MRAlex Sanford2016-11-111-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, they were only being loaded on the actual `show` action, but not the actions representing the tabs (commits, builds, etc).
* | | | | | | Merge branch 'sidekiq-job-throttling' into 'master' Douwe Maan2016-11-111-0/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow certain Sidekiq jobs to be throttled ## What does this MR do? Allows certain slow running Sidekiq jobs to be throttled. It is disabled by default and can be enabled via the Application Settings. ![Screen_Shot_2016-11-04_at_4.51.24_PM](/uploads/a1f1d24c693fcdb278602765cd404d94/Screen_Shot_2016-11-04_at_4.51.24_PM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - Tests - [x] Added for this feature/bug - [x] All builds are passing ## What are the relevant issue numbers? Related to #23352 See merge request !7292
| * | | | | | Refactored Sidekiq Throttler and updated documentationsidekiq-job-throttlingPatricio Cano2016-11-111-1/+1
| | | | | | |
| * | | | | | Added documentation and CHANGELOG item.Patricio Cano2016-11-101-0/+4
| | | | | | |
* | | | | | | Merge branch '22699-group-permssion-background-migration' into 'master' Yorick Peterse2016-11-111-0/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix project records with invalid visibility_level values See merge request !7391
| * | | | | | | Fix project records with invalid visibility_level valuesNick Thomas2016-11-101-0/+4
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The AddVisibilityLevelToGroups migration introduced a visibility_level for namespaces and specified that projects should always have a visibility level less than or equal to their namespace. However, some invalid rows could have been created. This commit introduces a migration that updates the invalid rows, setting the invalid project to have the same visibility_level as their namespaces. This will make some projects internal or private when they would previously have been public or internal, but this is better than silently making an internal or private group public.
* | | | | | | Merge branch 'adam-fix-collapsed-diff-symlink-file-conversion' into 'master' Sean McGivern2016-11-111-0/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the collapsed diff when converting a symlink to a regular file #21610 !6828 See merge request !6953
| * | | | | | | Fix expanding a collapsed diff when converting a symlink to a regular fileadam-fix-collapsed-diff-symlink-file-conversionAdam Niedzielski2016-11-101-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In this case comparing old_path and new_path is not enough because there are two entires that match.
* | | | | | | | Merge branch 'milestone-project-require' into 'master' Sean McGivern2016-11-111-0/+4
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Require projects before creating milestone Closes #24101 See merge request !7301
| * | | | | | | Require projects before creating milestonegfyoung2016-11-101-0/+4
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch '24369-remove-additional-padding' into 'master' Annabel Dunstone Gray2016-11-101-0/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove additional padding on right-aligned items in MR widget. ## What does this MR do? Remove additional padding on right-aligned items in MR widget. So links look aligned. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? Because the links are not aligned. ## Screenshots (if relevant) ![Screen_Shot_2016-11-10_at_22.38.26](/uploads/a1deacb77483125df3c25c320f53b579/Screen_Shot_2016-11-10_at_22.38.26.png) ## Does this MR meet the acceptance criteria? - [x] [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 #24369 See merge request !7411
| * | | | | | | Remove additional padding on right-aligned items in MR widget.Didem Acet2016-11-101-0/+4
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Fixes #24369.
* | | | | | | Merge branch ↵Annabel Dunstone Gray2016-11-101-0/+4
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '24279-issue-merge-request-sidebar-todo-button-style-improvement' into 'master' Removed gray button styling from todo buttons in sidebars ## What does this MR do? Removes gray button styling from todo buttons in sidebars ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? gray buttons are inconsistent and look disabled ## Screenshots (if relevant) before: ![image](/uploads/98644ce1df8c903a2409fa066bca8195/image.png) after: ![image](/uploads/a2eb8a9c40c4e5cc081553647bde8235/image.png) ## Does this MR meet the acceptance criteria? - [x] [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 - [x] All builds are passing - [ ] 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 #24279 See merge request !7387
| * | | | | | removed gray button styling from todo buttons in sidebars24279-issue-merge-request-sidebar-todo-button-style-improvementDimitrie Hoekstra2016-11-101-0/+4
| | |/ / / / | |/| | | |
* | | | | | Merge branch '24038-fix-no-register-pane-if-ldap' into 'master' Sean McGivern2016-11-101-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix no "Register" tab if ldap auth is enabled (#24038) Closes #24038 See merge request !7274
| * | | | | | Fix no "Register" tab if ldap auth is enabled (#24038)Luc Didry2016-11-101-0/+4
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | This commit is dedicated to GuilhemB, thanks for supporting me on Tipeee :-)
* | | | | | Merge branch '24048-dropdown-issue-with-devider' into 'master' Fatih Acet2016-11-101-0/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolves divider issue in group setting dropdown ## What does this MR do? This MR resolves the issue #24048 ## Are there points in the code the reviewer needs to double check? NR ## Why was this MR needed? This MR removes extra divider from group setting dropdown when there is only one entry to show. This improves UX ## Screenshots (if relevant) **Before** ![dd-before](/uploads/b4696b610a921a710c6be74fbb212260/dd-before.png) **After** ![Screen_Shot_2016-11-10_at_4.09.36_PM](/uploads/a4ff6efe92ce60837afad079398c3880/Screen_Shot_2016-11-10_at_4.09.36_PM.png) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [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) ## What are the relevant issue numbers? Closes #24048 See merge request !7398
| * | | | | adds changelog entry file for this MR24048-dropdown-issue-with-deviderNur Rony2016-11-101-0/+4
| | |_|/ / | |/| | |
* | | | | Merge branch 'fix/error-when-invalid-branch-for-new-pipeline-used' into ↵Douwe Maan2016-11-101-0/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix error when using invalid branch name when creating a new pipeline ## What does this MR do? This MR fixes `500` error when creating a new pipeline though user interface ("Run pipeline") ## Are there points in the code the reviewer needs to double check? Is this a good approach to catch those exceptions on `Repository` level? ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - Tests - [x] Added for this feature/bug ## What are the relevant issue numbers? Closes #23982 See merge request !7324
| * | | | | Add Changelog entry for new pipeline fixGrzegorz Bizon2016-11-071-0/+4
| | |_|_|/ | |/| | |
* | | | | Merge branch 'fix-cache-for-commit-status' into 'master' Rémy Coutable2016-11-101-0/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix cache for commit status in commits list to respect branches Fix cache for commit status in commits list to respect branches Closes #24324 See merge request !7372