Commit Graph
27178 Commits
Author SHA1 Message Date
Rémy CoutableandYorick Peterse fee23a52ff Merge branch 'issue_5838' into 'master'
Show project members only for members

fixes #5838 

See merge request !3752
2016-04-21 15:49:02 +00:00
Yorick Peterse 2b34ab038e Version 8.7.0-rc7 v8.7.0-rc7 2016-04-21 14:37:23 +02:00
Jacob SchatzandYorick Peterse f59c134ff8 Merge branch 'revert-sentry-js' into 'master'
Revert "Merge branch 'sentry-js' into 'master'"

This reverts commit 0f309794e7, reversing
changes made to 1e596fef1c.

See merge request !3851
2016-04-21 12:30:13 +00:00
Yorick Peterse f7e09d0fad Fixed the CHANGELOG
The changelog got messed up during merging (I think?) with 8.7 entries
showing up in older versions.
2016-04-21 12:28:57 +02:00
Jacob SchatzandYorick Peterse 52e53e0d8c Merge branch 'disable_spellcheck_for_username_field' into 'master'
Disable spellcheck and autocorrect for username field in admin page

closes #14855

## before
![Screen_Shot_2016-04-19_at_9.25.12_AM](/uploads/19387c4a11a879e9034a2179e932436e/Screen_Shot_2016-04-19_at_9.25.12_AM.png)

## after
![Screen_Shot_2016-04-19_at_9.25.47_AM](/uploads/60f4eba6a97201333dc64e46d625aac2/Screen_Shot_2016-04-19_at_9.25.47_AM.png)

See merge request !3730
2016-04-21 12:28:06 +02:00
Yorick Peterse ee6f941ae1 Merge branch 'add-pg-trgrm-in-migration' into 'master'
Attempt to create pg_trgm extension in migration for test/dev environments

See merge request !3805
2016-04-21 12:27:34 +02:00
Grzegorz BizonandYorick Peterse ad016cbd86 Merge branch 'fix/cross-project-labels-project-reference' into 'master'
Fix cross-project label ref used with invalid project

When cross-project label reference was used with invalid project reference, `nil` was assigned to project variable which later caused an exception.

Closes #15168

See merge request !3811
2016-04-21 10:26:36 +00:00
Jacob SchatzandYorick Peterse 15f62ed65f Merge branch 'note-form-text-color' into 'master'
Fixes issue with note form inheriting text color

It was only really noticeable on dark themed diffs

![Screen_Shot_2016-04-20_at_14.44.58](/uploads/4f32b487de7e4c09a494dc3c8c767ece/Screen_Shot_2016-04-20_at_14.44.58.png)

See merge request !3834
2016-04-21 10:23:48 +00:00
Jacob SchatzandYorick Peterse b61927e513 Merge branch '15104-mobile-comment-bug' into 'master'
Discussion note icon shows up when you click on diff on touch screen

Fixes #15104 

* Fix bug that stopped discussion note button from showing up on iOS
* Shifted button a few `px` to fix slight cutoff
<div>
<img src="/uploads/9d507091f33aa69ef68323386bf3a5c2/Screen_Shot_2016-04-15_at_12.08.46_PM.png" width="300px">
<img src="/uploads/a964a2a46636cbe4593abf272b5796f7/Screen_Shot_2016-04-15_at_12.11.40_PM.png" width="300px">
</div>

See merge request !3755
2016-04-21 10:17:50 +00:00
Robert SpeicherandYorick Peterse 166ef2226b Merge branch 'fix-grape-internal-allowed-action' into 'master'
Fix setting of "action" for Grape transactions

After wondering why we're not getting all the data in Grafana that I
wanted I realized I wasn't setting the "action" field properly here.

See merge request !3842
2016-04-21 10:17:33 +00:00
Jacob SchatzandYorick Peterse d793dc8b00 Merge branch 'revert-diff-scroll' into 'master'
Wrap all code in diffs

Closes #15382  
Closes #15422  
All diff code wraps to next line instead of scrolling

<img src="/uploads/ec5754919bac0b027fcb122bb88435b3/Screen_Shot_2016-04-20_at_12.22.27_PM.png" width="500px">

See merge request !3838
2016-04-21 10:07:55 +00:00
Robert SpeicherandYorick Peterse 82d8c74f76 Merge branch 'due-date-frontend' into 'master'
Add due date to issues

Closes: #12709

See merge request !3614
2016-04-21 10:07:02 +00:00
Robert SpeicherandYorick Peterse 7046aedd43 Merge branch 'sentry-js' into 'master'
Add Sentry logging for JavaScript errors

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/12675

See merge request !3795
2016-04-21 10:06:51 +00:00
Jacob SchatzandYorick Peterse 052424f39a Merge branch 'changelog-updates' into 'master'
Update changelog



See merge request !3801
2016-04-21 12:03:37 +02:00
Jacob SchatzandYorick Peterse cf69f9ca9e Merge branch 'fix_infinite_scroll_breaks_on_back_button_activity_feed' into 'master'
fix bug causing the infinite scrolling in activity feeds to break when you click a link and navigate back

![arrg_](/uploads/53b2a01d3b55938cc12c805e1a81ff6b/arrg_.gif)

See merge request !3835
2016-04-21 10:01:52 +00:00
Jacob SchatzandYorick Peterse 73b8072d35 Merge branch 'right-sidebar-z-index' into 'master'
Increased z-index of right sidebar

Fixes issue with active button overlapping it

Closes #15243

See merge request !3722
2016-04-21 10:01:41 +00:00
Jacob SchatzandYorick Peterse e1c99358dc Merge branch '15213-dialog-input' into 'master'
Add margin to top of form actions

Closes #15213

Also fixes other modal inputs (like add new directory, etc)  

![Screen_Shot_2016-04-20_at_1.47.14_PM](/uploads/14b474da2f86dcc3c1afd9e8ea09e812/Screen_Shot_2016-04-20_at_1.47.14_PM.png)

See merge request !3841
2016-04-21 10:01:33 +00:00
Jacob SchatzandYorick Peterse 523f7abef9 Merge branch 'remove-duplicate-ids' into 'master'
Removed duplicate ID's from the HTML



See merge request !3818
2016-04-21 10:01:24 +00:00
Jacob SchatzandYorick Peterse 0907e863dc Merge branch 'issue_15366' into 'master'
Render relative timestamps for all commits in projects commit list

fixes #15366 

See merge request !3821
2016-04-21 10:00:21 +00:00
Jacob SchatzandYorick Peterse 6f11c35ab1 Merge branch 'edit-link-anchor-stop' into 'master'
Fixed issue with sidebar edit links toggling anchor

This caused an issue with the page scrolling from the bottom to the top. Also stopped the dropdown links doing the same.

See merge request !3819
2016-04-21 10:00:12 +00:00
Jacob SchatzandYorick Peterse 808038be36 Merge branch 'system-note-commented' into 'master'
Removed commented text from system notes

![Screen_Shot_2016-04-20_at_14.49.22](/uploads/b1617af49cc35595afd6dfcf761a775c/Screen_Shot_2016-04-20_at_14.49.22.png)

See merge request !3836
2016-04-21 09:44:17 +00:00
Jacob SchatzandYorick Peterse 316a6b3ba1 Merge branch 'new-mr-layout-fix' into 'master'
Fixed issue with new MR form layout

Currently it is all over the place:

![Screen_Shot_2016-04-20_at_14.59.48](/uploads/09c3dffc2138140e3b009ab2564f0aca/Screen_Shot_2016-04-20_at_14.59.48.png)

Now:

![Screen_Shot_2016-04-20_at_14.59.44](/uploads/ef5ba8b7393253ecb732c57ba37dd0cf/Screen_Shot_2016-04-20_at_14.59.44.png)

See merge request !3837
2016-04-21 09:43:34 +00:00
Yorick Peterse c0acc32199 Merge branch 'fix-mr-cherry-pick-without-merge-commit' into 'master'
Verify the MR being displayed question has a merge commit set and can be cherry-picked

See merge request !3830
2016-04-21 09:41:16 +00:00
Rémy CoutableandYorick Peterse 223c64f8b5 Merge branch 'feature/incremental-build-trace-update' into 'master'
Add incremental build trace update API

Closes #14537 

Must be merged if we want changes from gitlab-org/gitlab-ci-multi-runner!124 to work.

See merge request !3447
2016-04-21 09:23:43 +00:00
Jacob SchatzandYorick Peterse 54851c014a Merge branch 'multi-filter-labels' into 'master'
Mutliple label filter

Fixes #989 

See merge request !3438
2016-04-21 09:23:28 +00:00
Jacob SchatzandYorick Peterse 4715ab9134 Merge branch 'issue_14678' into 'master'
Refresh page according remaining todos

Fixes #14678 

See merge request !3428
2016-04-21 09:17:39 +00:00
Yorick Peterse dcd4829cc7 Version 8.7.0-rc6 v8.7.0-rc6 2016-04-20 11:14:35 +02:00
Robert SpeicherandYorick Peterse 69821f1a01 Merge branch 'license-templates-and-api-12804' into 'master'
License templates when creating/editing a LICENSE file

Closes #12804

See merge request !3660
2016-04-20 10:50:27 +02:00
Rémy CoutableandYorick Peterse aa49124ef4 Merge branch 'feature/raw-trace-output' into 'master'
Add raw build trace output

Closes #15308, #15147

Changes in the UI:

- on finished build:

    ![raw-on-finished-build](/uploads/0e0904940db5b381ae064d49343c6508/raw-on-finished-build.png)

- on running build:

    ![raw-on-running-build](/uploads/0e4c800b68c12bdd0cbd2eea732b22ff/raw-on-running-build.png)

See merge request !3767
2016-04-20 10:49:56 +02:00
Rémy CoutableandYorick Peterse b255cbf396 Merge branch 'slack_wiki_notifications' into 'master'
add slack notifications for wiki pages

## What does this MR do?

Lets the Slack service be configured to send notifications when wiki pages are created or edited.

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

I'm just starting to get familiar with the Gitlab codebase and I was unsure on how to get the wiki page url to pass it to the slack message, on whether or not I needed to refactor the create/update methods for wiki pages from the controller to a service (but seemed necessary to test it better), and if I needed to add a column to the web hooks table or if the services table would have been enough. Please let me know if I should change anything and I will improve the MR, thanks for checking :)

## Why was this MR needed?

Related to #563 and fixes #4233.



See merge request !2998
2016-04-20 10:49:31 +02:00
Robert SpeicherandYorick Peterse 413ff5b3ce Merge branch 'issue_15390' into 'master'
Fix javascript errors with invalid json because of commas

fixes #15390 

See merge request !3827
2016-04-20 10:48:22 +02:00
Robert SpeicherandYorick Peterse e2903f28e5 Merge branch '15139-fix-constants-redefinition-warnings' into 'master'
Define constants only if not defined yet and freeze them

Fixes #15139.

See merge request !3810
2016-04-20 10:47:48 +02:00
Robert SpeicherandYorick Peterse b0bb561494 Remove XSS vulnerability in Label and Milestone dropdowns 2016-04-19 22:08:45 +02:00
Sytse SijbrandijandYorick Peterse 118daa7020 CLearify shared runner warning. 2016-04-19 22:01:51 +02:00
Douglas Barbosa AlexandreandYorick Peterse c50f2e155b Fix GitHub project's link on import page when provider has a custom URL 2016-04-19 19:20:02 +02:00
P.S.V.RandYorick Peterse fd4c833367 Add support to cherry-pick any commit
Issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/12785
Merge Request: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3514
2016-04-19 19:19:00 +02:00
Ben BodenmillerandYorick Peterse 8d1b82acf1 format merge request references properly 2016-04-19 19:18:56 +02:00
Yorick Peterse f6fbd0fb84 Merge branch 'master' into 8-7-stable
In doing this I'm breaking my own rules of not merging master into a
stable branch during the feature freeze. I'm breaking this rule for two
reasons:

1. Somewhere down the line I messed up picking commits into the stable
   branch and as a result I basically can't merge anything anymore
   without resolving 9000 merge conflicts.

2. All merge requests merged into master had the "Pick into Stable"
   label anyway except for one commit that bumps the version. As such
   merging master into this branch is not really different from picking
   things manually.
2016-04-19 18:57:10 +02:00
Robert Speicher 18a8844fa0 Merge branch '14566-confidential-issue-branches' into 'master'
Sanitize branch names for confidential issues

- When creating new branches for confidential issues, prefer a branch name like `issue-15` to `some-sensitive-issue-title-15`.
- The behaviour for non-confidential issues stays the same.

Closes #14566

See merge request !3671
2016-04-19 16:15:50 +00:00
Rémy Coutable a04e5b4e1b Merge branch 'toggle-points-per-packet' into 'master'
Configuring of points per UDP packet

Related to https://gitlab.com/gitlab-com/operations/issues/195. This option would allow us to experiment with finding a good balance between points-per-packet and the UDP packet size.

cc @pcarranza 

See merge request !3816
2016-04-19 15:49:00 +00:00
Yorick Peterse af06431cef Merge branch 'bump-version' into 'master'
Bump version to 8.8.0-pre

See merge request !3809
2016-04-19 15:42:06 +00:00
Dmitriy Zaporozhets eb467aeb7b Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2016-04-19 17:39:15 +02:00
Hannes Rosenögger 9bab098455 Merge branch 'patch-1' into 'master'
"git lfs init" is deprecated, use "git lfs install" instead.

Recent releases of git-lfs warn that "init" is a deprecated command and that "install" should be used.


See merge request !3779
2016-04-19 15:35:33 +00:00
Douwe Maan 60942bf581 Merge branch 'rs-issue-15126' into 'master'
Remove persistent XSS vulnerability in `commit_person_link` helper

Because we were incorrectly supplying the tooltip title as
`data-original-title` (which Bootstrap's Tooltip JS automatically
applies based on the `title` attribute; we should never be setting it
directly), the value was being passed through as-is.

Instead, we should be supplying the normal `title` attribute and letting
Rails escape the value, which also negates the need for us to call
`sanitize` on it.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15126

See merge request !1948
2016-04-19 15:16:00 +00:00
Jacob Schatz 0063194ad6 Merge branch 'profile-aside-toggle' into 'master'
Removed aside toggle on profile pages

Closes #13943

See merge request !3796
2016-04-19 14:05:28 +00:00
Jacob Schatz 2011f02b5d Merge branch 'dropdown-filter-after-load' into 'master'
Trigger filtering after ajax is complete in dropdown

![filter](/uploads/1c361d968769eb3fe5cdd05dee497aa6/filter.gif)

Closes #15186

See merge request !3813
2016-04-19 13:15:54 +00:00
Yorick Peterse 229f3ce9ce Configuring of points per UDP packet
This allows users to configure the number of points stored in a single
UDP packet. This in turn can be used to reduce the number of UDP packets
being sent at the cost of these packets being somewhat larger.

The default setting is 1 point per packet so nothing changes for
existing users.
2016-04-19 14:35:25 +02:00
Rémy Coutable bfa16dbcfb Merge branch 'api-fix-annotated-tags' into 'master'
API: Present an array of Gitlab::Git::Tag instead of array of rugged tags

The annotated message was always `null` because the wrong array was presented. 

The entity requires an array of `Gitlab::Git::Tags` instead an array of raw rugged tags was presented. Since a rugged tag does not respond to `message` to get the annotated message, this was always `null`. 

See merge request !3764
2016-04-19 12:31:31 +00:00
Grzegorz Bizon fd13cd189f Merge branch 'docs/notice-about-gitlab-runner' into 'master'
Add notice about GitLab Runner to requirements docs

This is related to #14589, and problems that may stem from running
GitLab Runner on same machine user installed GitLab web app on.

See merge request !3518
2016-04-19 12:17:48 +00:00
Kamil Trzciński ee812a8707 Merge branch 'configurable-shared-runners-text' into 'master'
Add configurable shared runners text

cc @axil @rspeicher @grzesiek 

See merge request !3750
2016-04-19 12:15:59 +00:00