home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-29 06:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
27,551 Commits 48 Branches 340 Tags
5d5df26ab1b65b094eaa2ca2ca6db49b6d8530ea
Commit Graph
546 Commits
Author SHA1 Message Date
Alfredo Sumaran 5d5df26ab1 Add documentation for "Hide whitespace changes" button 2016-04-26 14:01:40 -05:00
Alfredo Sumaran a1a9a1cf8d Specs for toggle Whitespaces Changes 2016-04-26 14:01:40 -05:00
Jacob Schatz d809507e05 Merge branch 'issue_14904' into 'master' 
Add new shortcuts

Closes #14904

- On a project: `i` To navigate to New Issue page.
- On a issuable: `l` To open Label dropdown on a issuable.
- Global: Typing `?` multiple times now toggles the modal.

See merge request !3686
 2016-04-25 19:13:25 +00:00
Grzegorz Bizon ef032bb9f1 Fix error on commit builds page when no builds yet 
Closes #15509
 2016-04-25 17:19:57 +02:00
Robert Speicher d83d43c553 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-22 17:51:08 +00:00
Robert Speicher 84d3649d57 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-22 17:38:10 +00:00
Robert Speicher bdd844f312 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.
 2016-04-22 13:08:11 -04:00
Robert Speicher 10aaea1c91 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-22 15:33:23 +00:00
Rémy Coutable c56ae831db Merge branch 'issue_3799' into 'master' 
Add tests for filtering owned projects

REF: #3799

See merge request !3873
 2016-04-22 15:11:14 +00:00
Rémy Coutable 951e3459e1 Use the can? helper instead of current_user.can? 
Fixes #15513.

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-22 15:48:58 +02:00
Alfredo Sumaran 21a1e15677 Merge remote-tracking branch 'origin/master' into issue_3799 2016-04-22 08:37:15 -05:00
Phil Hughes 32be8bd2b1 Fixed issue with assignee object not being returned 
Closes #15515
 2016-04-22 13:30:58 +01:00
Grzegorz Bizon b711fc0abd Move cherry-pick feature specs to proper directory 2016-04-22 13:34:03 +02:00
Alfredo Sumaran e0c07b5e3d Add tests for filtering owned projects 2016-04-22 06:19:43 -05:00
Rémy Coutable d5398e9656 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 08:40:01 +00:00
Phil HughesandRobert Speicher 50ed43e490 Improved confirmation UX 
Closes #4228
 2016-04-21 20:20:09 -04:00
Yorick Peterse a4510729a6 Merge branch '15465-fix-sort-by-due-date' into 'master' 
Remove the `.distinct` when finding issues

See merge request !3858
 2016-04-21 22:26:53 +00:00
Alfredo Sumaran c9fe9f59d2 Merge remote-tracking branch 'origin/master' into issue_3799 2016-04-21 16:03:33 -05:00
Robert Speicher 1ea2408ba3 Merge branch 'dev_issue_15331' into 'master' 
Fixes window.opener bug

Adds `noreferrer` value to rel attribute for external links

REF: https://gitlab.com/gitlab-org/gitlab-ce/issues/15331

See merge request !1953
 2016-04-21 20:49:41 +00:00
Alfredo Sumaran 72debd840c Fix failing spec 2016-04-21 14:38:44 -05:00
Alfredo Sumaran 6e9ce9a6cd Add Rspec test for "i" shortcut 2016-04-21 14:24:36 -05:00
Jacob Schatz 6a27a80867 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 17:32:24 +00:00
Rémy Coutable 5e37d02d0e Remove the .distinct when finding issues 
This is not needed anymore after !3815.

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-21 18:49:08 +02:00
Douwe Maan 7ded28ff99 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 13:13:10 +00:00
James Lopez b09b175def refactored specs based on feedback 2016-04-21 13:20:00 +02:00
Rémy Coutable 338f6f0902 Merge branch 'issue_5838' into 'master' 
Show project members only for members

fixes #5838 

See merge request !3752
 2016-04-21 10:31:20 +00:00
James Lopez 2d2b73ae49 use wait_for_ajax instead of sleeping for 2 days! 2016-04-21 10:30:48 +02:00
James Lopez 6865bc16f8 refactored specs, adding more scenarios 2016-04-21 09:12:03 +02:00
Jacob Schatz 7dc16fe6ba Merge branch 'issue_14678' into 'master' 
Refresh page according remaining todos

Fixes #14678 

See merge request !3428
 2016-04-20 22:26:21 +00:00
Alfredo Sumaran 7e0ef892f4 Merge remote-tracking branch 'origin/master' into label-dropdown-fix 2016-04-20 17:10:10 -05:00
Rémy CoutableandRobert Speicher da2e31549c Forgot a Rubocop offense, doh! 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-20 15:43:32 -04:00
Rémy CoutableandRobert Speicher 6cdf4acd4e Address MR feedback 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-20 15:43:32 -04:00
Mehmet BeydoganandRobert Speicher 61a306aa58 Fix functionality of due this week. Add due this month and overdue, remove due tomorrow to issues. 
Fix typos on sorting dropdown related to due date
Remove constant array and add Structs on Issue to keep due date data to fill options
 2016-04-20 15:42:09 -04:00
Mehmet BeydoganandRobert Speicher 3afd08170d Add due_date:time field to Issue model 
Add due_date text field to sidebar issue#show
Add ability sorting issues by due date ASC and DESC
Add ability to filtering issues by No Due Date, Any Due Date, Due to tomorrow, Due in this week options
Add handling issue due_date field for MergeRequest
Update CHANGELOG
Fix ambigous match for issues#show sidebar
Fix SCREAMING_SNAKE_CASE offenses for due date contants
Add specs for due date sorting and filtering on issues
 2016-04-20 15:42:09 -04:00
Jacob Schatz 692c35e6f4 Merge branch 'multi-filter-labels' into 'master' 
Mutliple label filter

Fixes #989 

See merge request !3438
 2016-04-20 19:18:32 +00:00
Alfredo Sumaran 7b6fe0e259 Merge remote-tracking branch 'origin/master' into label-dropdown-fix 
# Conflicts:
#	app/views/shared/issuable/_sidebar.html.haml
 2016-04-20 11:40:55 -05:00
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
Alfredo Sumaran c0ce498615 Add tests 2016-04-18 19:54:53 -05:00
Alfredo Sumaran 50c9c6a875 Grammar fix 2016-04-18 16:28:15 -05:00
Felipe Artur 0b91ff287d Projects members tab should follow visibility levels 2016-04-18 17:53:34 -03: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