home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 14:46:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
25,810 Commits 48 Branches 340 Tags
8b68142a790cd1ca2fae351b07b98bcf461fe7c8
Commit Graph
1449 Commits
Author SHA1 Message Date
Alfredo Sumaran 8b68142a79 Prevent creating autocomplete dropdown is user is not logged in 2016-03-24 13:31:19 -05:00
Alfredo Sumaran 91cb078648 Increase time because of Safari 2016-03-24 12:55:32 -05:00
Alfredo Sumaran 187f1c41aa Add param to skip enterCallback 2016-03-23 22:07:07 -05:00
Alfredo Sumaran d7350dea6a Make sure we are looking inside dropdpown wrapper 2016-03-23 19:45:00 -05:00
Alfredo Sumaran 98e2273030 Fix input reference 2016-03-23 19:44:24 -05:00
Alfredo Sumaran 8f2587c2ee Pass proper input element 2016-03-23 19:43:57 -05:00
Alfredo Sumaran 0dff7b4444 Merge branch 'master' into issue_3400_port 
# Conflicts:
#	app/assets/javascripts/gl_dropdown.js.coffee
 2016-03-23 18:49:49 -05:00
Alfredo Sumaran 62b260cce2 Change key name to match input Id 
Fixes input not being restored with its original value
 2016-03-23 17:58:18 -05:00
Alfredo Sumaran 8c1d50e69c Fixes removing the location badge with backspace on the last character 2016-03-23 17:30:11 -05:00
Jacob Schatz 4a4a79aa9e Merge branch 'dropdown-alignment-fixes' into 'master' 
Dropdown pixel perfect 🎉

Closes #14333, #14331, #14472, #14515 

See merge request !3337
 2016-03-23 22:13:31 +00:00
Alfredo Sumaran abe56ad6f5 Prevents unwanted menu toggling 2016-03-23 16:36:44 -05:00
Alfredo Sumaran 30eeb453bd Remove unused instance variable 2016-03-23 16:13:46 -05:00
Jacob Schatz 4798b927ab Merge branch 'issue_7959' into 'master' 
Crop avatars on the client before upload

<img src="/uploads/535d69956cc5904870ae5d95132a35af/Screen_Shot_2016-03-17_at_9.55.56_AM.png" width="700">

closes #7959
closes #600 

See merge request !3270
 2016-03-23 20:29:30 +00:00
Alfredo Sumaran c37735841b Restore menu content when emptying the search input 2016-03-23 14:24:46 -05:00
Alfredo Sumaran 44817726fe Fixes empty menu when typing on search input for the very first time 2016-03-23 14:12:33 -05:00
Phil Hughes 2d7183bbe8 Fixed failing tests 
Moved the scss out of a mixin as it was really confusing the hell out of the CSS
 2016-03-23 17:15:14 +00:00
Alfredo Sumaran 3bab5976c0 Move cropper.js to vendor folder 2016-03-23 11:54:04 -05:00
Phil Hughes 0141d3654f Disable new label form in dropdown until fields are complete 2016-03-23 13:29:41 +00:00
Phil Hughes fee01133ea Changed colour of no matching results bg 
Highlights first row when filtering
 2016-03-23 10:40:07 +00:00
Phil Hughes 4c5babd94b Removed bold on any/unassigned authors 2016-03-23 10:40:07 +00:00
Phil Hughes aec0e22669 Adjusted alignment for the new label form 2016-03-23 10:40:07 +00:00
Phil Hughes 6d40eee5ea Added label color box in dropdown 2016-03-23 10:37:33 +00:00
Phil Hughes 8d147219cd Added clear button to dropdown filter 2016-03-23 10:37:33 +00:00
Jacob Schatz 62ffdbeb2d Merge branch 'merge-request-sidebar' into 'master' 
Fixed bug where participants would not work correctly on merge requests

Also fixed alignment bug with can't merge badge

Closes #14478, #14494

See merge request !3329
 2016-03-22 20:37:31 +00:00
Jacob Schatz 16f05230a6 Merge branch 'auto-collapse-nav' into 'master' 
Auto collapses the navigation when resizing

Closes #14475 

![auto-collapse](/uploads/332c6261acb6bc30d7d30cbdfafe92eb/auto-collapse.gif)

See merge request !3343
 2016-03-22 20:31:15 +00:00
Alfredo Sumaran 444e92f400 Clear original input after crop 
This fixes the case when the user selects the same image consecutively. It failed because no 'change' event was fired.
 2016-03-22 13:43:32 -05:00
Alfredo Sumaran d5479eb062 Remove unnecessary line 2016-03-22 12:55:42 -05:00
Alfredo Sumaran 10ffbb8559 Add comment explaining why we enable form submit button 2016-03-22 12:54:51 -05:00
Alfredo Sumaran 3ade8de55a Explain regular expression 2016-03-22 12:37:54 -05:00
Alfredo Sumaran f2ad7aabf9 Use _this instead of self 2016-03-22 11:45:37 -05:00
Alfredo Sumaran 0a14de843c Rename method for better understanding 2016-03-22 11:45:23 -05:00
Alfredo Sumaran a42b2c388d Merge branch 'master' into issue_7959 2016-03-22 11:13:27 -05:00
Phil Hughes 07da865113 Shows error messages when trying to create label in dropdown menu 
Closes #14495
 2016-03-22 14:56:00 +00:00
Phil Hughes 21f5524926 Auto collapses the navigation when resizing 
Closes #14475
 2016-03-22 14:08:27 +00:00
Alfredo Sumaran 521c0f5f08 Reduce the use of loops 2016-03-21 23:01:19 -05:00
Alfredo Sumaran a477d604f6 Add ability to clear location badge 2016-03-21 16:00:53 -05:00
Jacob Schatz 0305dd98b3 Merge branch 'change_css_class_has_tooltip_to_has-tooltip' into 'master' 
change the css class has_tooltip to has-tooltip universally

closes #14432 

See merge request !3321
 2016-03-21 20:40:14 +00:00
Alfredo Sumaran eff98ffe05 TAB is not used 2016-03-21 14:23:29 -05:00
Alfredo Sumaran 3a8c4ebb43 Loop through form inputs 2016-03-21 14:01:20 -05:00
Alfredo Sumaran 6e9ff2e574 Delete .remove-badge from badge 2016-03-21 13:18:34 -05:00
Alfredo Sumaran 80174538a8 Use .empty() 2016-03-21 12:31:21 -05:00
Alfredo Sumaran fb0d20c553 Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into issue_3400_port 2016-03-21 12:09:52 -05:00
Jacob Schatz 2bcbc7c6db Merge branch 'remove-console-log' into 'master' 
Remove console.log call



See merge request !3322
 2016-03-21 16:36:00 +00:00
Kamil Trzciński 3fca30d27f Merge branch 'feature/issue-move' into 'master' 
Ability to move issue to another project

Tasks:

- [x] Create scaffold of service that will move issue to another project.
- [x] Close old issue, add system note about moving issue to a new project.
- [x] Create a new issue, add system note about issue being moved from old project.
- [x] Check if issue can be moved to another project before executing service
- [x] Check permissions when moving an issue (`:admin_issue` ability)
- [x] Display select box for a new project when editing an issue
- [x] Show only projects that issue can be moved into in that select box
- [x] Add project select handler, helper and some permission filters to it
- [x] Preserve as much information as possible, including author
- [x] Prepare mechanisms that unfolds local references in issue description
- [x] Rewrite issue description with references unfolding and add some specs for it
- [x] Rewrite all system notes and comments attached to issue that is being moved
- [x] Update `Label` so that is was able to create cross reference labels (separate MR)
- [x] Add notifications about moving issue to another project
- [x] Display confirmation alert/message when issue move has been requested
- [x] Make it possible to undo selecting project where issue will be moved to
- [x] Add column to issue, that will indicate if it has been moved to another project
- [x] Do not allow to move issue that has been already moved
- [x] Write top-to-bottom feature spec in RSpec instead of Spinach

UI:

![issue_move_ui](/uploads/b3c6b563362c1fded9082cc0f51e5a74/issue_move_ui.png)

![issue_move_tooltip](/uploads/2ab913b06f52df1cafde9abe89bd9cb8/issue_move_tooltip.png)

Closes #3024

See merge request !2831
 2016-03-21 14:01:19 +00:00
Dmitriy Zaporozhets 08a892b095 Merge branch 'fix-image-mode-view-diff' into 'master' 
Fix diff image view modes (2-up, swipe, onion skin) not working

Example test case: https://gitlab.com/mrtzcspr/test/commit/5d983226b1308d98ef3d8919b978ad49f34496b8

Closes #13856

See merge request !3316
 2016-03-21 13:38:30 +00:00
Phil Hughes 59e51e3cab Fixed bug where participants would not work correctly on merge requests 
Also fixed alignment bug with can't merge badge
 2016-03-21 11:31:50 +00:00
Arinde Eniola 367818d293 change the css class has_tooltip to has-tooltip universally 2016-03-20 21:37:22 +01:00
Stan Hu e79f4a79a4 Remove console.log call 2016-03-20 10:58:59 -07:00
Jacob Schatz 42fc4233e5 Merge branch 'fix-default-http-clone' into 'master' 
Make HTTP(s) label consistent on clone bar

Sites that use http:// for the external_url should always display HTTP on
the clone bar. Similarly, sites that use https:// should show HTTPS.

Currently, the inconsistency looks like:

![http-magic](/uploads/945fda580f7ba5aee36cc572b49baf2b/http-magic.gif)

Also restores the tooltips that vanished in 7ba4482fcf:

![image](/uploads/b5a7b3e68b4992a447fcaa51915e866c/image.png)


See merge request !3319
 2016-03-20 17:52:20 +00:00
Jacob Schatz a4422a3a2e Merge branch 'edit-form-alignment' into 'master' 
Fix spacing below edit note form

Also changed to allow the CSS to decide what should be hidden when editing

Thanks @JobV for having eagle eyes 😜 

See merge request !3306
 2016-03-20 15:54:49 +00:00