summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Remove code that removes duplicate CI variablesGrzegorz Bizon2016-04-181-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 confGrzegorz Bizon2016-04-181-1/+1
|
* Read job variables directly from gitlab CI configGrzegorz Bizon2016-04-181-2/+6
|
* Make it possible to override build variablesGrzegorz Bizon2016-04-181-1/+2
|
* Add `variables` keyword to job in CI config YAMLGrzegorz Bizon2016-04-181-2/+10
|
* Instrument Repository.clean_old_archivesYorick Peterse2016-04-181-3/+5
|
* Merge remote-tracking branch 'origin/master' into 14552-signup-password-leak14552-signup-password-leakTimothy Andrew2016-04-18113-528/+1046
|\
| * Merge branch 'fix-issue-dropzone' into 'master' Stan Hu2016-04-182-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 filePhil Hughes2016-04-161-1/+1
| | |
| | * Fixed issue with dropzone not working on new issuablePhil Hughes2016-04-151-1/+1
| | | | | | | | | | | | Closes #15295
| * | Merge branch 'master' into number_sign_for_external_issue_refBaldinoF2016-04-17338-2450/+5182
| |\ \
| | * \ Merge branch 'issues-mobile-header' into 'master' Jacob Schatz2016-04-169-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-headerPhil Hughes2016-04-162-43/+40
| | | | |
| | | * | Fixed testsPhil Hughes2016-04-162-5/+5
| | | | |
| | | * | Fixed up based on feedbackPhil Hughes2016-04-163-10/+8
| | | | |
| | | * | Alignment with sidebarPhil Hughes2016-04-161-1/+1
| | | | |
| | | * | 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-162-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 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 '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-152-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 Lopez2016-04-1528-55/+316
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | fix/project-import_url
| | | * \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-04-14184-1071/+1638
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | fix/project-import_url
| | | * | | | | changed a few things based on feedbackJames Lopez2016-04-111-2/+6
| | | | | | | |
| | | * | | | | fix create_or_update_import_dataJames Lopez2016-04-071-1/+4
| | | | | | | |
| | | * | | | | refactored create_or_update_import_dataJames Lopez2016-04-071-16/+7
| | | | | | | |
| | | * | | | | refactored a few things based on MR feedbackJames Lopez2016-04-071-0/+13
| | | | | | | |
| | | * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-04-0749-356/+597
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | fix/project-import_url
| | | * | | | | | removed TODO [ci skip]James Lopez2016-04-061-1/+0
| | | | | | | | |
| | | * | | | | | fix some issues with credentialsJames Lopez2016-04-061-2/+2
| | | | | | | | |
| | | * | | | | | some refactoring to symbolise keys across importers and left a TODOJames Lopez2016-04-051-2/+6
| | | | | | | | |
| | | * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-04-0515-50/+78
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix/project-import_url
| | | * \ \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-04-04119-784/+1830
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix/project-import_url # Conflicts: # db/schema.rb
| | | * | | | | | | | fix github import issuesJames Lopez2016-04-011-1/+1
| | | | | | | | | | |
| | | * | | | | | | | fix fogbugz importJames Lopez2016-04-011-0/+4
| | | | | | | | | | |
| | | * | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-03-2877-334/+817
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix/project-import_url
| | | * | | | | | | | | first round of fixes and spec fixesJames Lopez2016-03-221-2/+3
| | | | | | | | | | | |