| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| | |
|
| |\
| |
| |
| |
| |
| | |
Ensure updated notes are syntax highlighted
See merge request !1444
|
| | |
| |
| |
| | |
[ci skip]
|
| | | |
|
| |\ \ |
|
| | | |
| | |
| | |
| | | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| | | |
| | |
| | |
| | | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| |\ \ \ |
|
| | | |/
| |/|
| | |
| | |
| | |
| | | |
dropped
Closes #2867
|
| |\ \ \ |
|
| | |\ \ \
| | | |/
| | |/| |
|
| | | |\ \ |
|
| | | | |/ |
|
| | | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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:
Since they are in the same repo, this MR just simplifies this to the branches:
However, if you create a MR from a forked project, you now see the full namespace:
Closes #2875
See merge request !1477
|
| | | | |/
| | | |
| | | |
| | | |
| | | |
| | | | |
Previous title would only show the group name, which could be confusing.
Closes #2875
|
| | | |/ |
|
| | | |
| | |
| | |
| | | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| | |\ \
| | |/ |
|
| | | |
| | |
| | |
| | | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| | | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Move CI triggers page to project settings area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Part of #2594
See merge request !1461
|
| | | | |
| | | |
| | | |
| | | | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| | | |\ \
| | | |/
| | |/|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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.
|
| | | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Move CI variables page to project settings
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Part of #2594
See merge request !1457
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| | | |/ /
| | | |
| | | |
| | | | |
[ci skip]
|
| | | |\ \ |
|
| | | | |/
| | | |
| | | |
| | | | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| | | |\ \ |
|
| | | | | | |
|
| | | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Add user preference to view project activity and starred project activity as default dashboard
Screenshot:
Closes #2662
See merge request !1446
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
default dashboard
Closes #2662
|
| | | |\ \ \ \
| | | |/ / /
| | |/| | | |
Fix grammar in admin area labels when no labels exist
|
| | | | | |/
| | | |/|
| | | | |
| | | | | |
updating admin area > "Labels" text to "There are no labels yet.", per Stan Hus suggestion.
|
| | | |/ /
| | | |
| | | |
| | | | |
[ci skip]
|
| | | |\ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Closes #2692
|
| | | |\ \ \
| | | |/ /
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| | | |\ \ \
| | | |/ /
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | | |
Hook api updates
See merge request !1429
|
| | | | | | |
|
| | | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Update mailroom to 0.5.2
Fixes #2698 and #2711.
See merge request !1424
|
| | | | | | | |
|
| | | | |/ /
| | |/| |
| | | | |
| | | | | |
Closes https://github.com/gitlabhq/gitlabhq/issues/9657
|
| | | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
With CI status integrated at GitLab projects page there is no reason to keep it
anymore.
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| | | | |
| | | |
| | | |
| | | | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| | | |\ \
| | | |/
| | |/|
| | | |
| | | |
| | | |
| | | | |
Use standard Markdown font in Markdown preview instead of fixed-width font
Closes #2585
See merge request !1414
|
| | | | |
| | | |
| | | |
| | | | |
Closes #2585
|
| | | | |
| | | |
| | | |
| | | | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| | | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Move CI charts to project graphs area
Part of #2594
Should be merged after !1405
Same page but moved to another place
See merge request !1407
|
