summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fix-method-instrumentation' into 'master' Rémy Coutable2016-04-183-24/+65
|\ | | | | | | | | | | | | Use Module#prepend for method instrumentation cc @pcarranza See merge request !3754
| * Use Module#prepend for method instrumentationfix-method-instrumentationYorick Peterse2016-04-183-24/+65
|/ | | | | | | | | 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
* Merge branch '14552-signup-password-leak' into 'master' Rémy Coutable2016-04-183-5/+60
|\ | | | | | | | | | | | | | | | | | | | | 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
| * Move CHANGELOG entry to a random place.Timothy Andrew2016-04-181-1/+1
| |
| * Add acceptance test to check if the user password persists after form ↵Timothy Andrew2016-04-181-0/+55
| | | | | | | | | | | | redisplays. - While signing up.
| * Merge remote-tracking branch 'origin/master' into 14552-signup-password-leak14552-signup-password-leakTimothy Andrew2016-04-18234-1012/+3985
| |\ | |/ |/|
* | Merge branch 'fix-issue-dropzone' into 'master' Stan Hu2016-04-183-2/+40
|\ \ | | | | | | | | | | | | | | | | | | Fixed issue with dropzone not working on new issuable Closes #15295 See merge request !3760
| * | Added upload file test to new issue formfix-issue-dropzonePhil Hughes2016-04-171-0/+38
| | |
| * | Fix issue with go full screen triggering attach filePhil Hughes2016-04-161-1/+1
| | |
| * | Fixed issue with dropzone not working on new issuablePhil Hughes2016-04-151-1/+1
| | | | | | | | | | | | Closes #15295
* | | Merge branch 'number_sign_for_external_issue_ref' into 'master' Douwe Maan2016-04-173-0/+22
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Add CHANGELOG entryBaldinoF2016-04-171-0/+1
| | | |
| * | | Merge branch 'master' into number_sign_for_external_issue_refBaldinoF2016-04-17708-5086/+29281
| |\ \ \ | |/ / / |/| | |
* | | | Merge branch 'issues-mobile-header' into 'master' Jacob Schatz2016-04-1612-163/+158
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Updated some if statementsissues-mobile-headerPhil Hughes2016-04-162-43/+40
| | | | |
| * | | | Fixed testsPhil Hughes2016-04-162-5/+5
| | | | |
| * | | | Added CHANGELOG itemPhil Hughes2016-04-161-0/+4
| | | | |
| * | | | Fixed up based on feedbackPhil Hughes2016-04-164-11/+9
| | | | |
| * | | | Alignment with sidebarPhil Hughes2016-04-161-1/+1
| | | | |
| * | | | Fixed testsPhil Hughes2016-04-162-7/+5
| | | | |
| * | | | Moved meta information into an issuable helper methodPhil Hughes2016-04-163-17/+14
| | | | |
| * | | | Merge request header markup now matches issue markup for consistancyPhil Hughes2016-04-162-34/+41
| | | | |
| * | | | Refactored issue header to work better for mobilePhil Hughes2016-04-166-111/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will also work better for when the title makes the buttons drop down a new line Closes #14228
* | | | | Merge branch 'fivehundred_on_ui_help' into 'master' Dmitriy Zaporozhets2016-04-162-6/+7
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Simplify random user generation.Jacob Schatz2016-04-162-12/+7
| | | | |
| * | | | Make a user available for the user variablefivehundred_on_ui_helpJacob Schatz2016-04-162-6/+12
| | | | |
* | | | | Merge branch 'issue_14423' into 'master' Jacob Schatz2016-04-164-33/+172
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Remove errors from CHANGELOGJacob Schatz2016-04-161-2/+0
| | | | |
| * | | | Update CHANGELOGissue_14423Alfredo Sumaran2016-04-161-1/+1
| | | | |
| * | | | Add tests for autocomplete on a CommitAlfredo Sumaran2016-04-161-0/+22
| | | | |
| * | | | Change context descriptionAlfredo Sumaran2016-04-161-2/+2
| | | | |
| * | | | Add tests for autocomplete on a Merge RequestAlfredo Sumaran2016-04-161-29/+52
| | | | |
| * | | | Add tests for autocomplete on a IssueAlfredo Sumaran2016-04-161-0/+53
| | | | |
| * | | | Update CHANGELOGAlfredo Sumaran2016-04-161-0/+3
| | | | |
| * | | | Memoize targetAlfredo Sumaran2016-04-161-22/+20
| | | | |
| * | | | Change variable nameAlfredo Sumaran2016-04-161-3/+3
| | | | |
| * | | | Fixes failing specAlfredo Sumaran2016-04-161-0/+2
| | | | |
| * | | | Fixes multiple ajax request and incorrect data being set for the current ↵Alfredo Sumaran2016-04-161-16/+47
| | | | | | | | | | | | | | | | | | | | issuable
| * | | | Update method name and remove unneeded paramsAlfredo Sumaran2016-04-161-2/+2
| | | | |
| * | | | Put owner and participating people firstAlfredo Sumaran2016-04-161-15/+24
| | | | |
* | | | | Merge branch 'gcovr' into 'master' Kamil Trzciński2016-04-161-0/+3
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Add test coverage parsing example for gcvor See merge request !3629
| * | | | Add test coverage parsing example for gcvorChristoph Junghans2016-04-091-0/+3
| | | | |
* | | | | Merge branch 'typos_in_ci_doc' into 'master' Robert Schilling2016-04-161-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typos in CI docs. See merge request !3709
| * | | | | Fix typos in CI docs.Hyunwoo Jung2016-04-131-1/+1
| | | | | |
* | | | | | Merge branch 'changelog_typo' into 'master' Valery Sizov2016-04-161-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix TYPO in the changelog See merge request !3765
| * | | | | | fix TYPO in the changelogValery Sizov2016-04-161-1/+1
|/ / / / / /
* | | | | | Merge branch 'rs-branch-name-space' into 'master' Jacob Schatz2016-04-151-2/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove extra spacing from merge request target branch name See merge request !3758
| * | | | | | Remove extra spacing from merge request target branch namers-branch-name-spaceRobert Speicher2016-04-151-2/+1
| | | | | | |
* | | | | | | Merge branch 'fix/project-import_url' into 'master' Robert Speicher2016-04-1522-56/+307
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | resolve merge conflictfix/project-import_urlJames Lopez2016-04-151-5/+1
| | | | | | |
View Lorry Controller Status