Commit Graph
14067 Commits
Author SHA1 Message Date
Phil Hughes 7bcacafc8a Fixed issue with incorrect line being highlighted if line is in discussion view 2016-04-20 17:25:16 +01:00
Jacob Schatz 364354bce4 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-20 16:18:44 +00:00
Jacob Schatz f39c647525 Merge branch 'issue_15366' into 'master'
Render relative timestamps for all commits in projects commit list

fixes #15366 

See merge request !3821
2016-04-20 16:08:30 +00:00
Jacob Schatz 1ec203a98f 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-20 14:50:16 +00:00
Jacob Schatz 8cb3bf326a 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-20 14:49:59 +00:00
Jacob Schatz f23f274b8d 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-20 14:26:28 +00:00
Phil Hughes 9101444c45 Fixed issue with new MR form layout 2016-04-20 14:59:07 +01:00
Phil Hughes 04c992f3cf Removed commented text from system notes 2016-04-20 14:48:53 +01:00
Phil Hughes 98b1c77e24 Fixes issue with note form inheriting text color 2016-04-20 14:44:27 +01:00
Douwe Maan b016d4356d Also show Revert and Cherry-pick when the source branch can't be removed 2016-04-20 14:28:34 +02:00
Douwe MaanandDouwe Maan d00e5455ee Verify the MR being displayed question has a merge commit set and can be cherry-picked 2016-04-20 14:28:19 +02:00
Tomasz Maczukin a84d0204bf Fix Build#append_trace method usage when trace file doesn't exists yet 2016-04-20 11:54:06 +02:00
Tomasz Maczukin dd29283a88 Make sure that appending is done on a valid length 2016-04-20 11:53:44 +02:00
Tomasz Maczukin 360bd831bf Add range checking 2016-04-20 11:53:43 +02:00
Tomasz Maczukin 38a1378e63 Add incremental build trace update API 2016-04-20 11:53:39 +02:00
Rémy Coutable d712789054 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 08:12:48 +00:00
Rémy Coutable ca3fafb904 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 08:11:50 +00:00
Robert Speicher 3d4875f86a 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 01:38:49 +00:00
Sebastian Klier edd07e2363 Fix wiki tests 2016-04-20 08:25:41 +08:00
Sebastian Klier d472810e49 formatting and test structure 2016-04-20 08:25:41 +08:00
Sebastian Klier a88f0a1fd8 add wiki_page helper to url_builder 2016-04-20 08:25:41 +08:00
Sebastian Klier 559ef41d32 improve check if wiki page is persisted 2016-04-20 08:25:41 +08:00
Sebastian Klier dac548b320 remove unnecessary methods 2016-04-20 08:25:40 +08:00
Sebastian Klier 54661d3d44 add slack notifications for wiki pages
update changelog
2016-04-20 08:25:40 +08:00
Robert Speicher 9617c274ab Merge branch 'issue_15390' into 'master'
Fix javascript errors with invalid json because of commas

fixes #15390 

See merge request !3827
2016-04-19 21:46:00 +00:00
Tomasz Maczukin 0a13f5f864 Use Rails-way to send file by X-Sendfile 2016-04-19 23:18:43 +02:00
Tomasz Maczukin 81510b46d5 Add feature specs for raw trace 2016-04-19 23:17:50 +02:00
Tomasz Maczukin bf4371d60d Switch raw trace to use X-Sendfile header 2016-04-19 23:17:49 +02:00
Tomasz Maczukin 27d1349f2b Add raw trace output for GitLab Workhorse 2016-04-19 23:17:49 +02:00
Felipe Artur 97b5e49d30 Fix javascript errors with invalid json because of commas 2016-04-19 17:54:20 -03:00
Robert Speicher c3cc332080 Merge remote-tracking branch 'dev/master' into 'master' 2016-04-19 16:10:39 -04:00
Sytse Sijbrandij 7543bc1776 CLearify shared runner warning. 2016-04-19 21:51:19 +02:00
Robert Speicher 6a19467c41 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-19 19:21:50 +00:00
Robert Speicher 8de18d417d Remove XSS vulnerability in Label and Milestone dropdowns 2016-04-19 13:41:08 -04:00
Robert Speicher f1e778be48 Merge branch 'imported-ghe-project-names-links-to-github' into 'master'
Fix GitHub project's link in the import page when provider has a custom URL

Closes gitlab-org/gitlab-ee#478

See merge request !3803
2016-04-19 17:13:25 +00:00
Douwe Maan 55380e69fc Merge branch 'pmq20/gitlab-ce-issue_12785' 2016-04-19 18:25:42 +02:00
Robert Speicher 7b09bab68e Merge branch 'mr-formatting' into 'master'
use ! rather than # for merge request references

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

See merge request !3740
2016-04-19 16:23:41 +00:00
Douglas Barbosa Alexandre 835acf22d4 Fix GitHub project's link on import page when provider has a custom URL 2016-04-19 13:21:30 -03: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
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
Felipe Artur f26a6da62c Render relative timestamps for all commits in projects commit list 2016-04-19 12:09:06 -03: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
Phil Hughes 114d3c9846 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.
2016-04-19 14:32:21 +01: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
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
Kamil Trzcinski d58d88fbd5 Use different markdown 2016-04-19 07:39:53 -04:00
Douwe Maan 1532d202f1 Merge branch 'fix/link-group-permissions' into 'master'
Check permissions when sharing project with group

## Summary

Unprivileged user was able to share project with group he didn't have access to, and therefore gain partial access to that group, which opened possibilities for further actions like listing private projects in that group.

See https://gitlab.com/gitlab-org/gitlab-ce/issues/15330

## Fix

This change introduces additional check for group read access.

## Further work

We can think about preventing such problems in the future (this is quite common problem) by moving permissions checks to another layer of abstraction (TBD).

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

See merge request !1949
2016-04-19 11:36:57 +00:00
Dmitriy Zaporozhets 51b777fa9c Merge branch 'dz/system-hooks-ui' into 'master'
Allow enable/disable push events for system hooks in UI

Improvement for !3744 

Fixes #15284 

See merge request !3812
2016-04-19 10:17:51 +00:00