Commit Graph
30266 Commits
Author SHA1 Message Date
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
Robert SpeicherandRobert Speicher a61b40136b Merge branch 'fix-18997' into 'master'
Fix visibility of snippets when searching

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

See merge request !1972
2016-06-27 14:48:46 -04:00
Robert SpeicherandRobert Speicher 7917cbbb38 Merge branch '19102-fix' into 'master'
Fix an information disclosure when requesting access to a group containing private projects

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

The commit speaks for itself:

    Fix an information disclosure when requesting access to a group containing private projects
    
    The issue was with the `User#groups` and `User#projects` associations
    which goes through the `User#group_members` and `User#project_members`.
    
    Initially I chose to use a secure approach by storing the requester's
    user ID in `Member#created_by_id` instead of `Member#user_id` because I
    was aware that there was a security risk since I didn't know the
    codebase well enough.
    
    Then during the review, we decided to change that and directly store the
    requester's user ID into `Member#user_id` (for the sake of simplifying
    the code I believe), meaning that every `group_members` / `project_members`
    association would include the requesters by default...
    
    My bad for not checking that all the `group_members` / `project_members`
    associations and the ones that go through them (e.g. `Group#users` and
    `Project#users`) were made safe with the `where(requested_at: nil)` /
    `where(members: { requested_at: nil })` scopes.
    
    Now they are all secure.

See merge request !1973
2016-06-27 14:48:46 -04:00
Rémy Coutable 78596dcddc Merge branch 'fix-changelog-entries' into 'master'
Remove duplicate changelog entry

## What does this MR do?

Removes a changelog entry from 8.9.1, which is only present in 8.10



See merge request !4937
2016-06-27 17:35:06 +02:00
Robert Speicher e24601c137 Correct CHANGELOG for 8.9.1
[ci skip]
2016-06-26 15:02:19 -04:00
Robert Speicher 68accfd049 8.9.1 is released
[ci skip]
2016-06-25 20:28:59 -04:00
Robert Speicher c6da519b29 Update VERSION to 8.9.1 v8.9.1 2016-06-25 13:30:53 -04:00
Stan HuandRobert Speicher 082f1f2198 Merge branch 'add-smtp-setting' into 'master'
Add SMTP as default delivery method to match gitlab-org/omnibus-gitlab!826

Something happened after upgrading to 8.9RC5 that caused mail settings to be set to sendmail by default. gitlab-com/infrastructure#128 describes the issue in more detail. This MR mirrors the change in omnibus with gitlab-org/omnibus-gitlab!826.

Closes #19132

See merge request !4915
2016-06-24 16:56:03 -04:00
Stan HuandRobert Speicher 7232392c76 Merge branch '19035-fix-merge-issue' into 'master'
Fix a wrong MR status when merge_when_build_succeeds & project.only_allow_merge_if_build_succeeds are true

## What does this MR do?

Fix a wrong MR status when merge_when_build_succeeds & project.only_allow_merge_if_build_succeeds are true.

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

@stanhu I reused your proposal from the issue, I think it's a good enough solution.

## What are the relevant issue numbers?

Fixes #19035.

## 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
- [ ] 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 !4912
2016-06-24 16:54:24 -04:00
Robert Speicher 350f857e11 Fix CHANGELOG for !4628
[ci skip]
2016-06-24 16:51:59 -04:00
Yorick PeterseandRobert Speicher c7a9623c2a Merge branch 'optimize-award-emoji' into 'master'
Eager load award emoji on notes and participants

See merge request !4628
2016-06-24 12:23:08 -04:00
Rémy CoutableandRobert Speicher ac7cea3084 Merge branch 'fix/gitlab-import-project-file-fix' into 'master'
Fix temp file being deleted after the request while importing a GitLab project

Fixes https://gitlab.com/gitlab-com/infrastructure/issues/151

In production, the temporary uploaded file is getting deleted straight after the request so the Sidekiq worker is unable to find it in `/tmp`

Also, improved erroring/logging of this situation.

See merge request !4894
2016-06-24 11:31:41 -04:00
Jacob SchatzandRobert Speicher 12af7464cf Merge branch 'fix-logo' into 'master'
Remove width restriction for logo on sign-in page.

Follow-up on !4661 since we didn't remove the width restriction on that.

See merge request !4888
2016-06-24 11:30:37 -04:00
Yorick PeterseandRobert Speicher 7919366944 Merge branch 'refactor-rendering-redacting' into 'master'
Support for rendering/redacting multiple documents

See merge request !4828
2016-06-24 11:28:39 -04:00
Jacob SchatzandRobert Speicher 12d9e05718 Merge branch '18438-ios-scrolling' into 'master'
Resolve "Scrolling horz on iOS for the secondary nav is broken"

## What does this MR do?
Moves absolutely positioned `div`s outside of the scrolling container because mobile safari causes those elements to jump around on scroll.

## Are there points in the code the reviewer needs to double check?
Check on a real iPhone (was only able to check in iOS simulator)

## Why was this MR needed?
Mobile Safari.

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

## Screenshots (if relevant)
![mobile-safari-fix](/uploads/b38bba735530eb11507fe03036292dd8/mobile-safari-fix.gif)

See merge request !4869
2016-06-23 18:27:37 -04:00
Jacob SchatzandRobert Speicher a0ce7cf3d2 Merge branch '19008_ci_dropdown_label_fix' into 'master'
Apply selected value as label

## What does this MR do?

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

## Why was this MR needed?

## What are the relevant issue numbers?

## Screenshots (if relevant)
![dropdown-label](/uploads/db2ea7cb3cc51fbdeea53c304f1bd7a5/dropdown-label.gif)

## 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
  - [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 !4886
2016-06-23 18:22:58 -04:00
Stan HuandRobert Speicher a23e108ea6 Merge branch 'bump-gitlab-git-10-2-1' into 'master'
Bump gitlab_git to 10.2.3 to fix false truncated warnings with ISO-8559 files

Closes #18690

See merge request !4884
2016-06-23 18:22:02 -04:00
Robert SpeicherandRobert Speicher 25670ee440 Merge branch '18569-fix-diff-note-position' into 'master'
Restore old behavior around diff notes to outdated discussions

Fixes #18569

See merge request !4870
2016-06-23 18:20:00 -04:00