home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 01:26:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
25,810 Commits 48 Branches 340 Tags
8b68142a790cd1ca2fae351b07b98bcf461fe7c8
Commit Graph
25810 Commits
This Branch
This Branch
All Branches
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 180da813f3 Fixes overlapping on Safari 2016-03-24 12:55:50 -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 31ba9c303b Merge branch 'scss-style-guide-fixes' into 'master' 
Documentation: SCSS Style Guide fixes

Fixed a typo and added a section on ignoring issues.

[ci skip]

See merge request !3263
 2016-03-23 21:13:14 +00:00
connorshea 2c9f6cfa42 SCSS Style Guide fixes. 
Fix a typo and add a section on ignoring issues.

[ci skip]
 2016-03-23 14:39:12 -06: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
Jacob Schatz b45423c5fb Merge branch 'issue-sidebar-overlap' into 'master' 
Issue sidebar overlaps on tablet

Closes #14180

![Screen_Shot_2016-03-18_at_13.10.53](/uploads/d1e81778740a034aa98c881a70e55254/Screen_Shot_2016-03-18_at_13.10.53.png)

See merge request !3299
 2016-03-23 20:10:00 +00:00
Robert Speicher f49e9e8f77 Merge branch 'update-issues-tests' into 'master' 
Multi-update issues tests

There were no tests for updating multiple issues at a time - this fixes
that 👍 

See merge request !3357
 2016-03-23 19:59:42 +00:00
Alfredo Sumaran c37735841b Restore menu content when emptying the search input 2016-03-23 14:24:46 -05:00
Jacob Schatz 00246d3f01 Merge branch 'fix_missing_tooltip_next_to_project_title' into 'master' 
Fix missing tooltip in project title

closes #14516 

![tooltip](/uploads/121cc3676f4f32044e158cf5f3df5be5/tooltip.gif)

See merge request !3351
 2016-03-23 19:16:05 +00: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
Alfredo Sumaran 6c20e9a5bb Update CHANGELOG 2016-03-23 13:34:24 -05:00
Douwe Maan 30246f1dc2 Merge branch 'rs-rails-routes' into 'master' 
Add special cases for built-in Rails routes in development



See merge request !3369
 2016-03-23 18:33:48 +00:00
Robert Speicher 33b1bbba67 Merge branch 'fix-application-settings' into 'master' 
Fixed error with applications delete anonymous token form

Closes #14509 

See merge request !3362
 2016-03-23 18:12:01 +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
Robert Speicher 0e85a8b816 Merge branch 'issue_14453' into 'master' 
Strip commit title when creating revert commit.

Fixes #14453 

See merge request !3352
 2016-03-23 16:46:23 +00:00
Robert Speicher 1f5d5af423 Merge branch 'fix-milestone-upcoming' into 'master' 
Fix Milestone.upcoming

The order wasn't happening because of `default_scope`. Blegh.

See merge request !3364
 2016-03-23 15:51:29 +00:00
Jacob Schatz 384a82f1a3 Merge branch 'dropdown-right-align' into 'master' 
Dropdown alignment

Hopefully the JS will stop this happening in future as well!

Closes #14386 

![Screen_Shot_2016-03-18_at_12.54.32](/uploads/d11b51d3577df3a19b8b3a0fd7b69788/Screen_Shot_2016-03-18_at_12.54.32.png)

See merge request !3298
 2016-03-23 15:24:21 +00:00
Douwe Maan b651a4fd41 Fix Milestone.upcoming 2016-03-23 15:09:58 +00:00
Rémy Coutable a4fa5d3e3d Updated 8.6.1 changelog 
[ci skip]
 2016-03-23 15:58:02 +01:00
Achilleas Pipinellis 06976bf1c5 Merge branch 'doc/technical-debt-label' into 'master' 
Add description of technical debt label in docs

Description for a technical debt label and workflow, as discussed in https://dev.gitlab.org/gitlab/organization/issues/714.

See merge request !3265
 2016-03-23 14:14:38 +00:00
Phil Hughes c23d9ab4ed Fixed error with applications delete enonymous token form 
Closes #14509
 2016-03-23 13:59:54 +00:00
Douwe Maan a29c195423 Merge branch 'split-with-2' into 'master' 
Make sure we get only two returns

@DouweM The other change I made which has nothing to do with Gitlab::Email::Receiver

See merge request !3360
 2016-03-23 13:58:21 +00:00
Douwe Maan c78f83b5ef Merge branch 'avoid-name-shadowing' into 'master' 
Avoid using the same name between methods and variables

@DouweM This is the one with renaming.

See merge request !3359
 2016-03-23 13:45:26 +00:00
Phil Hughes 0141d3654f Disable new label form in dropdown until fields are complete 2016-03-23 13:29:41 +00:00
Douwe Maan 6c4d6dd684 Merge branch 'fix/issue-move-preserve-update-time' into 'master' 
Preserve time notes has been updated at when moving issue

Closes #14490

See merge request !3356
 2016-03-23 13:11:27 +00:00
Grzegorz Bizon 85b9d763f1 Add Changelog entry for preserving timestamps when moving issue 2016-03-23 13:24:15 +01:00
Grzegorz Bizon bab50e0133 Preserve time notes has been updated at when moving issue 2016-03-23 13:22:27 +01:00
Lin Jen-Shin ecc060d701 Make sure we get only two returns 2016-03-23 20:22:09 +08:00
Lin Jen-Shin 9374b7eb0b Avoid using the same name between methods and variables 2016-03-23 20:05:31 +08:00
Rémy Coutable 7124e5a44c Merge branch 'fix-build-dependencies' into 'master' 
Fix build dependencies, when the dependency is a string

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/14485

See merge request !3344
 2016-03-23 11:58:12 +00:00
Kamil TrzcinskiandRémy Coutable 68c0dc1fbe Update CHANGELOG 2016-03-23 12:55:23 +01:00
Kamil TrzcinskiandRémy Coutable 858bf727bc Test dependencies defined as symbols 2016-03-23 12:55:23 +01:00
Kamil TrzcinskiandRémy Coutable 8fac12c590 Fix build dependencies, when the dependency is a string 2016-03-23 12:55:23 +01:00
Phil Hughes 23bfa7a3bd Update milestone spec 2016-03-23 11:45:24 +00:00
Rémy Coutable b6806d0cbc Merge branch 'fix/14505' into 'master' 
Fix an issue causing the Dashboard/Milestones page to be blank

Fixes #14505 and #14514.

See merge request !3348
 2016-03-23 11:40:10 +00:00