To keep it short, gamification is the use of individual game elements (or mechanics) in a non-game context (classroom, work place, etc.) to motivate the involved participants towards a certain objective (which can be a learning outcome) while game-based learning is to use an actual game to promote learning.