summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Wait for create merge request button to appearqa_issue_177Felipe Artur2018-02-141-0/+4
* Merge branch '42800-change-usage-of-avatar_icon' into 'master'Yorick Peterse2018-02-1435-59/+127
|\
| * Extract repeated logic into #avatar_icon_for.42800-change-usage-of-avatar_iconAndreas Brandl2018-02-134-16/+32
| * Add changelog.Andreas Brandl2018-02-131-0/+6
| * Always eagerly load a note's author.Andreas Brandl2018-02-131-1/+1
| * Always eagerly load an issue's author.Andreas Brandl2018-02-131-1/+1
| * Extract method to improve readability.Andreas Brandl2018-02-131-7/+11
| * Remove generic #avatar_icon helper.Andreas Brandl2018-02-132-36/+0
| * Explicit use of avatar_icon_* calls depending on situation.Andreas Brandl2018-02-134-13/+33
| * Use avatar_icon_for_email for commits.Andreas Brandl2018-02-132-2/+2
| * Retrieve project creator's avatar by creator, not creator#email.Andreas Brandl2018-02-131-1/+1
| * Retrieve namespace owner's avatar by owner, not owner#email.Andreas Brandl2018-02-131-1/+1
| * Retrieve issue author's avatar by user, not user#email.Andreas Brandl2018-02-131-1/+1
| * Use more specific #avatar_icon_for_email.Andreas Brandl2018-02-133-3/+3
| * Use more specific #avatar_icon_for_user.Andreas Brandl2018-02-1321-23/+23
| * Refactor and split ApplicationHelper#avatar_icon.Andreas Brandl2018-02-132-7/+65
* | Merge branch '38135-remove-ignore-column-from-events' into 'master'Yorick Peterse2018-02-141-4/+0
|\ \
| * | Remove ignore_column from Events#data.38135-remove-ignore-column-from-eventsAndreas Brandl2018-02-131-4/+0
* | | Merge branch 'expired-ci-artifacts' into 'master'Grzegorz Bizon2018-02-145-6/+65
|\ \ \
| * | | revert to earlier coding using a hard coded UNION ALL instead of Gitlab::SQL:...expired-ci-artifactsGreg Stark2018-02-091-6/+3
| * | | add rubocop whitelistGreg Stark2018-02-091-3/+3
| * | | Revert to old code style where branches of the union do not have extra where ...Greg Stark2018-02-091-18/+12
| * | | WIP experimentGreg Stark2018-02-091-3/+9
| * | | Add indexes and change SQL for expired artifacts to deal with artifacts migra...Greg Stark2018-02-085-6/+68
* | | | Merge branch 'fix/template-project-visibility' into 'master'Douwe Maan2018-02-145-36/+24
|\ \ \ \
| * | | | Add description, visibility to CreateFromTemplateService specGeorge Tsiolis2018-02-142-2/+11
| * | | | Remove Gitlab::ImportExport::ProjectCreator classGeorge Tsiolis2018-02-141-23/+0
| * | | | Update projects import serviceGeorge Tsiolis2018-02-122-11/+13
* | | | | Merge branch '42481-remove-notification-settings-left-projects' into 'master'Sean McGivern2018-02-144-7/+57
|\ \ \ \ \
| * | | | | Resolve "Remove notification settings for groups and projects you were previo...🙈 jacopo beschi 🙉2018-02-144-7/+57
|/ / / / /
* | | | | Merge branch 'qa-clone-with-deploy-key' into 'master'Grzegorz Bizon2018-02-1412-13/+246
|\ \ \ \ \
| * | | | | Indent as Rubocop likeqa-clone-with-deploy-keyLin Jen-Shin2018-02-141-8/+9
| * | | | | Fix the use to Git::LocationLin Jen-Shin2018-02-142-6/+6
| * | | | | Merge remote-tracking branch 'upstream/master' into qa-clone-with-deploy-keyLin Jen-Shin2018-02-13260-13917/+19820
| |\ \ \ \ \
| * | | | | | Inline helper methodsLin Jen-Shin2018-02-131-27/+11
| * | | | | | Add a comment about why @ is picked for sshLin Jen-Shin2018-02-131-0/+3
| * | | | | | Just use initialize and remove scheme we're not usingLin Jen-Shin2018-02-131-13/+5
| * | | | | | Rename Git::Repository::Location to Git::LocationLin Jen-Shin2018-02-135-44/+41
| * | | | | | Rearrange the test structure and introduceLin Jen-Shin2018-02-125-51/+103
| * | | | | | Make wait return the value we yielded whenLin Jen-Shin2018-02-122-4/+4
| * | | | | | Remove unused codes and address feedbackLin Jen-Shin2018-02-123-47/+21
| * | | | | | Adopt Git style URILin Jen-Shin2018-02-123-1/+67
| * | | | | | Cleanup codes and address feedbackLin Jen-Shin2018-02-097-31/+22
| * | | | | | Save host-verification test against SHA1 checksumLin Jen-Shin2018-02-091-3/+11
| * | | | | | Merge remote-tracking branch 'upstream/master' into qa-clone-with-deploy-keyLin Jen-Shin2018-02-091001-6589/+21779
| |\ \ \ \ \ \
| * | | | | | | WIPLin Jen-Shin2018-02-0510-15/+181
* | | | | | | | Merge branch 'feature/include-custom-attributes-in-api' into 'master'Douwe Maan2018-02-1410-44/+229
|\ \ \ \ \ \ \ \
| * | | | | | | | Allow including custom attributes in API responsesMarkus Koller2018-02-0810-44/+229
* | | | | | | | | Merge branch '42934-search-api-fix' into 'master'Sean McGivern2018-02-1412-22/+37
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | API - Include project in commits&blobs search resultsJarka Kadlecová2018-02-1412-22/+37
| | |_|_|/ / / / / | |/| | | | | | |