summaryrefslogtreecommitdiff
path: root/CHANGELOG
Commit message (Collapse)AuthorAgeFilesLines
* Update CHANGELOG for 8.0.4Robert Speicher2015-10-051-2/+7
| | | | [ci skip]
* Merge branch 'user-preferences-layout-option' of ↵Dmitriy Zaporozhets2015-10-051-0/+1
|\ | | | | | | | | | | https://github.com/gopeter/gitlabhq into gopeter-user-preferences-layout-option Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * added user preference to change layout widthPeter Göbel2015-10-051-0/+1
| |
* | Added CHANGELOG item about fixed user identities API.Patricio Cano2015-10-051-0/+1
|/
* Merge branch 'ci-web-hooks'Dmitriy Zaporozhets2015-10-051-0/+1
|\
| * Move CI web hooks page to project settings areaDmitriy Zaporozhets2015-10-051-0/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Fix anchors to comments in diffsValery Sizov2015-10-051-0/+1
|/
* Fix bug where transferring a project would result in stale commit linksStan Hu2015-10-021-0/+1
| | | | | | | | | Transferring a project to another namespace updates the project's updated_at field, but since the cache key did not depend on the object, the page fragments were not invalidated. This resulted in stale links to the commits. Changing the cache key to use the object pathname solves this issue. Closes gitlab-org/omnibus-gitlab#843
* Merge remote-tracking branch 'public/hide_services_password'Dmitriy Zaporozhets2015-10-021-0/+1
|\
| * Hide password in the service settings formhide_services_passwordValery Sizov2015-10-021-0/+1
| |
* | Wrong access level badge on MR commentsaccess_level_badge_bugValery Sizov2015-10-021-0/+1
|/
* Merge branch 'rs-update-note' into 'master'Robert Speicher2015-10-011-0/+1
|\ | | | | | | | | | | Ensure updated notes are syntax highlighted See merge request !1444
| * Update CHANGELOGRobert Speicher2015-10-011-0/+1
| | | | | | | | [ci skip]
* | Remove email footer textZeger-Jan van de Weg2015-10-011-0/+1
| |
* | Merge branch 'show-diff-stats-for-mr'Dmitriy Zaporozhets2015-10-011-0/+1
|\ \
| * | Show additions/deletions stats on merge request diffDmitriy Zaporozhets2015-10-011-0/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Add CHANGELOG itemDmitriy Zaporozhets2015-10-011-0/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'stanhu/gitlab-ce-fix-message-id-notify'Dmitriy Zaporozhets2015-10-011-0/+1
|\ \ \
| * | | Fix Message-ID field to be RFC 2111-compliant to prevent e-mails from being ↵Stan Hu2015-10-011-0/+1
| | |/ | |/| | | | | | | | | | | | | dropped Closes #2867
* | | Merge branch 'master' into flevour/gitlab-ce-fix-merge-request-textareasDouwe Maan2015-10-011-1/+54
|\ \ \
| * \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDouwe Maan2015-10-011-0/+4
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch 'mr_improve_errors_handling'Dmitriy Zaporozhets2015-10-011-0/+1
| | |\ \
| | | * | Improve error message when merging failsmr_improve_errors_handlingValery Sizov2015-10-011-0/+1
| | | |/
| | * | Merge branch 'include-full-path-in-new-mr-page' into 'master' Dmitriy Zaporozhets2015-10-011-0/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include full path of source and target branch names in New Merge Request page The previous title on the New Merge Request page would only show the group name. which could be confusing. Before, if you attempted to create a new merge request within the repo, it might look like this: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/d300d3a362406628ffc7c8f2b5cc6b5d/image.png) Since they are in the same repo, this MR just simplifies this to the branches: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/5d7b3efc2399b37f84ccfd42bd5d6e8d/image.png) However, if you create a MR from a forked project, you now see the full namespace: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/7998c3d19e90d405f4634202cc7181c5/image.png) Closes #2875 See merge request !1477
| | | * | Include full path of source and target branch names in New Merge Request pageStan Hu2015-09-301-0/+1
| | | |/ | | | | | | | | | | | | | | | | | | | | Previous title would only show the group name, which could be confusing. Closes #2875
| | * | Note the original location of a moved project when notifying users of the moveproject_movingValery Sizov2015-10-011-0/+1
| | |/
| | * Fix bug when removed file was not appearing in merge request diffDmitriy Zaporozhets2015-09-301-0/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Merge branch 'master' into flevour/gitlab-ce-project-path-insensitive-lookupDouwe Maan2015-10-011-1/+49
| |\ \ | | |/
| | * Move CI project settings page to CE project settings areamove-ci-settingsDmitriy Zaporozhets2015-09-291-0/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * Merge branch 'move-triggers-page' into 'master' Dmitriy Zaporozhets2015-09-291-0/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move CI triggers page to project settings area Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Part of #2594 See merge request !1461
| | | * Move CI triggers page to project settings areamove-triggers-pageDmitriy Zaporozhets2015-09-291-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Merge branch 'master' into 'master' Jacob Vosmaer2015-09-291-0/+1
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for AWS S3 Server-Side Encryption support This adds support for AWS S3 SSE with S3 managed keys, this means the data is encrypted at rest and the encryption is handled transparently to the end user as well as in the AWS Console. ## Points to double check I'm unsure on the best way to the handle the default. I've followed the `multipart_upload` de facto in the app. I'm happy to change this if required or if it will impact elsewhere e.g. omnibus packages I also think I've managed to catch all of the documentation for this change as well. ### Why is this required Many enterprises require good backup support but also for this to be encrypted. By default backups aren't encrypted, this allows at rest encryption to be supported in GitLab backups providing a layer of security should the physical media not be properly disposed of. Relates to issue #2478. See merge request !1280
| | | * Add support for AWS S3 Server-Side Encryption supportPaul Beattie2015-09-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds support for AWS S3 SSE with S3 managed keys, this means the data is encrypted at rest and the encryption is handled transparently to the end user as well as in the AWS Console. This is optional and not required to make S3 uploads work.
| | * | Merge branch 'move-variables-page' into 'master' Dmitriy Zaporozhets2015-09-291-0/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move CI variables page to project settings Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Part of #2594 See merge request !1457
| | | * | Move CI variables page to project settingsmove-variables-pageDmitriy Zaporozhets2015-09-281-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | Update CHANGELOG for 8.0.3Robert Speicher2015-09-281-3/+4
| | |/ / | | | | | | | | | | | | [ci skip]
| | * | Merge branch 'move-runners-page'Dmitriy Zaporozhets2015-09-281-0/+1
| | |\ \
| | | * | Finish move of runners page to project settingsDmitriy Zaporozhets2015-09-281-0/+1
| | | |/ | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Merge branch 'fxposter/gitlab-ce-login-from-admin'Douwe Maan2015-09-281-0/+1
| | |\ \
| | | * | Add entry to changelogPavel Forkert2015-09-241-0/+1
| | | | |
| | * | | Merge branch 'add-activity-dashboard-preference' into 'master' Dmitriy Zaporozhets2015-09-281-0/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add user preference to view project activity and starred project activity as default dashboard Screenshot: ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/5e39fa66da50e01dd9ed1c8a9ce01ea9/image.png) Closes #2662 See merge request !1446
| | | * | | Add user preference to view project activity and starred project activity as ↵Stan Hu2015-09-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | default dashboard Closes #2662
| | * | | | Merge pull request #9669 from aaronsnyder/admin-labels-grammarStan Hu2015-09-261-0/+1
| | |\ \ \ \ | | | |/ / / | | |/| | | Fix grammar in admin area labels when no labels exist
| | | * | | Fix grammar in admin area labels .nothing-here-block when no labels exist.Aaron Snyder2015-09-261-0/+1
| | | | |/ | | | |/| | | | | | | | | | | updating admin area > "Labels" text to "There are no labels yet.", per Stan Hus suggestion.
| | * | | Add unreleased 8.0.3 entry to CHANGELOGRobert Speicher2015-09-251-1/+4
| | |/ / | | | | | | | | | | | | [ci skip]
| | * | Merge branch 'stanhu/gitlab-ce-fix-mr-creation-with-large-diffs'Dmitriy Zaporozhets2015-09-251-0/+1
| | |\ \
| | | * | Fix Error 500 in creating merge requests with > 1000 diffsStan Hu2015-09-251-0/+1
| | | | | | | | | | | | | | | | | | | | Closes #2692
| | * | | Merge branch 'fix-stuck-forked-project-import' into 'master' Dmitriy Zaporozhets2015-09-251-0/+1
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug where projects would appear to be stuck in the forked import state A race condition existed between when Rails committed the `import_status` to `started` and when the Sidekiq worker forked a project. If this fork were quick, it's possible that the worker would attempt to move into the `finished` state before the `started` state took effect. As mentioned in https://github.com/mperham/sidekiq/wiki/Problems-and-Troubleshooting#cannot-find-modelname-with-id12345, we can either delay the worker to ensure the DB has a chance to update, or use the nice `after_commit_queue` gem to schedule the task after the state machine commit. See: * https://github.com/pluginaweek/state_machine/issues/191 * https://github.com/shellycloud/after_commit_queue Closes #2736 See merge request !1434
| | | * | Fix bug where projects would appear to be stuck in the forked import stateStan Hu2015-09-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A race condition existed between when Rails committed the `import_status` to `started` and when the Sidekiq worker forked a project. If this fork was quick, it's possible that the worker would attempt to move into the `finished` state before the `started` state took effect. As mentioned in https://github.com/mperham/sidekiq/wiki/Problems-and-Troubleshooting#cannot-find-modelname-with-id12345, we should delay the worker to ensure the DB has a chance to update. Closes #2736
| | * | | Merge branch 'hook-api-updates' into 'master' Stan Hu2015-09-241-0/+1
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | Hook api updates See merge request !1429
View Lorry Controller Status