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
27,551 Commits 48 Branches 340 Tags
5d5df26ab1b65b094eaa2ca2ca6db49b6d8530ea
Commit Graph
14303 Commits
Author SHA1 Message Date
Alfredo Sumaran 66a5d0fd26 Rename method 2016-04-26 14:01:40 -05:00
Alfredo Sumaran 64c2d9bd3c Use new method hide_whitespaces? 2016-04-26 14:01:40 -05:00
Alfredo Sumaran 4735914031 Update syntax 2016-04-26 14:01:40 -05:00
Alfredo Sumaran f0bdf5c692 Hide whitespace toggle button for new merge requests 2016-04-26 14:01:40 -05:00
Alfredo Sumaran d8d00b5bc2 Add Hide/show whitespace changes button on diff and commit view 2016-04-26 14:01:40 -05:00
Jacob Schatz 18e00e3ba3 Merge branch '15606-discussion-styling' into 'master' 
Increase screen width breakpoint for hide/show discussion

Closes #15606

See merge request !3915
 2016-04-26 18:43:58 +00:00
Connor Shea c402aeef02 Allow alternative names for the CHANGELOG file. 
"CHANGELOG", "NEWS", "HISTORY", and "CHANGES" are recognized as Changelog files.

Also adds relevant tests for each of these names.

Resolves #14864.
 2016-04-26 11:40:35 -06:00
Connor Shea 1cc614f2bd Remove the Devise Async gem. 
The extra gem isn’t necessary anymore since Rails 4.2 has ActiveJob integration.

Resolves #15575.
 2016-04-26 10:41:48 -06:00
Rémy Coutable b65c4abd74 Merge branch 'skip-fresh-repo-fsck' into 'master' 
Do not fsck projects less than a day old

This should bring the number of false positives down.

Helps https://gitlab.com/gitlab-org/gitlab-ce/issues/15423

See merge request !3926
 2016-04-26 16:23:57 +00:00
Jacob Schatz df8fda60fb Merge branch 'master' into 'master' 
Fixed width of .search-location-badge as it was causing issues in Safari.

Fixed width of .search-location-badge as it was causing issues in Safari.

Fixes issue #15541 and is a minor CSS only change so [ci skip]

# Before

Safari:
![Screen_Shot_2016-04-24_at_22.35.38](/uploads/74388670fde3af94429d83b954833bd3/Screen_Shot_2016-04-24_at_22.35.38.png)

# After

Safari:
![Screen_Shot_2016-04-24_at_21.59.49](/uploads/177d0d8fda665165dff5006930604fc6/Screen_Shot_2016-04-24_at_21.59.49.png)

Chrome:
![Screen_Shot_2016-04-24_at_21.59.40](/uploads/6764cd5864901210f4f8eff4388fd6db/Screen_Shot_2016-04-24_at_21.59.40.png)

# CSS class referenced in the following files:

`./app/assets/javascripts/search_autocomplete.js.coffee`

`./app/assets/stylesheets/pages/search.scss`

…and is visible on the search bar on every page.

See merge request !3900
 2016-04-26 15:28:26 +00:00
Robert Speicher 31c10e0362 Merge branch 'search-ui-update' into 'master' 
Search ui update

Closes #2537 

See merge request !3751
 2016-04-26 15:12:16 +00:00
Jacob Vosmaer 3c0ab15a74 Do not fsck projects less than a day old 
This should bring the number of false positives down.
 2016-04-26 13:35:52 +02:00
Jacob Vosmaer f127edd012 Merge branch '15094-throttle-update-of-last_activity_at' into 'master' 
Throttle the update of `project.last_activity_at` to 1 minute

This implement [the solution](https://gitlab.com/gitlab-org/gitlab-ce/issues/15094#note_4769387) proposed by @jacobvosmaer.

See merge request !3848
 2016-04-26 09:34:51 +00:00
Phil Hughes 97c1a1ef64 Updated based on feedback 
Changed some variable names
Fixed CHANGELOG entry
 2016-04-26 09:04:35 +01:00
Phil Hughes 7ee5de1980 Consistent border radius 2016-04-26 09:03:04 +01:00
Phil Hughes 06276bd355 Correctly shows no results text 
Correct search results count
 2016-04-26 09:03:04 +01:00
Phil Hughes 3137559dfd Fixed issue with dropdown option not sticking 
CHANGELOG item
 2016-04-26 09:03:04 +01:00
Phil Hughes f5bea9df53 Fixed tests 2016-04-26 09:03:04 +01:00
Phil Hughes 262a3dd482 Humanize scope text 2016-04-26 09:03:04 +01:00
Phil Hughes 3b5879e50c Truncate issue description 2016-04-26 09:03:04 +01:00
Phil Hughes d369d52938 Focus field 2016-04-26 09:03:04 +01:00
Phil Hughes 6ac549c1de Use helper method 2016-04-26 09:03:04 +01:00
Phil Hughes aa316cbfff Changes dropdown toggle on search dropdowns 2016-04-26 09:03:04 +01:00
Phil Hughes 1c8d01b05a Removed category icons 2016-04-26 09:03:04 +01:00
Phil Hughes be521d7d76 icons on search bar 2016-04-26 09:03:04 +01:00
Phil Hughes 8e4aa6e391 Mobile updates for search UI 2016-04-26 09:03:04 +01:00
Phil Hughes bb50edb16d Loads group & projects on search page with ajax 2016-04-26 09:03:04 +01:00
Phil Hughes b3af3930c6 Started updating search UI 2016-04-26 09:03:04 +01:00
Robert Speicher 48f516a843 Merge branch 'link_user_avatar_in_activity_page_to_profile' into 'master' 
Link user avatar in activity page to user profile

Closes #14927

See merge request !3910
 2016-04-25 21:34:37 +00:00
Annabel Dunstone d388d687dd Increase screen width breakpoint for hide/show discussion 2016-04-25 15:31:34 -05:00
Jacob Schatz 8fc0eed357 Merge branch 'emoji-unicode-fix' into 'master' 
Fixes issue with emoji comments not showing correct emoji image

Previously it would look for the unicode character inside the award menu. But this menu might not always be there.

Now, the unicode characters are loaded onto the page in an array which the award emoji that looks in to get the correct emoji unicode character

Fixes #15512

See merge request !3885
 2016-04-25 20:04:35 +00:00
Jacob Schatz 3d115d6748 Merge branch 'diff-line-colors' into 'master' 
Update diff blue & yellow to match design

<img src="/uploads/60e1351fb04ab1c8969685fbc8b61c88/Screen_Shot_2016-04-22_at_9.12.17_AM.png" width="500px">
<img src="/uploads/6812b22ec53f3041811261daa0584822/Screen_Shot_2016-04-22_at_9.12.05_AM.png" width="500px">

See merge request !3883
 2016-04-25 19:30:15 +00:00
Jacob Schatz 103b1444bd Merge branch 'blur-award-btn' into 'master' 
Triggers blur after clicking award button

![blur](/uploads/6cd53a5ac314e8048c656685935747e2/blur.gif)

Fixes #15511

See merge request !3881
 2016-04-25 19:27:36 +00:00
Jacob Schatz d809507e05 Merge branch 'issue_14904' into 'master' 
Add new shortcuts

Closes #14904

- On a project: `i` To navigate to New Issue page.
- On a issuable: `l` To open Label dropdown on a issuable.
- Global: Typing `?` multiple times now toggles the modal.

See merge request !3686
 2016-04-25 19:13:25 +00:00
Jacob Schatz af569f32e9 Merge branch 'project-dropdown-link-click-fix' into 'master' 
Fixed issue with project dropdown links not being clickable



See merge request !3870
 2016-04-25 18:47:30 +00:00
Jacob Schatz 99c4513eaa Merge branch 'word-break' into 'master' 
Don't break line in middle of word

<img src="/uploads/cceb1a4212ff7785ace03cd6468edf85/Screen_Shot_2016-04-21_at_3.32.00_PM.png" width="500px">

See merge request !3864
 2016-04-25 18:42:14 +00:00
Rémy Coutable 533cd8c2ee Throttle the update of project.last_activity_at to 1 minute 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-25 17:25:46 +02:00
Grzegorz Bizon ef032bb9f1 Fix error on commit builds page when no builds yet 
Closes #15509
 2016-04-25 17:19:57 +02:00
Stan Hu 6dff1a9a2b Fix Error 500 due to stale cache when projects are renamed or transferred 
Closes gitlab-org/gitlab-ee#506
 2016-04-25 06:57:50 -07:00
Arinde Eniola 0c0f634050 link user avatar in activity page to user profile 2016-04-25 13:13:43 +01:00
Jacob Schatz be85fde663 Merge branch 'scss-empty-rule' into 'master' 
Enable the EmptyRule SCSS Linter

Prevents empty SCSS rules from being included in the SCSS.

Also fixes the handful of lints caught by the linter.

Regarding the `.gh` rule in monokai.scss, which was added in [this commit](https://gitlab.com/gitlab-org/gitlab-ce/commit/bf079c24afb8ad2991a4eaf60a71a7bc45dd775d), it appears to be empty in [the original file as well](https://github.com/richleland/pygments-css/blob/master/monokai.css). So I think it's fine to delete the selector.

cc: @jschatz1 

See merge request !3769
 2016-04-25 11:30:50 +00:00
Rémy Coutable b8c4a65da7 Fix license detection to detect all license files, not only known licenses 
Fixes #15470.

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-25 10:31:28 +02:00
Jedidiah Broadbent ac7d473567 Fixed width of .search-location-badge as it was causing issues in Safari. #15541 2016-04-24 22:30:46 +01:00
Robert Speicher 954af77b39 Merge branch 'feature/snumb130/hide-future-blocks-on-graph' into 'master' 
Hiding future dates on contribution calendar

Fixes #9036

See merge request !2628
 2016-04-24 19:57:56 +00:00
Luke Howell 2dd4f796b1 Updating cal-heatmap-rails gem to 3.6.0 and hiding future dates. 2016-04-24 14:14:29 -05:00
Robert Speicher aace81ca37 Allow middle-click on a Todo row to open in a new tab 2016-04-24 15:01:52 -04:00
Phil Hughes 13f7ba059e Removed usage of normilizeEmojiName method 
Fixed some Ruby based on feedback
 2016-04-22 21:53:26 +01:00
Robert Speicher 84d3649d57 Merge branch '15513-fix-undefined-can-method' into 'master' 
Use the `can?` helper instead of `current_user.can?`

Fixes #15513.

See merge request !3882
 2016-04-22 17:38:10 +00:00
Phil Hughes 319c936055 Fixes issue with emoji comments not showing correct emoji image 
Previously it would look for the unicode character inside the award menu. But this menu might not always be there.

Now, the unicode characters are loaded onto the page in an array which the award emoji that looks in to get the correct emoji unicode character

Fixes #15512
 2016-04-22 17:01:53 +01:00
Jacob Schatz 7d199b7fcc Merge branch 'escape-label-title' into 'master' 
Correctly escapes label title in filters

Fixes #15522

See merge request !3880
 2016-04-22 15:56:54 +00:00