Commit Graph
28800 Commits
Author SHA1 Message Date
Connor Shea 2ab70cdc8c Remove Coveralls and Semaphore badges. [ci skip] 2016-05-31 09:16:04 -06:00
Robert Speicher f9bb9151b5 Merge branch 'fix/migration-uri-issue' into 'master'
Fix import URL migration error

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

See merge request !4321
2016-05-27 17:35:28 +00:00
Jacob Schatz 051b2bfa4b Merge branch 'bendyorke-comment-fix' into 'master'
Update notes immediately after closing/reopening

## What does this MR do?
Fixes MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4127 Thanks @bendyorke!
## Are there points in the code the reviewer needs to double check?
Nope.
## Why was this MR needed?
Constant conflicts in that MR
## What are the relevant issue numbers?

## Screenshots (if relevant)

Fixes #15091 

See merge request !4323
2016-05-27 17:11:41 +00:00
Jacob Schatz c39ee747dc Merge branch 'calendar-activity-button-click' into 'master'
Fixed issue with calendar activity button not sending request correctly

When you click on a square it now sends the AJAX to the correct URL rather than the current URL. This was causing an issue where it would be loading the same page & inserting that into the DOM, rather than calendar activity events.

See merge request !4322
2016-05-27 16:39:08 +00:00
Ben YorkeandJacob Schatz 31e5f081e4 Update notes immediately after closing/reopening 2016-05-27 12:10:28 -04:00
Phil Hughes a9785a4adb Fixed issue with calendar activity button not sending request correctly 2016-05-27 16:35:20 +01:00
James Lopez e60d5f9188 fix rescue block on migration 2016-05-27 17:20:15 +02:00
Jacob Schatz d59f0d90e4 Merge branch 'issuable-header-by-spacing' into 'master'
Fixed issue with spacing in issuable header

## What does this MR do?

Fixes an issue with spacing next to the word 'by' in the issuable header

## What are the relevant issue numbers?

Closes #17864 

## Screenshots (if relevant)

![Screen_Shot_2016-05-27_at_11.53.37](/uploads/464c2149df304109726b7d7ab855ebe1/Screen_Shot_2016-05-27_at_11.53.37.png)

See merge request !4314
2016-05-27 12:18:14 +00:00
Yorick Peterse ce0382b240 Merge branch 'workhorse-0.7.4' into 'master'
Use gitlab-workhorse 0.7.4

See merge request !4317
2016-05-27 12:04:15 +00:00
Yorick Peterse dda175a82f Merge branch 'queue-time-changelog' into 'master'
Changelog entry for queue duration

See merge request !4316
2016-05-27 11:56:37 +00:00
Jacob Schatz 952db59f07 Merge branch 'fix-multiple-ci-status-poll' into 'master'
Fixed potential issue with 2 ci status polling events happening

Possible cause for double notifications was if the request was slow & then you changed page whilst this request was happening it would finish on another page & then launch another interval - this stops that issue.

Also passed in the CI status as an option value rather than waiting for the first ajax request to finish

See merge request !3869
2016-05-27 11:36:01 +00:00
Jacob Vosmaer 1adaeb7d67 Use gitlab-workhorse 0.7.4
This enables
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4278 .
2016-05-27 13:06:02 +02:00
Jacob Vosmaer 1e450ae2a7 Changelog entry for queue duration 2016-05-27 12:59:40 +02:00
Phil Hughes d84992375c Fixed issue with spacing in issuable header
The Ruby was returning the HTML without a spacing next to the word 'by'

Closes #17864
2016-05-27 11:51:32 +01:00
Jacob Schatz 61072a0244 Merge branch 'fix-shortcuts-spec' into 'master'
Ensure project name is present on page

## What does this MR do?
Fixes a failing spec




See merge request !4307
2016-05-27 01:39:46 +00:00
Jacob Schatz 29db3f2c52 Merge branch 'filter-by-any-user' into 'master'
Filter issuables by any user

![any-user](/uploads/c9626b9ac355747344a7073f61dc0c82/any-user.gif)

Closes #2836

See merge request !3820
2016-05-26 22:00:22 +00:00
Robert Speicher fb83f4bfc0 Merge branch 'rs-remove-pending-spec' into 'master'
Remove boilerplate spec file for Ci::RunnerProject

See merge request !4309
2016-05-26 21:54:31 +00:00
Robert Speicher 1087b26bf2 Remove boilerplate spec file for Ci::RunnerProject
[ci skip]
2016-05-26 17:52:43 -04:00
Robert Speicher 1d2d67b9e3 Merge branch 'fix/gitlab-importer-issue' into 'master'
Fix gitlab importer issue

Fixed credentials not being called correctly - probably some bad refactoring or search & replace... 

Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/565

See merge request !4301
2016-05-26 21:36:01 +00:00
Jacob Schatz 9576f77cae Merge branch 'scroll-links-bug' into 'master'
Fix bug where fade div covers up controls button

## What does this MR do?
Fixes bug where fade div covers up controls button

## Screenshots (if relevant)
Before:     
<img src="/uploads/a6a883839255b8e10d872759a1aa54a0/Screen_Shot_2016-05-26_at_2.22.08_PM.png" width="300px">      
After:        
<img src="/uploads/9ab53d9815470cf86f68f5a340ffc454/Screen_Shot_2016-05-26_at_2.22.42_PM.png" width="300px">

See merge request !4306
2016-05-26 21:22:30 +00:00
Alfredo Sumaran bb3111c116 Ensure project name is present on page 2016-05-26 16:11:58 -05:00
Robert Speicher 03f26a4091 Merge branch 'remove-unnecessary-titles' into 'master'
Remove header title from project pages

With new navigation design it makes no sense to duplicate title in the header.

See merge request !4304
2016-05-26 20:18:21 +00:00
Annabel Dunstone 7903e44efc Fix bug where fade div covers up controls button 2016-05-26 14:21:34 -05:00
Jacob Schatz 8f11d35a92 Merge branch 'commit-header-buttons' into 'master'
Reduced number of buttons in commit header

## What does this MR do?

Reduces the buttons in the commit header.

## What are the relevant issue numbers?

Closes #17576

## Screenshots

![Screen_Shot_2016-05-26_at_11.22.24](/uploads/b0d8535bbc02ae367f193dd6633bd022/Screen_Shot_2016-05-26_at_11.22.24.png)

See merge request !4302
2016-05-26 18:49:29 +00:00
Jacob Schatz 1a848d8354 Merge branch 'move-project-dropdown-async' into 'master'
Loads move issue dropdown async

To keep the style of the dropdown the same as the other dropdowns in the issue form, it uses select2 rather than our new dropdowns.

![dropdown](/uploads/e80d5f48440b2a49fd3ac13e74c1ba55/dropdown.gif)

Closes #16563

See merge request !4160
2016-05-26 18:28:01 +00:00
Yorick Peterse 9bdfc98242 Merge branch 'measure-proxy-timing' into 'master'
Measure proxy flight time

See merge request !4278
2016-05-26 17:05:26 +00:00
Phil Hughes 6b5c3f09fd Improved mobile styling 2016-05-26 17:15:22 +01:00
Jacob Schatz d4d0fdb479 Merge branch 'services-ui' into 'master'
Updated services UI

![Screen_Shot_2016-05-17_at_10.38.10](/uploads/791ba27b3bbc18c9bde19ecf58ffea21/Screen_Shot_2016-05-17_at_10.38.10.png)

See merge request !4177
2016-05-26 16:10:19 +00:00
Dmitriy Zaporozhets 40a9e39dc7 Return header title for new project page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-26 18:06:11 +02:00
Dmitriy Zaporozhets cdcb354f17 Remove header title from project pages
With new navigation design it makes no sense to duplicate title in the
header

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-26 17:58:44 +02:00
Jacob Vosmaer 5771114f9b Rename metric to 'rails queue duration' 2016-05-26 17:53:21 +02:00
Josh Frye 85495c8c85 Merge branch 'remove-main-language' into 'master'
Remove main_language and tests. Closes #14937



See merge request !4293
2016-05-26 14:49:25 +00:00
Jacob Schatz 24b24aff75 Merge branch 'discussion-outdated-form' into 'master'
Fixed JS error when trying to remove discussion form

## What does this MR do?

Fixes a JS error which was caused by an ID of the form not matching what was returned by the JSON. Instead of checking that, it gets the current form from the ajax success event.

This would only happen on outdated discussions because the ID of the discussion form ends with `-false` because it isn't active. However, the note is added to an active discussion so the ID returned actually ends in `-true` & therefore the JS couldn't find the correct form.

## What are the relevant issue numbers?

Closes #17778

See merge request !4303
2016-05-26 14:46:54 +00:00
Jacob Schatz 44cc765a8c Merge branch 'link-to-in-issues-index' into 'master'
Replace `link_to_gfm` with `link_to` in merge request and issue titles.

## What does this MR do?
This removed GitLab Markdown Formatting from issue titles due to issues and confusion it caused as well as performance reasons.

On the issue/MR page itself, the formatting is preserved. This only effects index pages. See:

![Screen_Shot_2016-05-24_at_3.31.17_PM](/uploads/8857ed7f3cc6a47ea41ca88134e5d17a/Screen_Shot_2016-05-24_at_3.31.17_PM.png)

I think the trade-off here is worth it, otherwise we'd just be playing wack-a-mole.

## Are there points in the code the reviewer needs to double check?
I don't think so.

## Why was this MR needed?
Previously if an issue had an emoji for its name it would be unclickable. Similarly, links were rendered inline if the title was something like “Fixes a bug with https://google.com”. This confused a number of users, so it’s removed.

This is also ever so slightly more performant :)

## What are the relevant issue numbers?
This fixes #17614 and #17230.

## Screenshots (if relevant)

Before:

![Screen_Shot_2016-05-24_at_3.19.52_PM](/uploads/25313af3d3995a096b7bad7c5a26d071/Screen_Shot_2016-05-24_at_3.19.52_PM.png)

After:

![Screen_Shot_2016-05-24_at_3.20.13_PM](/uploads/f14f09918001bcbac2cd939b016479b2/Screen_Shot_2016-05-24_at_3.20.13_PM.png)

Before:

![Screen_Shot_2016-05-24_at_3.20.48_PM](/uploads/c183ae2c491650c328eb5768f6a55fd9/Screen_Shot_2016-05-24_at_3.20.48_PM.png)

After:

![Screen_Shot_2016-05-24_at_3.20.42_PM](/uploads/d3431a691768bae2c5244b9b632061b9/Screen_Shot_2016-05-24_at_3.20.42_PM.png)

cc: @rspeicher @jschatz1 

See merge request !4284
2016-05-26 14:46:39 +00:00
Phil Hughes 9a7951f7dd Fixed potential issue with 2 ci status polling events happening 2016-05-26 15:24:35 +01:00
Phil Hughes d7bd7a3e7e Fixed JS error when trying to remove discussion form
Closes #17778
2016-05-26 14:57:35 +01:00
Josh Frye d5e93deb01 Update changelog 2016-05-26 09:32:58 -04:00
Jacob Schatz f2caad2467 Merge branch 'sidebar-expand-collapse' into 'master'
Fix right sidebar expand/collapse issue

Fixed branch name of the !4117


------------------

Fixes #15643 

- Fixed a typo in `toggleSidebar` method of `Sidebar` class.
- Fixed a minor styling issue to fix the sidebar to the top of the page.
- Added tests for Sidebar.


## Before
![before](/uploads/c4efe9a64e0ae35f423302753caa6dfd/sFBwnVEpQB.gif)

## After
![after](/uploads/23e6b80888dae475a385912c8c40bdbd/rerKiYC4dk.gif)


See merge request !4292
2016-05-26 10:22:18 +00:00
Phil Hughes 2830b46cbc Reduced number of buttons in commit header
Closes #17576
2016-05-26 11:19:11 +01:00
Phil Hughes dddcab7e3f Fixed user select failing tests on merge request 2016-05-26 10:38:53 +01:00
James Lopez 5bf191c60e added changelog 2016-05-26 11:29:02 +02:00
James Lopez bf484ffee4 fix bad refactoring of import data credentials 2016-05-26 11:25:35 +02:00
Phil Hughes bc0666b3c9 Filter issuables by any user
Closes #2836
2016-05-26 10:04:17 +01:00
Fatih Acet 272d482f17 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into sidebar-expand-collapse 2016-05-26 11:45:23 +03:00
Dmitriy Zaporozhets adc64e4583 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2016-05-26 10:30:11 +02:00
Phil Hughes 42879936a8 Hide description on mobile 2016-05-26 09:15:56 +01:00
Jacob Schatz 3d009f7785 Merge branch 'updated-contrib-calendar' into 'master'
POC: Updated contrib calendar

In an effort to cut down the JS file size - i've removed the heatmap calendar used for the contributing calendar on users profiles. We already have d3 on the page so why not use it instead of using a library which uses it?

![Screen_Shot_2016-04-27_at_11.08.41](/uploads/64c40f0c766f800fd0e33ac8be7f9644/Screen_Shot_2016-04-27_at_11.08.41.png)

cc. @jschatz1 

See merge request !3944
2016-05-25 23:29:41 +00:00
Jacob Schatz 4b4cda85b2 Merge branch '17339-mobile-navigation' into 'master'
Mobile navigation fade out

Closes #17339     
Closes #17610  

<img src="/uploads/e382dd363bf8beb28339fa6b152be092/Screen_Shot_2016-05-18_at_10.16.59_AM.png" width="400px">


See merge request !4195
2016-05-25 23:28:42 +00:00
Robert Speicher 416246002e Merge branch 'upgrade-state_machines-activerecord' into 'master'
Update state_machines-activerecord from 0.3.0 to 0.4.0.

Includes support for Rails 5, working towards #14286.

See merge request !4295
2016-05-25 22:18:01 +00:00
Annabel Dunstone ec6d456b50 Change to xs breakpoint, layout_nav updates 2016-05-25 17:14:28 -05:00