summaryrefslogtreecommitdiff
path: root/CHANGELOG
Commit message (Collapse)AuthorAgeFilesLines
* Convert CHANGELOG to MarkdownRobert Speicher2016-10-161-2335/+0
| | | | | | | | | All this does is convert the version sections into headers. The list items shouldn't really be indented by two spaces, but it makes no difference to the rendering and this way we retain authorship history for the actual changes. Related to https://gitlab.com/gitlab-org/release-tools/merge_requests/29
* Make UX upgrades to SignIn/Register views.Bryce Johnson2016-10-151-0/+1
| | | | | | | - Tab between register and sign in forms - Add individual input validation error messages - Validate username - Update many styles for all login-box forms
* Enforce TrailingSemicolon and EmptyLineBetweenBlocks in scss-lint23319-enable-trailingsemicolon-on-scss-lintClement Ho2016-10-141-0/+1
|
* Merge branch ↵Annabel Dunstone Gray2016-10-141-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '23279-tabbing-over-the-login-screen-should-go-from-password-to-submit' into 'master' Improve tabbing usability for sign in page ## What does this MR do? Rearranged the html elements so that the `sign in` button gets tabbed first before the other elements and used CSS to rearrange the visual layout. I did not use `tabindex` because it does not play well with screen readers and is not recommended from an accessibility standpoint. ## Are there points in the code the reviewer needs to double check? * Need to make sure that there aren't any side effects to my code change. `.new_user` seemed to be automatically added through `form_for()` and I'm not sure if there will be other cases where `.new_user` is used where there is no sign in page with forget your password. ## Why was this MR needed? Improves the tabbing order ## Screenshots (if relevant) None ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) 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 #23279 See merge request !6867
| * Improve tabbing usability for sign in page23279-tabbing-over-the-login-screen-should-go-from-password-to-submitClement Ho2016-10-131-0/+1
| |
* | Merge branch 'mr-tabs-affix' into 'master' Fatih Acet2016-10-141-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge request tabs stick when scrolling page ## What does this MR do? When scrolling merge requests this sticks the tabs to below the navigation for easy access. ## Screenshots (if relevant) ![sticky](/uploads/372a9889c50e9f85fef475cbee110ec1/sticky.gif) ## What are the relevant issue numbers? Closes #20548 See merge request !6382
| * | Merge request tabs stick when scrolling pagePhil Hughes2016-10-061-0/+1
| | | | | | | | | | | | Closes #20548
* | | Merge branch 'fix/request-profiler-docs' into 'master' Stan Hu2016-10-141-0/+1
|\ \ \ | | | | | | | | | | | | | | | | Add docs for request profiling See merge request !6901
| * | | Add docs for request profilingfix/request-profiler-docsAhmad Sherif2016-10-141-0/+1
| | | | | | | | | | | | | | | | Closes #23239
* | | | Merge branch 'gfm-source-once' into 'master' Rémy Coutable2016-10-141-0/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Loads GFM once for per page ## What does this MR do? Currently the GFM init code is included every time there is a GFM form on the page. This changes that & only includes in once if any number of GFM forms are on the page. ## What are the relevant issue numbers? #22827 See merge request !6840
| * | | Loads GFM once for per pagegfm-source-oncePhil Hughes2016-10-141-0/+1
| | | | | | | | | | | | | | | | #22827
* | | | Use module_function in Banzai::Rendererfix-banzai-renderer-instrumentationYorick Peterse2016-10-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Using `extend self` prevents GitLab Performance Monitoring from being able to track class methods. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23347
* | | | Merge branch 'zj-show-deployed-time-ago' into 'master' Kamil Trzciński2016-10-141-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show deployed time ago Closes #21652 cc @ayufan See merge request !6676
| * | | | Show what time ago a MR was deployedZ.J. van de Weg2016-10-141-0/+1
| |/ / /
* | | | Merge branch '15463-extract-update-merge-requests' into 'master' Yorick Peterse2016-10-141-0/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Extract project#update_merge_requests to its own worker from GitPushService See merge request !6767
| * | | Extract project#update_merge_requests and SystemHooks to its own worker from ↵15463-extract-update-merge-requestsPaco Guzman2016-10-131-0/+1
| | | | | | | | | | | | | | | | GitPushService
* | | | Merge branch 'remove-unique-keyframes' into 'master' Annabel Dunstone Gray2016-10-131-0/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace unique keyframes mixin with specific keyframe animation names ## What does this MR do? Replaces `unique-keyframes` mixin with `include-keyframes` mixin ## Are there points in the code the reviewer needs to double check? Shouldn't be :thumbsup_tone1: ## Why was this MR needed? Some users had GitLab hosted in a distributed environment that makes `unique-keyframes` a non-viable implementation. The randomized animation names from `unique-keyframes` was not being picked up by the different servers which resulted in 404 errors. ## Screenshots (if relevant) None ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) 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 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 #22629 See merge request !6603
| * | | Replace unique keyframes mixin with specific keyframe animation namesClement Ho2016-10-131-0/+1
| | | |
* | | | Merge branch '22591-Convert-UTF-8-Emoji-to-Gitlab-emoji' into 'master' Rémy Coutable2016-10-131-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert unicode emojis to images. ## Why was this MR needed? For better cross platform interoperability with emojis. Closes #22591 See merge request !6829
| * | | | Convert UTF-8 Emoji to Gitlab emojiJohan H2016-10-131-0/+1
| | | | |
* | | | | Merge branch 'use-language-colours-for-graph' into 'master' Sean McGivern2016-10-131-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use defined colour for a language when available ## What does this MR do? This MR changes the colours of the different languages in the language graph. It now uses the colour set in Linguist instead of the first six characters of the SHA256'd language name where possible. If Linguist has no colour defined for a given language, it falls back to the old method of finding a colour. I talked with @connorshea about creating this MR [on Twitter](https://twitter.com/connorjshea/status/784390886222286849) a few hours earlier. Here's also an older [tweet from May](https://twitter.com/nilsding/status/737018807223496708) where we discussed some possible improvements to the graph. ## Are there points in the code the reviewer needs to double check? Hopefully none ;) ## Why was this MR needed? Aesthetics. ## Screenshots (if relevant) Before: ![language_colours_before](/uploads/6b4bac784860da746d58708bdd6bba39/language_colours_before.png) After: ![language_colours_after](/uploads/98818ebf48ffb47e6b785120e69b0b6c/language_colours_after.png) ## Does this MR meet the acceptance criteria? - [ ] [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 - [ ] 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? - #12455 See merge request !6748
| * | | | | Use Linguist::Language[] instead of creating a hashGeorg G2016-10-101-0/+1
| | | | | |
* | | | | | Merge branch 'bug/rst-forked-gem' into 'master' Marin Jankovski2016-10-131-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use forked github-markup gem to enable python3 support with omnibus ## What does this MR do? Changes the version of `github-markup` gem we are using, to be the forked one with the changes to enable python3 support. The change is backward compatible with users using Python 2, and will only be running with Python 3 in Omnibus (with the help of a custom patch we apply there). ## Are there points in the code the reviewer needs to double check? Make sure backward compatibility isn't broken for source installs. ## For the release manager You need to make sure you pickup into stable this merge request as well (for omnibus): https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/1015 as it's part of the fix, otherwise package will fail to build. ## Why was this MR needed? We had some regressions with .rst rendering that were fixed, but still some issues with encoding persisted (this MR will fix that). See: https://gitlab.com/gitlab-org/gitlab-ce/issues/21696 ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [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 - [ ] 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 you do - 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? * gitlab-org/gitlab-ce#21696 * gitlab-org/gitlab-ce#22748 * gitlab-com/support-forum#1097 See merge request !6659
| * | | | | | Updated gitlab-markup forked gem to download from rubygemsbug/rst-forked-gemGabriel Mazetto2016-10-131-0/+3
| | | | | | |
* | | | | | | Merge branch ↵Rémy Coutable2016-10-131-0/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '23234-deleting-a-milestone-removes-source-branch-deletion-options-of-associated-merge-requests' into 'master' Maintain "force_remove_source_branch" options on Merge Request unless specified ## What does this MR do? Fixes a problem where Merge Requests were losing the state associated with the flag to remove the source branch upon merge * Closes #23234 * Closes #23191 * Closes #19351 See merge request !6817
| * | | | | | Maintain "force_remove_source_branch" options on Merge Request unless specifiedMark Fletcher2016-10-131-0/+1
| | | | | | |
* | | | | | | Merge branch 'feature/cycle-analytics-2-backend' into 'master' Douwe Maan2016-10-131-0/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement second iteration of cycle analytics - Change in data measurement Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/22458 Measure everything that happened in the given time range, not only what's been pushed to production. With the exception of the staging and production stages. - [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) - 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) See merge request !6798
| * | | | | | Ignore deployment for statistics in Cycle Analytics, except in staging and ↵James Lopez2016-10-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | production stages Also, updated specs and docs.
* | | | | | | Merge branch 'feature/improve-mrwbs-and-todos-for-pipelines' into 'master' Kamil Trzciński2016-10-131-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Trigger Merge When Pipeline Succeeds on pipeline event ## What does this MR do? This MR is meant to improve merge when build succeeds triggers, which has an impact on performance. - [x] Move Merge When Build Succeeds trigger from commit status to pipeline event - [x] Drop support for triggering event for branches that include commit status submitted without branch (no longer relevant) - [x] Perform Merge When Pipeline Succeeds asynchronously to improve performance and avoid race conditions - [x] Add missing feature test that verifies if MWBS feature actually works and merges merge requests - [x] Update the documentation to reflect change in the behavior Moved to separate merge request: - [ ] Rename Merge When Build Succeeds to Merge When Pipeline Succeeds - [ ] Update documentation to reflect name change for this feature ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] Added for this feature/bug - [x] All builds are passing See merge request !6675
| * \ \ \ \ \ \ Merge branch 'master' into feature/improve-mrwbs-and-todos-for-pipelinesfeature/improve-mrwbs-and-todos-for-pipelinesGrzegorz Bizon2016-10-121-0/+6
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Update health_check gem to `~> 2.2.0` API: Version information Revert "Merge branch 'tests-use-tmpfs' into 'master'" Added documentation chapter for Git attributes Use activerecord_sane_schema_dumper Add a separate stage for bundle check Add a bundle check step to ensure dependencies are correct Create a new /templates API namespace Add disabled delete button to protected branches Make spec deterministic refactors tests because of gitlab-test repository changes Addresses Robert's feedback Speed up specs for GET /projects/:id/events API: New /users/:id/events endpoint writes tests to verify the issue is solved and fixes breaking issues. removes inconsistency regarding tagging immediately as merged once you create a branch using new branch button and adds changelog entry
| * \ \ \ \ \ \ \ Merge branch 'master' into feature/improve-mrwbs-and-todos-for-pipelinesGrzegorz Bizon2016-10-121-2/+61
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (221 commits) Add CHANGELOG entry for 8.12.6 Added 'Download' button to snippet view Merge branch 'api-fix-project-group-sharing' into 'security' Add 8.12.5, 8.11.9, and 8.10.12 CHANGELOG entries FIx JS bug with select2 because of missing `data-field` attribute in select box. Remove pointless `.vagrant_enabled` file allow multiple labels commands Move some CHANGELOG entries to the 8.13.0 part Move operations/ to new location Move health check docs under user/admin_area/monitoring Make guests unable to view MRs Add examples of fake tokens to be used in docs Remove duplicate CHANGELOG entry Allow browsing branches that end with '.atom' Refactor the SubGit/SVN documentation Document the new CI_DEBUG_TRACE variable Remove redundant images changed the scss for the top line connectors to be exactly centered Rearrange GitLab basics READMEs New images for GitLab basics "Create MR" docs ... Conflicts: app/models/commit_status.rb
| * | | | | | | | | Add Changelog entry for MWBS trigger improvementsGrzegorz Bizon2016-10-071-0/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'trim-new-user' into 'master' Fatih Acet2016-10-131-0/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure that whitespace doesn't cause adding members to fail I recently had to debug an issue where adding users wasn't working. It turned out that I was hitting "space" to confirm a `select2` dialog, and the server would throw out the whole email address because it was invalid. It looked as though GitLab was entirely ignoring my add-member request. Here's a fun gif: ![out](/uploads/5c306addb764067bca54add3b7a53c6c/out.gif) Ideally, there should also be validation client-side, so that the server doesn't need to silently fail, and the user will know what's going wrong. I'll look into creating an issue for that. Additionally, GitLab already seems to trim email addresses, sometimes? If you add _two_ address, with spaces, then the `value` of the `user_ids` DOM element will have the first `n-1` addresses without spaces. Weird. **TL;DR: Now spaces are always trimmed from new-member email addresses.** See merge request !3443
| * | | | | | | | Ensure that whitespace doesn't case adding members to failMitchell Hentges2016-10-101-0/+1
| | | | | | | | |
* | | | | | | | | Merge branch '22635-clipboard-icon' into 'master' Fatih Acet2016-10-131-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix "Copy to clipboard" action button has a mismatching white background. ## What does this MR do? Adds a class to all the clipboard icons which removes the extra padding. It also fixes some odd overlay when over the clipboard icon in commits list. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? To fix the extra padding and background color that was visible when it should not be ## Screenshots (if relevant) ![commits_list](/uploads/f988e2e2e2aea41fe3f7fe41c8a857ef/commits_list.png) ![file](/uploads/ce97909fc4e602af47fea46b8fffb7ad/file.png) ## 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 - [ ] 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) ## What are the relevant issue numbers? Closes #22635 See merge request !6785
| * | | | | | | | | Adds entry to CHANGELOGFilipa Lacerda2016-10-111-0/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch 'update-gitlab-shell' into 'master' Yorick Peterse2016-10-131-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update to gitlab-shell 3.6.6 ## What does this MR do? This updates gitlab-shell to version 3.6.6 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [ ] 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? See merge request !6830
| * | | | | | | | | | Update to gitlab-shell 3.6.6Yorick Peterse2016-10-121-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'dz-improve-mr-compar' into 'master' Douwe Maan2016-10-121-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve merge request versions compare logic ## What does this MR do? Changes the way how we compare between for merge request versions ## Are there points in the code the reviewer needs to double check? no ## Why was this MR needed? So when I squash+rebase my commit I can get more accurate diff on what changed between versions ## Screenshots (if relevant) in discussion (below) ## 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 - [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? https://gitlab.com/gitlab-org/gitlab-ce/issues/22368, https://gitlab.com/gitlab-org/gitlab-ce/issues/22721 See merge request !6589
| * | | | | | | | | | Fix CHANGELOGDmitriy Zaporozhets2016-10-121-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | Add mr version improvement to changelogDmitriy Zaporozhets2016-10-121-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | | Merge branch 'api-version' into 'master' Robert Speicher2016-10-121-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Version information ## What does this MR do? Adds a new endpoint to retrieve the version information. ## Why was this MR needed? Clients can now use this information to enable/disable certain API features depending on the version. ## What are the relevant issue numbers? Closes #22608, https://gitlab.com/gitlab-org/gitlab-ce/issues/23148 See merge request !6822
| * | | | | | | | | | API: Version informationapi-versionRobert Schilling2016-10-121-0/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge branch '17541-move-licenses-api-endpoint-to-templates-licenses' into ↵Rémy Coutable2016-10-121-0/+1
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Move `/licenses` api endpoint to `/templates/licenses`" ## What does this MR do? It moves the `/licenses`, `/gitignores` and `/gitlab_ci_ymls` API endpoints under the `/templates` namespace ## Why was this MR needed? In EE we now have somewhat ambiguous API endpoints. `/license` refers to the EE license while `/licenses` (plural) refers to license templates. @DouweM mentioned that we're adding .gitignore templates in #14106 so it may make sense to add a /templates namespace. Then, move the /license templates endpoint to be underneath, along with .gitignore endpoints. Closes #17541 See merge request !5717
| * | | | | | | | | Create a new /templates API namespaceThomas Balthazar2016-10-121-0/+1
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The /licenses, /gitignores and /gitlab_ci_ymls endpoints are now also available under a new /templates namespace. Old endpoints will be deprecated when GitLab 9.0.0 is released.
* | | | | | | | | Added documentation chapter for Git attributesYorick Peterse2016-10-121-0/+1
| |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As discussed in https://gitlab.com/gitlab-org/gitlab_git/issues/28 we'll need to clearly document the need for .gitattributes files being encoded using UTF-8. [ci skip]
* | | | | | | | Merge branch 'user-events-api' into 'master' Robert Speicher2016-10-121-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: New /users/:id/events endpoint ## What does this MR do? If add a new `/users/:id/events` endpoint to retrieve a user's contribution events. The events returned are filtered so that only the events for projects that the current user can see are returned (similarly to what we do at the controller level). ## Why was this MR needed? Because it's a nice feature to calculate leaderboards, for instance for #17815. ## What are the relevant issue numbers? Closes #20866. See merge request !6771
| * | | | | | | | API: New /users/:id/events endpointRémy Coutable2016-10-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | Merge branch 'add-disabled-delete-button' into 'master' Robert Speicher2016-10-121-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add disabled delete button to protected branches ## What does this MR do? Add's a disabled CSS style for the delete button on protected branches instead of hiding the button ## What are the relevant issue numbers? Closes #22358 See merge request !6439
| * | | | | | | | | Add disabled delete button to protected branchesClement Ho2016-10-111-0/+1
| | | | | | | | | |