home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 23:56:09 +10:00
Code Issues Packages Projects Releases Wiki Activity
26,942 Commits 48 Branches 340 Tags
6d899f46b577190eade2db9be548dcda271a9023
Commit Graph
13932 Commits
Author SHA1 Message Date
Timothy Andrew ed1be10087 Merge remote-tracking branch 'origin/master' into 14552-signup-password-leak 2016-04-18 09:41:20 +05:30
Stan Hu e9f20f5922 Merge branch 'fix-issue-dropzone' into 'master' 
Fixed issue with dropzone not working on new issuable

Closes #15295

See merge request !3760
 2016-04-18 03:02:12 +00:00
BaldinoF b04140a1e4 Merge branch 'master' into number_sign_for_external_issue_ref 2016-04-17 18:17:27 +02:00
Jacob Schatz 5048064dc5 Merge branch 'issues-mobile-header' into 'master' 
Refactored issue header to work better for mobile

This will also work better for when the title makes the buttons drop down a new line

Closes #14228

See merge request !3487
 2016-04-16 21:48:35 +00:00
Dmitriy Zaporozhets 7dce9b1dc2 Merge branch 'fivehundred_on_ui_help' into 'master' 
Make a user available for the user variable

Fixes: #15289 

`current_user` is not available if one is signed out. 

Look for @dzaporozhets's user if available or just user with id `1`. Dz will work on GitLab.com and user with id 1 will work on dev. 

See merge request !3766
 2016-04-16 20:40:28 +00:00
Phil HughesandJacob Schatz 84fba4d162 Updated some if statements 2016-04-16 16:13:16 -04:00
Phil HughesandJacob Schatz 2629ab4472 Fixed tests 2016-04-16 16:13:16 -04:00
Phil HughesandJacob Schatz 4b15a8ed26 Fixed up based on feedback 2016-04-16 16:13:16 -04:00
Phil HughesandJacob Schatz 365f351a6c Alignment with sidebar 2016-04-16 16:13:16 -04:00
Phil HughesandJacob Schatz 6c949b2bf1 Moved meta information into an issuable helper method 2016-04-16 16:13:16 -04:00
Phil HughesandJacob Schatz 60bb7007c3 Merge request header markup now matches issue markup for consistancy 2016-04-16 16:13:16 -04:00
Phil HughesandJacob Schatz fd42b0db02 Refactored issue header to work better for mobile 
This will also work better for when the title makes the buttons drop down a new line

Closes #14228
 2016-04-16 16:13:16 -04:00
Jacob Schatz e79b0dd762 Simplify random user generation. 2016-04-16 16:00:30 -04:00
Jacob Schatz 05920a7964 Merge branch 'issue_14423' into 'master' 
Put issuable owner and participating people first on mention suggestions

Closes #14423

**Merge Requests**

Author and people who participated are first now


<img src="/uploads/dd75937627c61b5efe631b4a35f274c6/Screen_Shot_2016-03-29_at_6.41.29_PM.png" width="235" />

**Issues**

Author showing first and no people have participated

<img src="/uploads/e17aa96ffe7d46a7dbe293318e999e1d/Screen_Shot_2016-03-29_at_6.41.44_PM.png" width="279" />


See merge request !3448
 2016-04-16 13:41:58 +00:00
Jacob Schatz ffd2416c56 Make a user available for the user variable 2016-04-16 09:28:04 -04:00
Kamil Trzciński 737087f7e5 Merge branch 'gcovr' into 'master' 
Add test coverage parsing example for gcvor



See merge request !3629
 2016-04-16 11:47:14 +00:00
Alfredo SumaranandJacob Schatz a96dc94428 Memoize target 2016-04-16 07:21:28 -04:00
Alfredo SumaranandJacob Schatz 1eeabdc6a5 Change variable name 2016-04-16 07:21:28 -04:00
Alfredo SumaranandJacob Schatz 05628e0c2f Fixes failing spec 2016-04-16 07:21:28 -04:00
Alfredo SumaranandJacob Schatz 16459fddd4 Fixes multiple ajax request and incorrect data being set for the current issuable 2016-04-16 07:21:28 -04:00
Alfredo SumaranandJacob Schatz ad48ecacae Update method name and remove unneeded params 2016-04-16 07:21:28 -04:00
Alfredo SumaranandJacob Schatz 562c9652d6 Put owner and participating people first 2016-04-16 07:21:28 -04:00
Phil Hughes eceada9a68 Fix issue with go full screen triggering attach file 2016-04-16 09:43:49 +01:00
Jacob Schatz 8c9cc6d26c Merge branch 'rs-branch-name-space' into 'master' 
Remove extra spacing from merge request target branch name



See merge request !3758
 2016-04-15 23:58:18 +00:00
Phil Hughes 0fcdcadd75 Fixed issue with dropzone not working on new issuable 
Closes #15295
 2016-04-15 23:00:32 +01:00
Robert Speicher 2e4d9c1de6 Merge branch 'fix/project-import_url' into 'master' 
Fix for import_url fields on projects containing third-party credentials

Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2658 

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

See merge request !3066
 2016-04-15 21:52:00 +00:00
Robert Speicher 47c6111546 Remove extra spacing from merge request target branch name 2016-04-15 17:17:48 -04:00
Rémy Coutable 492019a2a3 Merge branch 'new-mr-improvements' into 'master' 
Updated MR compare

Based on in feedback in !3228

See merge request !3704
 2016-04-15 17:30:05 +00:00
Robert Speicher 34b0561560 Merge branch 'pmq20/gitlab-ce-psvr/change-head' into 'master' 
Use rugged to change HEAD

_Originally opened at !2850 by @pmq20._

Needless to invoke gitlab_shell here, which is slow.

See merge request !3705
 2016-04-15 16:44:21 +00:00
Jacob Schatz bb59a1f98e Merge branch 'assign-to-issuable-opener' into 'master' 
Issuable can be assigned to author

Closes #9014

The only difference with #9014 is that I thoughed the author should also be
able to assign the issue. If this is unwanted behavior Ill revert it.

/cc @DouweM

See merge request !2765
 2016-04-15 15:43:26 +00:00
Phil Hughes 5b374226a7 Indented code 2016-04-15 16:36:07 +01:00
Robert Schilling 3c704c33e0 Delete tags via rugged 2016-04-15 16:05:04 +02:00
Zeger-Jan van de Weg 33f8b06c39 Merge branch 'master' into assign-to-issuable-opener 2016-04-15 14:38:15 +02:00
Rémy Coutable ddec8e777f Merge branch 'fix-redirect-profile-keys-new-to-profile-keys' into 'master' 
Make /profile/keys/new redirects to /profile/keys for back-compat

This addresses https://github.com/gitlabhq/gitlabhq/issues/10138.

See merge request !3717
 2016-04-15 08:19:01 +00:00
Rémy Coutable 4e2f068c5f Merge branch 'i_14431_award_emoji_count_not_in_comment_count' into 'master' 
Do not include award emojis in issue view comment_count

## What does this MR do?

Fixes Issue #14431, changing comment_count on issues index view to not include award emoji comments. While including them is technically correct, it feel nonintuitive in the way comments are presented.

## Are there points in the code the reviewer needs to double check?

No

## Why was this MR needed?

Improves UX of issues view

## What are the relevant issue numbers?

#14431

## Screenshots

### Before
 - ![Issues before](https://monosnap.com/file/cs7lcEkcChXXvAV22y2gh7gBFWCWjj.png)
 - ![MR before](https://monosnap.com/file/qzOawShznyXMKK3Z5cij4SKrHO4jNy.png)
### After
 - ![Issues after](https://monosnap.com/file/IWMedIiGnDnCly7zI5BwNTYQuCS8fH.png)
 - ![MR after](https://monosnap.com/file/mXJu1C2OVo5DGK0XdD67vPZGNPAw4L.png)


See merge request !3610
 2016-04-15 07:58:29 +00:00
Rémy Coutable a434ffd3b3 Make /profile/keys/new redirects to /profile/keys for back-compat 
Report: https://github.com/gitlabhq/gitlabhq/issues/10138

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-15 09:45:58 +02:00
James Lopez 05985b49a4 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-import_url 2016-04-15 08:49:08 +02:00
Douwe Maan 447a905088 Merge branch 'rs-trailing-slash-in-search' into 'master' 
Escape the query argument provided to `git grep` by `search_files`

Closes #14963.

See merge request !3633
 2016-04-15 06:46:47 +00:00
Jacob Schatz ba18e0b208 Merge branch '14176-diff-paste-data' into 'master' 
Copying and pasting doesn't grab line numbers or +/-

Fixes #14176 

See merge request !3687
 2016-04-14 21:01:08 +00:00
Stan Hu 95ce4d29c3 Merge branch 'rs-sentry-contexts' into 'master' 
Add Sentry program context even without a current user



See merge request !3729
 2016-04-14 20:18:01 +00:00
theoretick 5bf47f14b9 Do not include award emojis in issue view comment_count 
Fixes Issue #14431
 2016-04-14 11:20:55 -07:00
Jacob Schatz 9cd5e0fc48 Merge branch 'subscribe-button-fix' into 'master' 
Removed references to subscribe-button CSS class

These were being blocked by adblocks

Closes #15043

See merge request !3677
 2016-04-14 18:11:18 +00:00
Robert Speicher f583129767 Add Sentry program context even without a current user 2016-04-14 13:56:30 -04:00
Annabel Dunstone 80d8f8b876 Syntax & style updates 2016-04-14 12:33:29 -05:00
Robert Speicher 95a867e0af Merge branch 'auto-fsck' into 'master' 
Auto git fsck

Closes https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3232

See merge request !3232
 2016-04-14 17:15:58 +00:00
Robert Speicher 58ca84908c Merge branch 'fix-group-projects-sort' into 'master' 
Projects on group page should be sorted by last activity instead of id/created_at

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Fixes #15237 

See merge request !3716
 2016-04-14 17:15:17 +00:00
Robert Speicher 7ef35b9c61 Shut up, Rubocop 2016-04-14 12:28:48 -04:00
James Lopez e5f7a54530 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-import_url 2016-04-14 18:12:10 +02:00
Rémy Coutable dd9ced0af9 Merge branch 'connorshea/gitlab-ce-revoke-authorized-application' into 'master' 
Fix revoking of authorized OAuth applications

Users were not able to revoke access to authorized OAuth applications. Clicking the "Revoke" button would result in a 404 page, and the application would still be authorized.

Added a spec and also found that the `gon` variables were not being set for this view.

Closes #14370

See merge request !3690
 2016-04-14 15:26:09 +00:00
Rémy Coutable 4a514b27e9 Merge branch 'issue_15155' into 'master' 
Setup visibility level for project when transfering for a group

fixes #15155 

See merge request !3707
 2016-04-14 15:13:08 +00:00