home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 19:16:39 +10:00
Code Issues Packages Projects Releases Wiki Activity
27,172 Commits 48 Branches 340 Tags
7bcacafc8a601896f8750f29fcde71f8f8ffb910
Commit Graph
501 Commits
Author SHA1 Message Date
Douwe Maan 5dba777695 Add tests 2016-04-20 14:28:43 +02: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
Tomasz Maczukin fa337ca046 Improve and fix specs for raw trace 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
Douwe Maan 55380e69fc Merge branch 'pmq20/gitlab-ce-issue_12785' 2016-04-19 18:25:42 +02: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
Kamil Trzcinski d58d88fbd5 Use different markdown 2016-04-19 07:39:53 -04:00
Robert Speicher 17a730178d Remove additional misuse of data-original-title attribute 2016-04-18 11:40:24 -04:00
Kamil Trzcinski 21041525af Update according to review comments 2016-04-18 09:56:38 -04:00
Kamil Trzcinski 6b124d42d9 Add configurable shared runners text 2016-04-18 09:54:52 -04:00
Rémy Coutable b2370fefad Fix specs 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-18 14:47:50 +02:00
Rémy Coutable 13804aba86 Continue implementation of the license template selector and /licenses API endpoint 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-18 14:47:50 +02:00
P.S.V.R 3d6ba3b107 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-18 15:39:07 +08:00
Timothy Andrew 40bc8e7677 Add acceptance test to check if the user password persists after form redisplays. 
- While signing up.
 2016-04-18 12:19:11 +05:30
Stan Hu e9f20f5922 Merge branch 'fix-issue-dropzone' into 'master' 
Fixed issue with dropzone not working on new issuable

Closes #15295

See merge request !3760
 2016-04-18 03:02:12 +00:00
Phil Hughes 0be158a072 Added upload file test to new issue form 2016-04-17 12:15:45 +01:00
Phil HughesandJacob Schatz 4b15a8ed26 Fixed up based on feedback 2016-04-16 16:13:16 -04:00
Phil HughesandJacob Schatz ce2e37d446 Fixed tests 2016-04-16 16:13:16 -04:00
Alfredo SumaranandJacob Schatz 18b4291181 Add tests for autocomplete on a Commit 2016-04-16 07:21:28 -04:00
Alfredo SumaranandJacob Schatz a53e912bc0 Change context description 2016-04-16 07:21:28 -04:00
Alfredo SumaranandJacob Schatz 40efb4eb1f Add tests for autocomplete on a Merge Request 2016-04-16 07:21:28 -04:00
Alfredo SumaranandJacob Schatz a740f0bc99 Add tests for autocomplete on a Issue 2016-04-16 07:21:28 -04:00
theoretick 5bf47f14b9 Do not include award emojis in issue view comment_count 
Fixes Issue #14431
 2016-04-14 11:20:55 -07:00
Robert Speicher 95a867e0af Merge branch 'auto-fsck' into 'master' 
Auto git fsck

Closes https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3232

See merge request !3232
 2016-04-14 17:15:58 +00:00
Stan Hu c7e384aab2 Add spec for deletion of authorized OAuth2 application 
Closes #14370

Move gon function into its own helper
 2016-04-14 07:24:58 -07:00
Alfredo Sumaran a31c1dccb6 Add test to check if top right search form is not present 2016-04-13 16:43:07 -05:00
Jacob Vosmaer f07316f27c Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsck 2016-04-13 17:38:59 +02:00
Jacob Vosmaer 0f602be99f Clear repository check columns asynchronously 2016-04-13 15:56:05 +02:00
Jacob Schatz f026e53c4d Merge branch 'label-filter' into 'master' 
Fixed not being able to filter by any or no labels

Brings back the options to filter by any or no label

Closes #15008 

![Screen_Shot_2016-04-07_at_11.26.41](/uploads/20d949b19f537d830118532e1d44feb7/Screen_Shot_2016-04-07_at_11.26.41.png)

See merge request !3589
 2016-04-13 13:24:44 +00:00
Jacob Vosmaer fa864716a8 Use new "clear all" button in tests 2016-04-13 12:13:53 +02:00
Jacob Schatz 2c9894d457 Merge branch 'project-title-dropdown' into 'master' 
Project dropdown in header uses new dropdown



See merge request !3339
 2016-04-12 17:50:27 +00:00
Jacob Schatz e1838980c6 Merge branch 'fix_quick_submit_missing_in_edit_merge_request' into 'master' 
Fix quick submit missing in edit merge request page

closes #14953 

![fix](/uploads/5b80b37330929514c81299b4c8fe3efb/fix.gif)

See merge request !3601
 2016-04-12 17:15:52 +00:00
Phil HughesandJacob Schatz f870857ddd Updated tests 2016-04-12 13:10:43 -04:00
Jacob Vosmaer 7b1bb0f4db Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsck 2016-04-12 17:44:02 +02:00
Phil Hughes a6ba94dbd1 Filtering by any label keeps the text on the toggle button 2016-04-12 09:32:12 +01:00
Jacob Schatz 4087bd16e8 Merge branch 'dashboard-filter-milestone' into 'master' 
Fixed issue with dashboard/issues not filtering by milestone

Closes #15128

See merge request !3650
 2016-04-11 13:56:29 +00:00
Jacob Schatz 69a8bf367c Merge branch 'mr-ui-update' into 'master' 
Updated UI for new merge request

Closes #2540 

![Screen_Shot_2016-03-29_at_12.53.18](/uploads/426e603675171f0dc4e0af83c7762eba/Screen_Shot_2016-03-29_at_12.53.18.png)

![Screen_Shot_2016-03-29_at_12.53.13](/uploads/645ad7955acfb9f7693245fcc048ee49/Screen_Shot_2016-03-29_at_12.53.13.png)

See merge request !3228
 2016-04-11 11:25:40 +00:00
Phil Hughes 2f4dc45da2 Fixed issue with dashboard/issues not filtering by milestone 
Closes #15128
 2016-04-11 11:38:24 +01:00
Arinde Eniola 91905ae3f5 write test to prevent reoccurence of issue 2016-04-09 23:31:45 +01:00
Arinde Eniola 400a1ae04d add some changes to the test 2016-04-07 23:44:59 +01:00
Annabel Dunstone dab4ac54b6 Diff design updates 2016-04-07 15:33:18 -07:00
Annabel Dunstone de63de18d7 Update diff colors and icons 2016-04-07 15:33:18 -07:00
Arinde Eniola 451314df96 add test 2016-04-07 20:51:16 +01:00
Phil Hughes 122b4148f7 Added label filter tests 2016-04-07 11:24:12 +01:00
Rémy Coutable 8eae7b1088 Merge branch 'feature/expose-builds-badge' into 'master' 
Expose badges

This MR exposes badge somewhere in visible place.

![expose_badges](/uploads/d2e290d3013d1ef2b1bdeebbbe2c5d8b/expose_badges.png)

Closes #13801

See merge request !3326
 2016-04-07 08:40:15 +00:00
Robert Speicher 730625f022 Merge branch 'patch/fix-markdown-preview-wikis' into 'master' 
Wiki preview URL converting problem [via Markdown]

Current implementation when rendering the preview, thinks relative links are for project repository files.

We are creating a new preview route that will define correct context data to render for wikis instead.

Fixes #2380, #1184

See merge request !3461
 2016-04-07 00:17:21 +00:00
Grzegorz Bizon 7640b050c0 Add feature specs for list of badges page 2016-04-06 19:56:34 +02:00
Jacob Schatz 77e178b5e1 Merge branch 'fix_missing_filters_on_status_tab_change' into 'master' 
Fix missing filters on status tab when user swithches to another state

closes #14769 

![fixi](/uploads/7733ec714b70b2157104af4b039953c3/fixi.gif)

See merge request !3482
 2016-04-06 17:21:25 +00:00
Phil Hughes 39ecce05c7 Build fix 2016-04-06 16:25:38 +01:00