Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | Merge branch 'issues-mobile-header' into 'master' | Jacob Schatz | 2016-04-16 | 12 | -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-header | Phil Hughes | 2016-04-16 | 2 | -43/+40 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Fixed tests | Phil Hughes | 2016-04-16 | 2 | -5/+5 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Added CHANGELOG item | Phil Hughes | 2016-04-16 | 1 | -0/+4 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Fixed up based on feedback | Phil Hughes | 2016-04-16 | 4 | -11/+9 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Alignment with sidebar | Phil Hughes | 2016-04-16 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Fixed tests | Phil Hughes | 2016-04-16 | 2 | -7/+5 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Moved meta information into an issuable helper method | Phil Hughes | 2016-04-16 | 3 | -17/+14 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Merge request header markup now matches issue markup for consistancy | Phil Hughes | 2016-04-16 | 2 | -34/+41 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Refactored issue header to work better for mobile | Phil Hughes | 2016-04-16 | 6 | -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 Zaporozhets | 2016-04-16 | 2 | -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 Schatz | 2016-04-16 | 2 | -12/+7 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Make a user available for the user variablefivehundred_on_ui_help | Jacob Schatz | 2016-04-16 | 2 | -6/+12 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge branch 'issue_14423' into 'master' | Jacob Schatz | 2016-04-16 | 4 | -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 CHANGELOG | Jacob Schatz | 2016-04-16 | 1 | -2/+0 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Update CHANGELOGissue_14423 | Alfredo Sumaran | 2016-04-16 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Add tests for autocomplete on a Commit | Alfredo Sumaran | 2016-04-16 | 1 | -0/+22 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Change context description | Alfredo Sumaran | 2016-04-16 | 1 | -2/+2 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Add tests for autocomplete on a Merge Request | Alfredo Sumaran | 2016-04-16 | 1 | -29/+52 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Add tests for autocomplete on a Issue | Alfredo Sumaran | 2016-04-16 | 1 | -0/+53 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Update CHANGELOG | Alfredo Sumaran | 2016-04-16 | 1 | -0/+3 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Memoize target | Alfredo Sumaran | 2016-04-16 | 1 | -22/+20 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Change variable name | Alfredo Sumaran | 2016-04-16 | 1 | -3/+3 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Fixes failing spec | Alfredo Sumaran | 2016-04-16 | 1 | -0/+2 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Fixes multiple ajax request and incorrect data being set for the current ↵ | Alfredo Sumaran | 2016-04-16 | 1 | -16/+47 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issuable | |||||
| * | | | | | | | | Update method name and remove unneeded params | Alfredo Sumaran | 2016-04-16 | 1 | -2/+2 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Put owner and participating people first | Alfredo Sumaran | 2016-04-16 | 1 | -15/+24 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge branch 'gcovr' into 'master' | Kamil Trzciński | 2016-04-16 | 1 | -0/+3 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add test coverage parsing example for gcvor See merge request !3629 | |||||
| * | | | | | | | | Add test coverage parsing example for gcvor | Christoph Junghans | 2016-04-09 | 1 | -0/+3 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge branch 'typos_in_ci_doc' into 'master' | Robert Schilling | 2016-04-16 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typos in CI docs. See merge request !3709 | |||||
| * | | | | | | | | | Fix typos in CI docs. | Hyunwoo Jung | 2016-04-13 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'changelog_typo' into 'master' | Valery Sizov | 2016-04-16 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix TYPO in the changelog See merge request !3765 | |||||
| * | | | | | | | | | | fix TYPO in the changelog | Valery Sizov | 2016-04-16 | 1 | -1/+1 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge branch 'rs-branch-name-space' into 'master' | Jacob Schatz | 2016-04-15 | 1 | -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-space | Robert Speicher | 2016-04-15 | 1 | -2/+1 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'fix/project-import_url' into 'master' | Robert Speicher | 2016-04-15 | 22 | -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_url | James Lopez | 2016-04-15 | 1 | -5/+1 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵ | James Lopez | 2016-04-15 | 53 | -98/+558 | |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix/project-import_url | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵ | James Lopez | 2016-04-14 | 344 | -1762/+8174 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix/project-import_url | |||||
| * | | | | | | | | | | | | update changelog [ci skip] | James Lopez | 2016-04-14 | 1 | -0/+1 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | updated migration based on testing findings | James Lopez | 2016-04-14 | 2 | -7/+14 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | typo | James Lopez | 2016-04-11 | 1 | -1/+1 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | changed a few things based on feedback | James Lopez | 2016-04-11 | 4 | -22/+17 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | fix create_or_update_import_data | James Lopez | 2016-04-07 | 1 | -1/+4 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | fix schema file [ci skip] | James Lopez | 2016-04-07 | 1 | -2/+3 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | refactored create_or_update_import_data | James Lopez | 2016-04-07 | 4 | -19/+10 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | refactored a few things based on MR feedback | James Lopez | 2016-04-07 | 6 | -22/+25 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵ | James Lopez | 2016-04-07 | 109 | -627/+1794 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix/project-import_url | |||||
| * | | | | | | | | | | | | | removed TODO [ci skip] | James Lopez | 2016-04-06 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | fix some issues with credentials | James Lopez | 2016-04-06 | 3 | -9/+9 | |
| | | | | | | | | | | | | | |