home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-10 05:06:46 +10:00
Code Issues Packages Projects Releases Wiki Activity
27,429 Commits 48 Branches 340 Tags
fdc8b05ab181b809fd7d0fb3b8e8d73fac534fd0
Commit Graph
1721 Commits
Author SHA1 Message Date
Phil Hughes 83adcf19b7 Escapes label title in filters 
Fixes #15522
 2016-04-22 14:32:14 +01:00
Robert Speicher aea9799197 Merge branch 'label-text-color-sidebar' into 'master' 
Fixes text color on labels in sidebar

Previously the labels in the sidebar would just have `#FFF` text color which could cause problems with a light background color.

With this, the text color comes from the JSON.

See merge request !3846
 2016-04-21 23:13:38 +00:00
Phil Hughes 97baf41adc Reverted link changes 2016-04-21 18:46:12 +01:00
Rémy Coutable 0ae039d0a1 Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce 2016-04-21 19:36:43 +02:00
Rémy Coutable d620d5e160 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2016-04-21 19:34:45 +02: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
Jacob Schatz 305b8159de Merge branch 'diff-link-fix' into 'master' 
Diff highlight fixes

This fixes a couple of issues with linking/highlight diff lines:

- Fixed issue with lines not being selectable when expanding diff
- Fixed issue with incorrect line being highlighted if line is in discussion view

See merge request !3725
 2016-04-21 16:44:53 +00:00
Phil Hughes 639ba1b09b Removed console.log 2016-04-21 17:22:16 +01:00
Jacob Schatz a216ea5a34 Merge branch 'issue_15434' into 'master' 
Fixes XSS injection

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

**Without the fix**

![xss1](/uploads/0a7b0b15fb87066965a7c73f1dbaa815/xss1.gif)


**With the fix**

![xss2](/uploads/473cfa0aa80656f24c58aebf1fd97fff/xss2.gif)


See merge request !1952
 2016-04-21 16:22:15 +00:00
Jacob Schatz b3f4e8b218 Revert "Merge branch 'sentry-js' into 'master' " 
This reverts commit 0f309794e7, reversing
changes made to 1e596fef1c.
 2016-04-21 07:27:27 -04:00
Phil Hughes 7f23e0b8c0 Fixes text color on labels in sidebar 2016-04-21 08:50:15 +01:00
Alfredo Sumaran e38958d1d5 Remove unused param 2016-04-21 00:20:13 +00: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
Robert Speicher 91c00faee8 Merge branch 'due-date-frontend' into 'master' 
Add due date to issues

Closes: #12709

See merge request !3614
 2016-04-20 20:43:25 +00:00
Robert Speicher 0f309794e7 Merge branch 'sentry-js' into 'master' 
Add Sentry logging for JavaScript errors

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

See merge request !3795
 2016-04-20 19:52:27 +00:00
Phil HughesandRobert Speicher 461608e14c replace hyphens to commas when converting date 2016-04-20 15:43:32 -04:00
Phil HughesandRobert Speicher 4eeef19824 Fixed date issue with timezones 2016-04-20 15:43:32 -04:00
Phil HughesandRobert Speicher 49628664ee Removed buttons instead clicking date sets it 
Fixed issue with dropdown not being toggleable again
 2016-04-20 15:43:32 -04:00
Phil HughesandRobert Speicher e219867cd0 Updates sidebar value 2016-04-20 15:42:09 -04:00
Phil HughesandRobert Speicher f56c626315 Fixed issue with bootstrap dropdown closing the calendar 2016-04-20 15:42:09 -04:00
Phil HughesandRobert Speicher 7617ae2565 Fixed issue with selectbox not hiding 2016-04-20 15:42:09 -04:00
Phil HughesandRobert Speicher aa22106b30 Posts the due date through AJAX 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
Phil Hughes ab93ea04aa Correctly checks for undefined in coffeescript 🙈 2016-04-20 17:52:55 +01: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
Phil Hughes 28faa9719d Fixed issue when scrolling to element and there is an expander 2016-04-20 17:25:16 +01:00
Phil Hughes 7bcacafc8a Fixed issue with incorrect line being highlighted if line is in discussion view 2016-04-20 17:25:16 +01:00
Phil Hughes 439a72803b Any label & no label out weigh other labels - these two will clear previously selected labels 
Fixed issue with no label not working correctly
 2016-04-20 17:23:10 +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
Phil Hughes 75626d5f01 Label text color comes from JSON 
Created issuable singleton to house the filtering
 2016-04-20 17:00:12 +01:00
Arinde Eniola a845252983 get the multi filter labels feature to work on merge request, also escape characters in the templates to prevent xss attack 2016-04-20 13:55:19 +01:00
Phil Hughes 1a7ccd0f0a Removed animation from labels filter 2016-04-20 11:47:35 +01: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
Arinde Eniola 3e7a8b0789 place the sentry config into a new file, and some changes 2016-04-19 22:04:52 +01:00
Robert Speicher 8de18d417d Remove XSS vulnerability in Label and Milestone dropdowns 2016-04-19 13:41:08 -04:00
Arinde Eniola 5cefd8ab76 some refactoring 2016-04-19 17:22:55 +01: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
Arinde Eniola 5661f47d38 some changes and add item to changelog 2016-04-19 11:48:37 +01:00
Phil Hughes d1b2e7b440 Trigger filtering after ajax is complete in dropdown 
Closes #15186
 2016-04-19 10:26:07 +01:00
Alfredo Sumaran 3602aa7d68 Use Turbolinks to redirect 2016-04-18 16:28:30 -05:00
Alfredo Sumaran 5c7181b514 Add is-link attribute to know if a menu item should not be stopped 2016-04-18 14:37:18 -05:00
Jacob Schatz 09d2da2091 Merge branch 'dropdown-filter-select' into 'master' 
Fixed issue with multi select not working with arrow keys



See merge request !3792
 2016-04-18 19:14:40 +00:00
Jacob Schatz 4c59557f94 Merge branch '645-profile-update-bug' into 'master' 
Add null check to formData.append

Fixes https://gitlab.com/gitlab-com/support-forum/issues/645

See merge request !3799
 2016-04-18 19:08:42 +00:00
Jacob Schatz f18c613383 Merge branch 'dropzone-class-remove' into 'master' 
Removes dropzone focus class after dropping file



See merge request !3756
 2016-04-18 18:37:00 +00:00
Jacob Schatz e4f1d1367b Merge branch 'commit-timeago-fix' into 'master' 
Fixed issue with commit time not using timeago



See merge request !3723
 2016-04-18 18:05:53 +00:00
Annabel Dunstone beb32f31fb Add null check to formData.append 2016-04-18 13:04:36 -05:00
Arinde Eniola 3e62dc3be5 add some configs 2016-04-18 18:56:38 +01:00
Alfredo Sumaran 9a99fccb97 Remove $parent 2016-04-18 12:49:23 -05:00
Jacob Schatz 001fe515cf Make unminified Raven available. 
Use the correct sentry dsn.
 2016-04-18 12:37:50 -04:00