Commit Graph
30283 Commits
Author SHA1 Message Date
Robert Speicher f6ab19d650 Update VERSION to 8.9.5 v8.9.5 2016-07-06 15:21:07 -04:00
Robert Speicher 3239db890c Remove duplicate "Request Access" button from groups page 2016-07-06 13:44:08 -04:00
Rémy CoutableandRobert Speicher 45a4e2484e Merge branch 'fix/project-export-error' into 'master'
Add more debug info to import/export and memory killer

This should help debug https://gitlab.com/gitlab-org/gitlab-ce/issues/19124 further

See merge request !5108
(cherry picked from commit b73da89591)
2016-07-06 12:58:03 -04:00
Phil HughesandRobert Speicher 0a98f26711 Fixed avatar alignment in new MR view 2016-07-06 12:57:17 -04:00
Douwe MaanandRobert Speicher 98090639d3 Merge branch '19092-fix-event-for-legacydiffnote-not-considered-note' into 'master'
Fix diff comments not showing up in activity feed

## What does this MR do?

It fixes the detection of note events to check for `Note` and `LegacyDiffNote`.

## Are there points in the code the reviewer needs to double check?

No? /cc @DouweM (since I believe you introduced `LegacyDiffNote`

## Why was this MR needed?

To fix #19092.

## What are the relevant issue numbers?

Fixes #19092.

## 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
  - [ ] All builds are passing
- [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)

See merge request !5069
(cherry picked from commit b5b17d00ed)
2016-07-06 12:55:05 -04:00
Yorick PeterseandRobert Speicher 3dee2366bf Merge branch 'index-on-emoji-name-and-user' into 'master'
Add index on both Award Emoji user and name

See merge request !5061
(cherry picked from commit c85092ac47)
2016-07-06 12:53:31 -04:00
Robert SpeicherandRobert Speicher e0733819b1 Merge branch 'downgrade-redis-3-2-2' into 'master'
Downgrade to Redis 3.2.2 due to massive memory leak with Sidekiq

This affects GitLab 8.8 and 8.9. See:

* https://github.com/mperham/sidekiq/blob/master/Changes.md#413
* https://gitlab.com/gitlab-org/gitlab-ce/issues/19441

See merge request !5056
(cherry picked from commit 4b0bd4f828)
2016-07-06 12:50:29 -04:00
Fatih AcetandRobert Speicher b7a6252497 Merge branch 'renable-import-button-when-namespace-already-been-taken' into 'master'
Renable import button when import process fail due to the namespace already been taken

Closes #19435

## Screenshots (if relevant)

Before:

![1](/uploads/e8de1b326e0751891f667630a7685f6a/1.png)<br/><br/>

After:

![2](/uploads/566f1fd5442c28232350689fce8eae76/2.png)

See merge request !5053
(cherry picked from commit d6efef0f2a)
2016-07-06 12:48:51 -04:00
Rémy CoutableandRobert Speicher 1b85f5572a Merge branch '19388-fix-snippets-notes-not-shown' into 'master'
Fix snippets comments not displayed

## What does this MR do?

Fix an issue where comments body were not displayed for project snippets anymore (see commit for details).

## Are there points in the code the reviewer needs to double check?

No.

## Why was this MR needed?

Because of #19388.

## What are the relevant issue numbers?

Fixes #19388.

## 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 [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)

See merge request !5045
(cherry picked from commit b227355973)
2016-07-06 12:47:20 -04:00
Stan HuandRobert Speicher 28cd940f22 Merge branch 'fix-relative-root-emoji-support' into 'master'
Fix emoji paths in relative root configurations

## What does this MR do?

If a site specifies a relative URL root, emoji files would omit the path from the URL, leading to lots of 404s.

## Are there points in the code the reviewer needs to double check?

At first, I tried to use `ActionView::Helpers::AssetUrlHelper.asset_url` since this is what it's intended to do. But this helper function is extremely slow, and it took minutes to generate the URLs for the hundreds of links needed for each emoji.

## Why was this MR needed?

Because emojis were broken in relative URL installations

## What are the relevant issue numbers?

#15642

## 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
- [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)

See merge request !5027
(cherry picked from commit 88dbc4d110)
2016-07-06 12:45:56 -04:00
Rémy CoutableandRobert Speicher 6e8864132e Merge branch 'fix/import-export-events' into 'master'
Fixing problems with events for import/export

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19202

A couple of issues related to target being missing in exported `Events` (as being polymorphic and not have `ActiveRecord` relationships is a bit more tricky than normal models) plus as the export was in JSON, the import retrieves hashed fields as stringified hashes and not symbolized - so fixed that as well, which was the cause of https://gitlab.com/gitlab-org/gitlab-ce/issues/19202

Also fixed / refactored tests
:simpl
Import/Export Version has been bumped to 0.1.1 as theses changes to events won't work very well with old exports - forcing users to generate a new export in the new version.

See merge request !4987
(cherry picked from commit c368cb605b)
2016-07-06 12:43:23 -04:00
Fatih AcetandRobert Speicher c090535a04 Merge branch '19157-use-shortcuts-is-not-working-on-gitlab-com-help' into 'master'
Fixed 'use shortcuts' button on docs

## What does this MR do?

Exposes 'onToggleHelp() to window object through `showHelp()` so a help panel can be toggled globally using `showHelp()`.

## Are there points in the code the reviewer needs to double check?

Is this the best implementation? I actually think this is tidier than doing something like `onclick="new Shortcuts().onToggleHelp"` or `$.trigger 'keydown', char: '?'` but let me know.

## Why was this MR needed?

Docs UX

## What are the relevant issue numbers?

Closes #19157.

## 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
- [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)
Closes #19157

See merge request !4979
(cherry picked from commit 48843c0d85)
2016-07-06 12:39:42 -04:00
Rémy CoutableandRobert Speicher 2a7ea34173 Merge branch 'enable-shared-runners-with-admins' into 'master'
Admin should be able to turn shared runners into specific ones:

## What does this MR do?

Make sure admins could turn shared runners into specific runners.

## Are there points in the code the reviewer needs to double check?

Is this the desired behaviour?

## Why was this MR needed?

Closes #19039
Closes #19272

![Screen_Shot_2016-06-30_at_9.30.05_PM](/uploads/97eb3b4923fd4e498b1f8ca70b1345c8/Screen_Shot_2016-06-30_at_9.30.05_PM.png)

See merge request !4961
(cherry picked from commit b569f842b3)
2016-07-06 12:39:03 -04:00
Stan HuandRobert Speicher 71212ecea6 Merge branch 'redcloth-4-3-2-cve-2012-6684' into 'master'
Update RedCloth to 4.3.2 for CVE-2012-6684

## What does this MR do?

To fix XSS (CVE-2012-6684), upgrade RedCloth to 4.3.2.

## Are there points in the code the reviewer needs to double check?

No.

## Why was this MR needed?

Security vulnerability in RedCloth (CVE-2012-6684) should be fixed to provide GitLab as a secure software.

## What are the relevant issue numbers?

Closes #19169

cf. !2037, !2071

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [n/a] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [n/a] API support added
- Tests
  - [n/a] Added for this feature/bug
  - [x] All builds are passing
- [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)

See merge request !4929
(cherry picked from commit 95336861e9)
2016-07-06 12:37:45 -04:00
Rémy CoutableandRobert Speicher ee4e66590b Merge branch '18310-improve-request-access-button' into 'master'
Improve the request / withdraw access button

It implements the design proposed in #18310.

No.

To close #18310.

Closes #18310.

| Medium | Large |
| ----------- | ------- |
| ![request_access_button](/uploads/a1de370dcbb8ac9a63d2df5c68591db7/request_access_button.png) | ![request_access_button-large](/uploads/0a1c70380268e620a6ca4d3e1661d58c/request_access_button-large.png) |

| Medium | Large |
| ----------- | ------- |
| ![withdraw_access_request_button](/uploads/c9df39d04b61566ec143d5e9cc43ada2/withdraw_access_request_button.png) | ![withdraw_access_request_button-large](/uploads/10fdaa94d72956e06bdb995e65b51472/withdraw_access_request_button-large.png) |

| Medium | Large |
| ----------- | ------- |
| ![request_access_button](/uploads/8e71395041a5cea996a35df2083bb723/request_access_button.png) | ![project-request_access_button-large](/uploads/adb2dec0eccec8e5171dc0e26e6b03a6/project-request_access_button-large.png) |

| Medium | Large |
| ----------- | ------- |
| ![withdraw_access_request_button](/uploads/12be06f0a2bf9426a5e043f52c4d1dab/withdraw_access_request_button.png) | ![project-withdraw_access_request_button-large](/uploads/93fda7767ee5f02186c4c954ea346254/project-withdraw_access_request_button-large.png) |

- [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] All builds are passing
- [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)

See merge request !4860
(cherry picked from commit c578fb064c)
2016-07-06 12:29:01 -04:00
Rémy Coutable 9f039661bc Merge branch 'cherry-pick-4e287630' into '8-9-stable'
Merge branch 'doc-mysql-priv' into 'master'

## What does this MR do?

Update missing mysql user permissions.

## Why was this MR needed?

This should also be in the `8-9-stable` branch.


See merge request !5086
2016-07-05 12:57:54 +00:00
Achilleas Pipinellis a5a59f2fdb Merge branch 'doc-mysql-priv' into 'master'
Add missing privileges to MySQL database

Closes gitlab-org/gitlab-ce#19321

See merge request !5079
2016-07-05 11:05:28 +00:00
Robert Speicher 24f3eb9c13 Update VERSION to 8.9.4 v8.9.4 2016-06-30 17:09:54 -04:00
Jacob SchatzandRobert Speicher 8cbbcee33c Merge branch 'sidebar-breakpoint' into 'master'
Updated breakpoint for sidebar pinning

Updates the breakpoint for sidebar pinning to 1024px.

Think we will have the same issue as before when picking into stable with `$window` not being defined.

See merge request !5019
(cherry picked from commit c5d164d1df)
2016-06-30 15:31:20 -04:00
Jacob SchatzandRobert Speicher 10a17adea7 Merge branch 'pin-nav-cookie-expiry' into 'master'
Expiry date on pinned nav cookie

Adds an expiry date far into the future for the pinned nav cookie so that it survives logout & browser closing.

See merge request !5009
(cherry picked from commit 73196fbd65)
2016-06-30 15:29:23 -04:00
Robert SpeicherandRobert Speicher e2692686b8 Merge branch 'fix-external-issue-rendering' into 'master'
Handle external issues in IssueReferenceFilter

Rendering issue references such as `#1` was broken for projects using an external issues tracker.

See gitlab-org/gitlab-ce#19036

See merge request !4988
(cherry picked from commit 6e82c0e06e)
2016-06-30 15:26:55 -04:00
Rémy CoutableandRobert Speicher a700bc4ce9 Merge branch 'fix_restore_warning' into 'master'
Fix restore warning message

## What does this MR do?

Fix the restore Rake task so it properly outputs the database warning. This is a pretty important warning and it was not even being output. After this fix, the output looks like the screenshot below.

![Screen_Shot_2016-06-28_at_3.53.46_PM](/uploads/d250189d39fcacd0c8ec0aacf9cd930d/Screen_Shot_2016-06-28_at_3.53.46_PM.png)

See merge request !4980
(cherry picked from commit 0144dce7ee)
2016-06-30 15:26:05 -04:00
Robert SpeicherandRobert Speicher ce8db128a9 Merge branch 'fix/build-retry-button-in-view' into 'master'
Do not show build retry link when build is active

Closes #19244

See merge request !4967
(cherry picked from commit dc2d0051dc)
2016-06-30 15:24:10 -04:00
Fatih AcetandRobert Speicher 04c2c88b67 Merge branch 'commit-avatar-alignment' into 'master'
Fixed comit avatar alignment

## What does this MR do?

Fixes the alignment of the avatar on https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG

Also fixes potential issues in other places.

## Screenshots (if relevant)

![Screen_Shot_2016-06-27_at_10.58.26](/uploads/fa4f50cfc30a870422d1afa63a4331d1/Screen_Shot_2016-06-27_at_10.58.26.png)![Screen_Shot_2016-06-27_at_10.58.35](/uploads/bd7dc3cf77464c1775fabb45b8079f02/Screen_Shot_2016-06-27_at_10.58.35.png)

See merge request !4933
(cherry picked from commit 8cada02d49)
2016-06-30 15:23:39 -04:00
Jacob SchatzandRobert Speicher eb7356a4f0 Merge branch 'label-filter-path-fix' into 'master'
Fixed URL on label button when filtering

## What does this MR do?

Gives the filtered labels the correct URL. Previously they tried to link to `labels#show` whereas now it links to the correct filter path.

## What are the relevant issue numbers?

Closes #19005

See merge request !4897
(cherry picked from commit d3d9df5a10)
2016-06-30 15:22:41 -04:00
Fatih AcetandRobert Speicher aae4444409 Merge branch 'fix_filebrowser_reload' into 'master'
File Browser navigation fixes

Fixes a double request being made when clicking the file name when navigating through file browser and also fixes opening a file in a new tab or when doing ctrl + click.

Closes #19050

**Before**

![navigation-old](/uploads/f9a40c91e430e31beae3a896cffb1c68/navigation-old.gif)

**After**

![navigation](/uploads/dec9b43894c00cc09d80d19c83506530/navigation.gif)

See merge request !4891
(cherry picked from commit b32a6add8f)
2016-06-30 15:21:41 -04:00
Dmitriy ZaporozhetsandRobert Speicher d3b282070e Merge branch '19003-file-view-subnav' into 'master'
Resolve "Sub nav isn't showing on file view"

## What does this MR do?
Adds subnav to `Repository` > `File` view

## What are the relevant issue numbers?
Closes #19003
Part of #18844

## Screenshots (if relevant)
![Screen_Shot_2016-06-23_at_5.33.05_PM](/uploads/aa6993b2376dbe454af87d852aa74f5e/Screen_Shot_2016-06-23_at_5.33.05_PM.png)

cc @dzaporozhets

See merge request !4890
(cherry picked from commit 2efee5f641)
2016-06-30 15:20:35 -04:00
Jacob SchatzandRobert Speicher 966eedd367 Merge branch 'search-input-blur' into 'master'
Fixed search field blur not removing focus

## What does this MR do?

Adds a blur event to remove focus styling from the search input.

Any particular reason we were looking for clicks on the document? I can't see why we would be.

## What are the relevant issue numbers?

Closes #18670

## Screenshots (if relevant)

![tab](/uploads/4c74d4f76ec7b45bfcf581606d2defb5/tab.gif)

See merge request !4704
(cherry picked from commit c051630aa8)
2016-06-30 15:19:57 -04:00
Douwe MaanandRobert Speicher 70fd017769 Merge branch '18033-private-repo-mentions' into 'master'
Ensure logged-out users can't see private refs

https://gitlab.com/gitlab-org/gitlab-ce/issues/18033

I'm still not sure what to do about the CHANGELOG on security issues - should I add to a patch release? This issue was assigned to 8.10.

See merge request !1974
(cherry picked from commit 3a6ebb1fd6)
2016-06-30 14:41:15 -04:00
Douwe MaanandRobert Speicher ad421b3ac6 Merge branch '19312-confidential-issue' into 'master'
Fix privilege escalation issue with OAuth external users

Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/19312

This MR fixes a privilege escalation issue, where manually set external users would be reverted back to internal users if they logged in via OAuth and that provider was not in the `external_providers` list.

/cc @douwe

See merge request !1975
(cherry picked from commit 5e6342b7ac)
2016-06-30 14:40:58 -04:00
Robert Speicher 5e546d9b47 Update VERSION to 8.9.3 v8.9.3 2016-06-29 11:58:49 -04:00
Yorick PeterseandRobert Speicher ed06a211df Merge branch '18663-avoid-extra-yaml-serializations' into 'master'
Use update_columns to by_pass all the dirty code on active_record

See merge request !4985
(cherry picked from commit ad09fcb5b9)
2016-06-29 10:55:24 -04:00
Yorick PeterseandRobert Speicher f3de17fd24 Merge branch 'make-max-member-access-faster' into 'master'
Reduce overhead and optimize ProjectTeam#max_member_access performance

See merge request !4973
(cherry picked from commit d33991f8cc)
2016-06-29 10:54:39 -04:00
Jacob SchatzandRobert Speicher 428f56308d Merge branch '17295_discussion_note' into 'master'
Fixes missing avatar on system notes

Closes #17295

![Screen_Shot_2016-06-27_at_12.50.50_PM](/uploads/b142226e608ccfe751a9b6059f57c9ec/Screen_Shot_2016-06-27_at_12.50.50_PM.jpg)

See merge request !4954
(cherry picked from commit 9e8fdead17)
2016-06-29 10:50:53 -04:00
Jacob SchatzandRobert Speicher c83db6b7cb Merge branch 'filter-fade-fix' into 'master'
Removed fade when filtering results

## What does this MR do?

Removes the `opacity` change when filtering results seeing as we now do `Turbolinks.visit` it isn't required.

Best way to see issue - filter issues & then go back. Will still have opacity styling.

See merge request !4932
(cherry picked from commit bef4294c58)
2016-06-29 10:49:55 -04:00
Jacob SchatzandRobert Speicher 2bb054c461 Merge branch 'new-mr-avatar-alignment' into 'master'
Fixed avatar alignment in new MR view

## What does this MR do?

Fixes the alignment of the avatar in new MR view.
Closes #19076

## Screenshots (if relevant)

![Screen_Shot_2016-06-24_at_12.53.58](/uploads/fc94faf2e48f194852693b7ae79e8fa3/Screen_Shot_2016-06-24_at_12.53.58.png)

See merge request !4901
(cherry picked from commit 3611ee5663)
2016-06-29 10:49:05 -04:00
Robert Speicher 58bbf0e81a Correct $window to $(window) in application.js 2016-06-28 17:50:12 -04:00
Robert Speicher 884ba10b45 Update CHANGELOG for 8.9.3 2016-06-28 16:58:25 -04:00
Yorick PeterseandRobert Speicher 27f904bee8 Merge branch '18924-gitlab-ce-tags-page-is-not-working-502-read-timeout' into 'master'
Use memorized tags array when searching tags by name

See merge request !4859
(cherry picked from commit 9d0ef60dfb)
2016-06-28 16:54:57 -04:00
Rémy CoutableandRobert Speicher 106f7f308c Merge branch 'fix/attr-encrypted-issue' into 'master'
Fix encrypted data backwards compatibility after upgrading attr_encrypted gem

Adds missing attribute to attr_encrypted so it is fully backwards-compatible. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19073

See merge request !4963
(cherry picked from commit 2c3f3cb392)
2016-06-28 16:52:55 -04:00
Robert SpeicherandRobert Speicher 887d720263 Merge branch 'cherry-pick-5734e266' into 'master'
Fix rendering of commit notes

See merge request !4953
(cherry picked from commit 9c9b0eef46)
2016-06-28 16:51:36 -04:00
Dmitriy ZaporozhetsandRobert Speicher b88112819a Merge branch '19171-pinned-width' into 'master'
Resolve "Pin should show up at 1280px min"

Decreased window min width for pinned sidebar

Closes  #19171
Part of #19200

![Screen_Shot_2016-06-27_at_9.36.13_AM](/uploads/d0a87bca5af1bee808c5b1046c0ecf72/Screen_Shot_2016-06-27_at_9.36.13_AM.png)

See merge request !4947
(cherry picked from commit bbbd0e6c81)
2016-06-28 16:50:42 -04:00
Dmitriy ZaporozhetsandRobert Speicher 0aa7472bf4 Merge branch '19170-mobile-buttons' into 'master'
Switched mobile button icons to ellipsis and angle

## What does this MR do?
Switches the mobile button icons

## What are the relevant issue numbers?
Closes #19170
Part of #19200

## Screenshots (if relevant)
![Screen_Shot_2016-06-27_at_9.08.28_AM](/uploads/7784489402e342e671d02b24d2ea0d64/Screen_Shot_2016-06-27_at_9.08.28_AM.png)

See merge request !4944
(cherry picked from commit abc6004fae)
2016-06-28 16:49:25 -04:00
Robert SpeicherandRobert Speicher 4778df1ce2 Merge branch 'mark-done-todo-id' into 'master'
Correctly return todo ID after creating todo

See merge request !4941
(cherry picked from commit 21842cf90f)
2016-06-28 16:48:16 -04:00
Rémy CoutableandRobert Speicher 53452ef5da Merge branch 'fix/sidekiq-mem-killer-debug' into 'master'
Better debugging for memory killer middleware

This adds more info to the warning messages output by `MemoryKiller`.

Previously only the PID was showed, making it difficult to debug issues like https://gitlab.com/gitlab-org/gitlab-ce/issues/19124

This adds the worker class and job ID to the log messages.

See merge request !4936
(cherry picked from commit 3659992cd5)
2016-06-28 16:47:38 -04:00
Fatih AcetandRobert Speicher a688eaddc2 Merge branch '19075-new-wiki' into 'master'
Remove duplicate new page btn from edit wiki

## What does this MR do?
Removes duplicate button on wiki page

## What are the relevant issue numbers?
Closes #19075

## Screenshots (if relevant)
![Screen_Shot_2016-06-24_at_9.45.28_AM](/uploads/8dca96c3e75b428d63acaaba6dede9a6/Screen_Shot_2016-06-24_at_9.45.28_AM.png)
![Screen_Shot_2016-06-24_at_9.45.57_AM](/uploads/e6ea97b07e48d2fe6f108d8c5a943583/Screen_Shot_2016-06-24_at_9.45.57_AM.png)

See merge request !4904
(cherry picked from commit 121c5c837f)
2016-06-28 16:47:00 -04:00
Robert SpeicherandRobert Speicher a64b7cd3ba Merge branch 'performance-clock-adjustments' into 'master'
Use clock_gettime for all performance timestamps

This MR adjusts the performance monitoring code to use `Process.clock_gettime` (thus `clock_gettime(3)`) instead of `Time.now`.

Using `Time.now` / `Time.new` adds more overhead than `Process.clock_gettime`, it also doesn't provide a way of getting timestamps in nanoseconds (which `Process.clock_gettime` does allow).

See merge request !4899
(cherry picked from commit 53ad9522c4)
2016-06-28 16:46:07 -04:00
Robert Speicher a87c99f7f7 Update CHANGELOG for 8.9.2
[ci skip]
2016-06-27 18:38:23 -04:00
Robert Speicher bf922fbd51 Update VERSION to 8.9.2 v8.9.2 2016-06-27 16:14:31 -04:00
Stan HuandRobert Speicher 7cf41bf5e6 Merge branch 'update-omniauth-saml' into 'master'
Update omniauth-saml to 1.6.0 to address a security vulnerability in ruby-saml

## What does this MR do?

Updates `omniauth-saml` to bring in the new `ruby-saml` dependency that addresses [CVE-2016-5697](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-5697)

Fixes #19206

See merge request !4951
2016-06-27 15:14:51 -04:00