home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-23 19:46:12 +10:00
Code Issues Packages Projects Releases Wiki Activity
25,787 Commits 48 Branches 340 Tags
8c1e3c77cd4da2fff126e46bc40b70fef798ac79
Commit Graph
1428 Commits
Author SHA1 Message Date
Jacob Schatz 8c1e3c77cd Add multi select stay open functionality 2016-03-25 08:10:25 -04:00
Jacob Schatz 22aef62808 New dropdowns work on merge requests too! 2016-03-25 08:07:57 -04:00
Jacob Schatz e8d8411016 Adds new dropdown ajax to user selection 2016-03-25 08:07:57 -04:00
Jacob Schatz 74c7a537ed Adding dropdown for users 2016-03-25 08:07:57 -04:00
Jacob Schatz 9da87709c4 Remove api calls from api.js.coffee. 
Using respond to instead
 2016-03-25 08:07:57 -04:00
Jacob Schatz d17b549935 Make remove multi and remove single work. 
Make add single and add multi work properly.
Multiple inputs for multiselect
 2016-03-25 08:07:57 -04:00
Jacob Schatz c81b261374 Fix bugs with select dropdown and multiselection 2016-03-25 08:07:57 -04:00
Jacob Schatz ed517c5ab7 Removes bugs with selection. 
Adds deselect still a WIP.
 2016-03-25 08:07:57 -04:00
Jacob Schatz fdb703d790 Fix up commit message 2016-03-25 08:07:57 -04:00
Jacob Schatz 3753ace9ba Add labels as proper POST arrays using new dropdown 2016-03-25 08:07:57 -04:00
Jacob Schatz 024dc8073e Add milestone sidebar update via JSON 2016-03-25 08:04:57 -04:00
Jacob Schatz aa4da38435 Make label search work with JSON data 2016-03-25 08:04:57 -04:00
Jacob Schatz a76ee508fb Ajax call to milestones via new dropdowns 2016-03-25 08:04:57 -04:00
Jacob Schatz ff86138d76 Sidebar milestone updatable via JSON 2016-03-25 08:04:57 -04:00
Jacob Schatz 1c8fff965c Adds milestone API JS call 2016-03-25 08:04:09 -04:00
Jacob Schatz 16ba5eb4d8 Updates sidebar milestone to use new dropdowns 2016-03-25 08:03:16 -04: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
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
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
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
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
Jacob Schatz d3e9134601 Merge branch 'rs-auto-expand-sidebar' into 'master' 
Expand the issuable sidebar when coming back from the Changes tab

Unless the user explicitly requested the collapsed sidebar.

Fixes: #14353

See merge request !3256
 2016-03-20 15:10:16 +00:00
Jacob Schatz 1e420ccf59 Merge branch 'dropdown-persits-filtered-data' into 'master' 
Fixed issue with filtered data persisting when dropdown closed

![labels](/uploads/4b9c902add76263d8488cc34ef49f142/labels.gif)

Closes #14401

See merge request !3302
 2016-03-20 14:55:58 +00:00
Stan Hu 91f9866cce Fix specs and remove unnecessary console.log 2016-03-20 05:53:43 -07:00
Grzegorz Bizon 797af06491 Merge branch 'master' into feature/issue-move 
* master:
  Fix bug where wrong commit ID was being used in a merge request diff to show old image
  Remove CHANGELOG item that was added during merge resolution
  Improve the "easy WIP & un-WIP from link" feature
  Fix specs
  \#to_branch_name now uses the iid as postfix
  Add label description in tooltip to labels in issue index and sidebar
  Easily (un)mark merge request as WIP using link
  Use specialized system notes when MR is (un)marked as WIP
  another attempt to fix oauth issue
  attempting to fix omniauth problem

Conflicts:
	app/assets/javascripts/issuable_form.js.coffee
 2016-03-20 11:01:08 +01:00