Allow account unlock via email
We see a lot of users get confused about what it means when your account gets
locked. Many try to reset their password and are still faced with a lockout.
With this change, users receive an email that allows them to unlock their
account immediately. The previous behavior where the account is auto-unlocked
after a time also still works.
See merge request !2049
Show git version on admin page
Before
After
gitlab-org/gitlab-ce#4077
See merge request !2101
Backport JIRA service
Fixes#3839
Move EE JIRA functionality back to CE.
- [x] Make it function in manual testing
- [x] Migrate JIRA-specific tests
- [x] Tests pass
- [x] Migrate documentation
- [x] Rollback to previous CE JIRA integration locally, activate on a project then try to migrate db and see if integration still works.
- [x] Final EE search for JIRA references
See merge request !2146
* master: (723 commits)
Bump Rack Attack to v4.3.1 for security fix
Remove duplicate entry in the changelog
Remove extra spaces after branchname
Fix merge-request-reopen button title
Add branch and tag operation to tree dropdown
Use gitlab-shell 2.6.9
Clarify Windows shell executor artifact upload support
Fix feature specs: we always show the build status if ci_commit is present
Do not display project group/name when issue and MR are in same project
Don't create CI status for refs that doesn't have .gitlab-ci.yml, even if the builds are enabled
Use gitlab-workhorse 0.5.1
Fix ci_projects migration by using the value only from latest row [ci skip]
Revert sidebar position for issue and merge request
Add info on using private Docker registries in CI [ci skip]
Upgrade Poltergeist to 1.8.1. #4131
Fix ux issue with "This issue will be closed automatically" message
Move MR Builds tab next to Commits
Api support for requesting starred projects for user
Fix Rubocop complain.
Fix merge widget JS for buttons
...
Conflicts:
app/models/project.rb
Clarify Windows shell executor artifact upload support
@ayufan noted that the runner does not support artifact upload for Windows shell executor. This adds a note so users aren't confused.
See merge request !2142
Don't create CI status for refs that doesn't have .gitlab-ci.yml, even if the builds are enabled
Fixes#3827Fixes#4157
/cc @grzesiek @dblessing
See merge request !2139
Do not display project group/name when issue and MR are in same project
I noticed that things seem a bit cluttered for related merge requests
when displaying the group/project name for every item, even when it's
in the same project.
For merge requests that are in the same project as the issue we probably
don't need to display the 'in group / name' bit.
See merge request !2141
Add new branch and tag action to tree dropdown
Right now, creating a branch or tag is only possible on the project page dropdown or on the commits page. This merge request both actions to the tree header dropdown. Now all repository web actions are available in this one location, plus the existing ones. It makes the operations a lot more intuitive.
## Existing Tree/Repository dropdown:
## New Tree/Repository dropdown:
'
See merge request !2144
Jacob Schatz
Robert Speicher
Douwe Maan
Andriy Dyadyura
Dmitriy Zaporozhets
Laurens Stötzel
Achilleas Pipinellis
Tomasz Maczukin
Jared Szechy
Jose Torres
Jacob Schatz
Drew Blessing
Grzegorz Bizon
Robert Speicher
Stan Hu
Douglas Barbosa Alexandre
Andriy Dyadyura
Zeger-Jan van de Weg
Grzegorz Bizon