* master: (143 commits)
Only load autocomplete data when actually needed
Check for current user
Add pencil icon to edit group settings
Issue #5817 wording of the web hooks updated on issue and merge events
use JavaScript instead of CoffeeScript in Views, the reason #9819
Before project save ensure that a runners_token exists
Fix Error 500 when visiting build page of project with nil runners_token
Remove outdated gitlab-git-http-server reference from Install doc
Fix typo in build page of projects
Update docs for shared runner default settings
Disable "Already Blocked" button in admin abuse report page
Add CHANGELOG entry for reply-by-email fix
Use WOFF versions of SourceSansPro
Clean up document on adding users to a project
Refactor ZenMode
Fix caching issue where build status was not updating in project dashboard
Add a CHANGELOG entry for The Most Important Feature of All Time(TM)
changes verb `references` to noun `reference`.
fixes new branch button positioning, when visible and not visible container
DRY up upload and download services
...
* master: (75 commits)
Fix grammar
Clarify the key generation step
Remove misleading `ssh-dsa`
markdown fixes
markdown fixes
Add `AbuseReport#notify`
Make AbuseReportMailer responsible for knowing if it should deliver
Redirect back to user profile page after abuse report
Redesign the AbuseReports index
Don't notify users twice if they are both project watchers and subscribers
Restructure logo JS to use `setInterval`
Decrease the logo sweep delay
Correct the logo ID names
Update CHANGELOG
Merge pull request GH-9938 from huacnlee/hotfix/note_mail_with_notification
Remove jquery.blockUI.js plugin
rempves tests for "you have master access" text
Revert "Merge branch 'rs-remove-jquery-blockui' into 'master'
"
removes footer message about access to project
remove public field from namespace and refactoring
...
Attempting to use the /projects/:id API by specifying :id in
"namespace/project" format would always result in a 404 if the namespace
contained a dot.
The reason? From http://guides.rubyonrails.org/routing.html#specifying-constraints:
"By default the :id parameter doesn't accept dots - this is because the dot is
used as a separator for formatted routes. If you need to use a dot within an
:id add a constraint which overrides this - for example id: /[^\/]+/ allows
anything except a slash."
Closes https://github.com/gitlabhq/gitlabhq/issues/9573
* master: (108 commits)
Fix project transfer e-mail sending incorrect paths in e-mail notification
Update CHANGELOG
Use Gitlab::CurrentSettings for InfluxDB
Write to InfluxDB directly via UDP
Strip newlines from obfuscated SQL
Add hotfix that allows to access build artifacts created before 8.3
note votes methids implementation
When reCAPTCHA is disabled, allow registrations to go through without a code
Downcased user or email search for avatar_icon.
Handle missing settings table for metrics
Fix broken link in permissions page [ci skip]
reCAPTCHA is configurable through Admin Settings, no reload needed.
Fixed syntax in gitlab.yml.example
Move InfluxDB settings to ApplicationSetting
Fix spelling mistake, thanks Connor.
Restart settings are moved too.
Hotfix for builds trace data integrity
add issue weight to contributing
Added host option for InfluxDB
Fixed styling of MetricsWorker specs
...
Add JS validation for invalid characters in branch name
Fixes#3293
Demo:
See merge request !2122
* add note to Events API
* add author section to Events API
* add noteable_id and noteable_type to Notes API
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Tomasz Maczukin
Robert Speicher
Robert Schilling
Douwe Maan
Stan Hu
Douglas Barbosa Alexandre
Zeger-Jan van de Weg
Dmitriy Zaporozhets
Gabriel Mazetto
Kamil Trzcinski
Robert Speicher