home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-18 00:56:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
27,212 Commits 48 Branches 340 Tags
320e0b7fa77d145e669af89640cf349dfdd9986c
Commit Graph
509 Commits
Author SHA1 Message Date
Dmitriy ZaporozhetsandYorick Peterse 44a18c64e3 Merge branch 'fix-issue-with-assignee-not-updating' into 'master' 
Fixed issue with assignee object not being returned

Closes #15515

See merge request !3877
 2016-04-25 21:54:55 +02:00
Robert SpeicherandYorick Peterse 0325d26d06 Merge branch 'rs-todos-feature-spec' into 'master' 
Refactor Todos feature spec to be faster and less brittle

We now only create two Todos instead of 21 when testing pagination, and
we've updated the test to be less brittle when dealing with slower CI
environments.

See merge request !3889
 2016-04-25 21:53:10 +02:00
Robert SpeicherandYorick Peterse 009e2ed1c7 Merge branch '15513-fix-undefined-can-method' into 'master' 
Use the `can?` helper instead of `current_user.can?`

Fixes #15513.

See merge request !3882
 2016-04-25 21:52:54 +02:00
Robert SpeicherandYorick Peterse 777a8b2af5 Merge branch 'fix/cherry-pick-specs-location' into 'master' 
Move cherry-pick feature specs to proper directory

Cherry pick feature specs were located in `spec/feature/project` directory while we have `spec/feature/projects`.

Later location is consistent with our namespaces (we have `Projects::` namespace, not `Project::`).

See merge request !3875
 2016-04-25 19:49:39 +00:00
Rémy CoutableandYorick Peterse 76c215cbd0 Merge branch 'issue_3799' into 'master' 
Allow filtering by Owned projects on dashboard page

Closes #3799 

![Screen_Shot_2016-04-15_at_9.40.52_PM](/uploads/440498c5647bda282304891307931a02/Screen_Shot_2016-04-15_at_9.40.52_PM.png)

See merge request !3762
 2016-04-22 10:59:09 +02:00
Robert SpeicherandYorick Peterse dd5a29e8da Merge branch 'confirmation-screen' into 'master' 
Improved email confirmation UX

Closes #4228

See merge request !3184
 2016-04-22 10:55:48 +02:00
Jacob SchatzandYorick Peterse c89d30ef48 Merge branch 'label-dropdown-fix' into 'master' 
Fixes "create label" functionality on label dropdown

**Issue sidebar**

![label_dropdown](/uploads/2a056136fc88626530fc275ded0c2aa3/label_dropdown.gif)

**Issues page**

![label_dropdown_issues](/uploads/965fd20f5b206499e9b11a64556c5240/label_dropdown_issues.gif)



See merge request !3670
 2016-04-21 22:30:41 +00:00
Yorick Peterse 583fec3d3d Merge branch '15465-fix-sort-by-due-date' into 'master' 
Remove the `.distinct` when finding issues

See merge request !3858
 2016-04-21 22:27:52 +00:00
Douwe MaanandYorick Peterse 059b6edaf8 Merge branch 'fix/label-filters' into 'master' 
Filter labels by including ALL filter titles

Fixed query to use `AND` and not `OR`. Refactored relevant specs

See merge request !3815
 2016-04-21 15:49:23 +00:00
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
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
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
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
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
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
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
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