home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 21:56:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
27,172 Commits 48 Branches 340 Tags
7bcacafc8a601896f8750f29fcde71f8f8ffb910
Commit Graph
27172 Commits
This Branch
This Branch
All Branches
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
Yorick Peterse 781aab702a 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-20 13:57:11 +00: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 5dba777695 Add tests 2016-04-20 14:28:43 +02: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
Rémy Coutable 34eacc539a 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-20 10:29:03 +00: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 4019b0d872 Fix some typos in documentation 
[ci skip]
 2016-04-20 11:54:06 +02:00
Tomasz Maczukin 0725c28069 Add documentation of incremental trace update API 
[ci skip]
 2016-04-20 11:54:05 +02:00
Tomasz Maczukin a70164519d Update CHANGELOG 
[ci skip]
 2016-04-20 11:53:44 +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 ca3e1d9e3f Update changelog 2016-04-20 08:25:41 +08:00
Sebastian Klier 26df51dc2e Fix test to conform to conventions 2016-04-20 08:25:41 +08:00
Sebastian Klier 39a545d2a8 Fix test 2016-04-20 08:25:41 +08:00
Sebastian Klier 6b8bb8f490 update changelog 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
Robert Speicher 6521ac7349 Update CHANGELOG 
[ci skip]
 2016-04-19 17:39:02 -04:00
Tomasz Maczukin fa337ca046 Improve and fix specs for raw trace 2016-04-19 23:18:43 +02:00
Tomasz Maczukin 0a13f5f864 Use Rails-way to send file by X-Sendfile 2016-04-19 23:18:43 +02:00
Tomasz Maczukin d2dc139d0f Update CHANGELOG 2016-04-19 23:18:36 +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
Jacob Schatz 33a483e702 Merge branch 'rs-label-xss' into 'master' 
Remove XSS vulnerability in Label and Milestone dropdowns

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

See merge request !1951
 2016-04-19 18:49:06 +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