home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-25 04:26:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
25,795 Commits 48 Branches 340 Tags
720ef51bd97f478dba2d2c1b59df958dabd7500a
Commit Graph
3885 Commits
Author SHA1 Message Date
Grant Douglas 26aa2a6e67 short project names result in unusable fuzz search UI elements, so added a min-width property to the css 
Added a space between property colon and value to satisfy linter and pass build.
 2016-03-25 21:21:44 +00:00
Jacob Schatz d903465c25 Using class for specificity instead of tag. 2016-03-25 13:16:10 -04:00
Dmitriy Zaporozhets 80c3cbfb1d Make sure ci status colors are same and respected on most pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-25 15:55:08 +01:00
Dmitriy Zaporozhets 02b585e924 Repository breadcrumbs and file header links should be dark 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-25 15:48:00 +01:00
Dmitriy Zaporozhets 1853d71543 Fix link colors by using content-list for commits 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-25 15:40:51 +01:00
Dmitriy Zaporozhets b5c9637c92 Make sure CI status icons have same color across all app 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-25 15:31:19 +01:00
Phil Hughes 91d5876ea2 Fixed issue with width of project select dropdown 2016-03-24 13:43:35 +00:00
Rémy Coutable 2824972c36 Fix specs broken by !3270 and !3337. 2016-03-24 10:10:46 +01: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 07a1da7e40 Removed hover background that wasn't needed 2016-03-23 17:21:02 +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
Phil Hughes e94482d149 Issue sidebar overlaps on tablet 2016-03-23 17:15:14 +00:00
Alfredo Sumaran 128c109a34 Move cropper.css to vendor folder 2016-03-23 11:56:14 -05: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
connorshea edac38c439 Fixes last remaining lints and enables scss-lint test for GitLab CI. 
With this, builds will now fail if they break the SCSS style guide (at
least, the parts enabled by the linter).

Discussed in #14299.
 2016-03-22 15:01:31 -06: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 5a349efcab Merge branch 'header-mobile-overflow' into 'master' 
Fixes issue with signin button overflowing on mobile

Closes #14477

![Screen_Shot_2016-03-22_at_13.52.51](/uploads/7c9b2c38be7d497c690a7d17ae0ca76d/Screen_Shot_2016-03-22_at_13.52.51.png)

![Screen_Shot_2016-03-22_at_13.52.43](/uploads/8b2432aeb4afec455286fced11c5490c/Screen_Shot_2016-03-22_at_13.52.43.png)

See merge request !3342
 2016-03-22 20:33:07 +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
Jacob Schatz fb1a7553c7 Merge branch 'issue_13885' into 'master' 
Display nav controls on mobile

Set inputs inside .nav-controls to full-width on viewports below 600px

Fixes #13885

**Affected pages**


/dashboard/groups

/admin/builds

/dashboard/projects

/dashboard/issues

/dashboard/merge_requests

/dashboard/milestones

/dashboard/todos

/explore

/groups/{group-name}/issues

/groups/{group-name}

/groups/{group-name}/milestones

/{group-name}/{project-name}/builds

/{group-name}/{project-name}/forks

/{group-name}/{project-name}/issues

/{group-name}/{project-name}/labels

/{group-name}/{project-name}/merge_requests

/{group-name}/{project-name}/milestones

/{group-name}/{project-name}/wikis/home

/{group-name}/{project-name}/wikis/pages


Some Screenshots

**Groups**

![Screen_Shot_2016-03-15_at_2.22.23_PM](/uploads/b55348676693cc3ff67cddc4528f7f6c/Screen_Shot_2016-03-15_at_2.22.23_PM.png)


**Admin > Builds**

![admin-builds](/uploads/2e84119660f4895a1530883412c4b728/admin-builds.png)


**TODOs**

![todos](/uploads/84344c43011e22f902701038932d3eaa/todos.png)

**Dashboard > Projects**

![dashboards-projects](/uploads/f508d9107598038798aa10485d3d5cfe/dashboards-projects.png)


**Project Issues**

![issues](/uploads/d6c69a8f81ee07da95b2a3b99b81cf51/issues.png)


**Project Merge Requests**

![merge_requests](/uploads/b3c1a537f28931bd38077c36627a0d7a/merge_requests.png)


See merge request !3214
 2016-03-22 19:49:46 +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
Phil Hughes b4f97b93a9 Fixes issue with signin button overflowing on mobile 
Closes #14477
 2016-03-22 13:56:07 +00:00
Douwe Maan ae7b2ef62c Merge branch 'master' into issue_12658 
# Conflicts:
#	app/models/issue.rb
#	app/views/projects/_home_panel.html.haml
#	app/views/shared/projects/_project.html.haml
#	db/schema.rb
#	spec/models/project_spec.rb
 2016-03-21 23:22:21 +01: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 be039601be Merge branch 'css-indentation' into 'master' 
Fix Indentation lints in CSS.

As discussed in #14299.

cc: @jschatz1 

See merge request !3312
 2016-03-21 20:11:00 +00:00
Jacob Schatz e210438eac Merge branch 'css-shorthand' into 'master' 
Follow the CSS Style Guide rules for using shorthand where possible.

Fixes violations of the Shorthand rule. All of these were done manually and I reviewed each change to verify, so they should all be right.

Discussed in #14299.

cc: @jschatz1 

See merge request !3313
 2016-03-21 19:32:23 +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
Rémy Coutable 17de30f412 Merge branch 'backport-ee-premailer' into 'master' 
Backport premailer and diff changes from EE

Backport part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151

See merge request !3318
 2016-03-21 10:46:37 +00:00
Arinde Eniola 367818d293 change the css class has_tooltip to has-tooltip universally 2016-03-20 21:37:22 +01:00
Douwe Maan 8db1292139 Tweaks, refactoring, and specs 2016-03-20 21:04:07 +01:00
Jacob Schatz d19abe6f65 Merge branch 'css-zero-unit-again' into 'master' 
Fix a few remaining uses of `0px`.

See #14299 for more information.

cc: @jschatz1 

See merge request !3310
 2016-03-20 19:33:04 +00: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