home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 15:46:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
26,946 Commits 48 Branches 340 Tags
e32fc7567be2ff2cc995648e675de18133f8a066
Commit Graph
26946 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Rémy Coutable e32fc7567b Merge branch 'instrument-repository-archive-worker' into 'master' 
Instrument Repository.clean_old_archives

This is done so we have some metrics for https://gitlab.com/gitlab-org/gitlab-ce/issues/15256.

See merge request !3742
 2016-04-18 11:13:51 +00:00
Yorick Peterse 651c3e841d Instrument Repository.clean_old_archives 2016-04-18 12:33:11 +02:00
Rémy Coutable c3f601e829 Merge branch 'fix-method-instrumentation' into 'master' 
Use Module#prepend for method instrumentation

cc @pcarranza 

See merge request !3754
 2016-04-18 10:09:56 +00:00
Yorick Peterse 7b6785b3b1 Use Module#prepend for method instrumentation 
By using Module#prepend we can define a Module containing all proxy
methods. This removes the need for setting up crazy method alias chains
and in turn prevents us from having to deal with all that madness (e.g.
methods calling each other recursively).

Fixes gitlab-org/gitlab-ce#15281
 2016-04-18 11:16:31 +02:00
Rémy Coutable 6d899f46b5 Merge branch '14552-signup-password-leak' into 'master' 
Don't populate the password field on signup validation errors

- Previously, we were pulling `params[:user][:password]` as the default
  value for the password field. This is incorrect; we should be pulling
  it from `@user.password` or the like.

[Closes #14552]

See merge request !3691
 2016-04-18 08:27:19 +00:00
Timothy Andrew 38557ec400 Move CHANGELOG entry to a random place. 2016-04-18 12:30:04 +05:30
Timothy Andrew 40bc8e7677 Add acceptance test to check if the user password persists after form redisplays. 
- While signing up.
 2016-04-18 12:19:11 +05:30
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
Douwe Maan 1c93b33587 Merge branch 'number_sign_for_external_issue_ref' into 'master' 
Add number sign on external issue reference text

Currently, external issue link is `<a ...>123</a>`. After it will be: `<a ...>#123</a>`.

See merge request !3350
 2016-04-17 20:22:32 +00:00
BaldinoF a281f68b64 Add CHANGELOG entry 2016-04-17 18:25:58 +02:00
BaldinoF b04140a1e4 Merge branch 'master' into number_sign_for_external_issue_ref 2016-04-17 18:17:27 +02:00
Phil Hughes 0be158a072 Added upload file test to new issue form 2016-04-17 12:15:45 +01: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 a716e8eadc Added CHANGELOG item 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 ce2e37d446 Fixed tests 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
Jacob Schatz 5ddda30c35 Remove errors from CHANGELOG 2016-04-16 08:59:56 -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 6e00c3635b Update CHANGELOG 2016-04-16 07:21:28 -04:00
Alfredo SumaranandJacob Schatz 18b4291181 Add tests for autocomplete on a Commit 2016-04-16 07:21:28 -04:00
Alfredo SumaranandJacob Schatz a53e912bc0 Change context description 2016-04-16 07:21:28 -04:00
Alfredo SumaranandJacob Schatz 40efb4eb1f Add tests for autocomplete on a Merge Request 2016-04-16 07:21:28 -04:00
Alfredo SumaranandJacob Schatz a740f0bc99 Add tests for autocomplete on a Issue 2016-04-16 07:21:28 -04:00
Alfredo SumaranandJacob Schatz 42848f2684 Update CHANGELOG 2016-04-16 07:21:28 -04: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
Robert Schilling 178dfb1917 Merge branch 'typos_in_ci_doc' into 'master' 
Fix typos in CI docs.



See merge request !3709
 2016-04-16 10:44:14 +00:00
Valery Sizov 63539a7a7e Merge branch 'changelog_typo' into 'master' 
Fix TYPO in the changelog



See merge request !3765
 2016-04-16 10:04:10 +00:00
Valery Sizov d744a04a5b fix TYPO in the changelog 2016-04-16 09:23:25 +00: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