Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove code that removes duplicate CI variables | Grzegorz Bizon | 2016-04-18 | 1 | -2/+1 |
| | | | | | At this point this is being handled by GitLab Runner and we need to introduce this as a separate merge request. | ||||
* | Rename method that returns global envs in CI conf | Grzegorz Bizon | 2016-04-18 | 1 | -1/+1 |
| | |||||
* | Read job variables directly from gitlab CI config | Grzegorz Bizon | 2016-04-18 | 1 | -2/+6 |
| | |||||
* | Make it possible to override build variables | Grzegorz Bizon | 2016-04-18 | 1 | -1/+2 |
| | |||||
* | Add `variables` keyword to job in CI config YAML | Grzegorz Bizon | 2016-04-18 | 1 | -2/+10 |
| | |||||
* | Instrument Repository.clean_old_archives | Yorick Peterse | 2016-04-18 | 1 | -3/+5 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into 14552-signup-password-leak14552-signup-password-leak | Timothy Andrew | 2016-04-18 | 113 | -528/+1046 |
|\ | |||||
| * | Merge branch 'fix-issue-dropzone' into 'master' | Stan Hu | 2016-04-18 | 2 | -2/+2 |
| |\ | | | | | | | | | | | | | | | | | | | Fixed issue with dropzone not working on new issuable Closes #15295 See merge request !3760 | ||||
| | * | Fix issue with go full screen triggering attach file | Phil Hughes | 2016-04-16 | 1 | -1/+1 |
| | | | |||||
| | * | Fixed issue with dropzone not working on new issuable | Phil Hughes | 2016-04-15 | 1 | -1/+1 |
| | | | | | | | | | | | | Closes #15295 | ||||
| * | | Merge branch 'master' into number_sign_for_external_issue_ref | BaldinoF | 2016-04-17 | 338 | -2450/+5182 |
| |\ \ | |||||
| | * \ | Merge branch 'issues-mobile-header' into 'master' | Jacob Schatz | 2016-04-16 | 9 | -156/+149 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 |
| | | | | | |||||
| | | * | | Fixed up based on feedback | Phil Hughes | 2016-04-16 | 3 | -10/+8 |
| | | | | | |||||
| | | * | | Alignment with sidebar | Phil Hughes | 2016-04-16 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | 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 | 2 | -33/+73 |
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | | * | | 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 '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 | 2 | -1/+42 |
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | | * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵ | James Lopez | 2016-04-15 | 28 | -55/+316 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | fix/project-import_url | ||||
| | | * \ \ \ | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵ | James Lopez | 2016-04-14 | 184 | -1071/+1638 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | fix/project-import_url | ||||
| | | * | | | | | changed a few things based on feedback | James Lopez | 2016-04-11 | 1 | -2/+6 |
| | | | | | | | | |||||
| | | * | | | | | fix create_or_update_import_data | James Lopez | 2016-04-07 | 1 | -1/+4 |
| | | | | | | | | |||||
| | | * | | | | | refactored create_or_update_import_data | James Lopez | 2016-04-07 | 1 | -16/+7 |
| | | | | | | | | |||||
| | | * | | | | | refactored a few things based on MR feedback | James Lopez | 2016-04-07 | 1 | -0/+13 |
| | | | | | | | | |||||
| | | * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵ | James Lopez | 2016-04-07 | 49 | -356/+597 |
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -2/+2 |
| | | | | | | | | | |||||
| | | * | | | | | | some refactoring to symbolise keys across importers and left a TODO | James Lopez | 2016-04-05 | 1 | -2/+6 |
| | | | | | | | | | |||||
| | | * | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵ | James Lopez | 2016-04-05 | 15 | -50/+78 |
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix/project-import_url | ||||
| | | * \ \ \ \ \ \ | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵ | James Lopez | 2016-04-04 | 119 | -784/+1830 |
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix/project-import_url # Conflicts: # db/schema.rb | ||||
| | | * | | | | | | | | fix github import issues | James Lopez | 2016-04-01 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | fix fogbugz import | James Lopez | 2016-04-01 | 1 | -0/+4 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵ | James Lopez | 2016-03-28 | 77 | -334/+817 |
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix/project-import_url | ||||
| | | * | | | | | | | | | first round of fixes and spec fixes | James Lopez | 2016-03-22 | 1 | -2/+3 |
| | | | | | | | | | | | |