home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 09:36:47 +10:00
Code Issues Packages Projects Releases Wiki Activity
27,265 Commits 48 Branches 340 Tags
dbe06ac790befe2d49dbb6edecb79d82abfe46e7
Commit Graph
14140 Commits
Author SHA1 Message Date
Arinde EniolaandJacob Schatz 826857f47b disable spellcheck and autocorrect for username field in admin page 2016-04-20 19:27:17 -04: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
Jacob Schatz 07c5df51eb Merge branch 'revert-diff-scroll' into 'master' 
Wrap all code in diffs

Closes #15382  
Closes #15422  
All diff code wraps to next line instead of scrolling

<img src="/uploads/ec5754919bac0b027fcb122bb88435b3/Screen_Shot_2016-04-20_at_12.22.27_PM.png" width="500px">

See merge request !3838
 2016-04-20 21:12:38 +00: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
Rémy CoutableandRobert Speicher 3a7290f387 Move Issue scopes from Issuable to Issue model 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-20 15:43:32 -04:00
Rémy CoutableandRobert Speicher e54a2ba6aa Remove duplicate hidden_field and fix Rubocop 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-20 15:43:32 -04:00
Rémy CoutableandRobert Speicher 159f959b61 Move due_date sort scopes to Issue and fix CHANGELOG 
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
Phil HughesandRobert Speicher 5c8959bbc1 Added variables 2016-04-20 15:43:32 -04: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 989bcfcc7a Mobile value color for due date 2016-04-20 15:42:09 -04:00
Phil HughesandRobert Speicher e219867cd0 Updates sidebar value 2016-04-20 15:42:09 -04:00
Phil HughesandRobert Speicher 720da4196c Updated based on designs 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
Phil HughesandRobert Speicher 05523b5bd1 Removed due date filter 2016-04-20 15:42:09 -04:00
Mehmet BeydoganandRobert Speicher c6be4ec544 Add red color to overdue and open issues 2016-04-20 15:42:09 -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 83bda94ffc Update due date asc scope for mysql 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 1e596fef1c Merge branch 'right-sidebar-z-index' into 'master' 
Increased z-index of right sidebar

Fixes issue with active button overlapping it

Closes #15243

See merge request !3722
 2016-04-20 19:22:03 +00:00
Jacob Schatz b4ed6efd50 Merge branch '15213-dialog-input' into 'master' 
Add margin to top of form actions

Closes #15213

Also fixes other modal inputs (like add new directory, etc)  

![Screen_Shot_2016-04-20_at_1.47.14_PM](/uploads/14b474da2f86dcc3c1afd9e8ea09e812/Screen_Shot_2016-04-20_at_1.47.14_PM.png)

See merge request !3841
 2016-04-20 19:21:11 +00: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
Jacob Schatz 9a60887199 Merge branch 'remove-duplicate-ids' into 'master' 
Removed duplicate ID's from the HTML



See merge request !3818
 2016-04-20 19:11:38 +00:00
Annabel Dunstone ef0c87f67f Add margin to top of form actions 2016-04-20 13:42:27 -05:00
Phil Hughes 490f77318b Fixed tests because of nil array 2016-04-20 19:32:13 +01:00
Jacob Schatz 56495fd12a Merge branch 'fix_infinite_scroll_breaks_on_back_button_activity_feed' into 'master' 
fix bug causing the infinite scrolling in activity feeds to break when you click a link and navigate back

![arrg_](/uploads/53b2a01d3b55938cc12c805e1a81ff6b/arrg_.gif)

See merge request !3835
 2016-04-20 18:25:27 +00:00
Jacob Schatz ae6b44cf31 Merge branch '15104-mobile-comment-bug' into 'master' 
Discussion note icon shows up when you click on diff on touch screen

Fixes #15104 

* Fix bug that stopped discussion note button from showing up on iOS
* Shifted button a few `px` to fix slight cutoff
<div>
<img src="/uploads/9d507091f33aa69ef68323386bf3a5c2/Screen_Shot_2016-04-15_at_12.08.46_PM.png" width="300px">
<img src="/uploads/a964a2a46636cbe4593abf272b5796f7/Screen_Shot_2016-04-15_at_12.11.40_PM.png" width="300px">
</div>

See merge request !3755
 2016-04-20 18:22:21 +00:00
Phil Hughes ab93ea04aa Correctly checks for undefined in coffeescript 🙈 2016-04-20 17:52:55 +01:00
Annabel Dunstone 25f592cf9c Wrap all code in diffs 2016-04-20 11:48:24 -05:00
Arinde Eniola 493784da43 fix bug causing the infinite scrolling in activity feeds to break when you click a link and navigate back 2016-04-20 17:47:07 +01:00
Dmitriy Zaporozhets 832cdd3d51 Merge branch 'backport_changes_from_ee' into 'master' 
Backport select_helper from EE



See merge request !3825
 2016-04-20 16:38:11 +00: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
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
Phil Hughes 75626d5f01 Label text color comes from JSON 
Created issuable singleton to house the filtering
 2016-04-20 17:00:12 +01: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
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
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
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
Valery Sizov 1965ff3eb2 Backport select_helper from EE 2016-04-20 15:07:06 +03:00